/[pcsx2_0.9.7]/trunk/common/include/Utilities/wxAppWithHelpers.h
ViewVC logotype

Diff of /trunk/common/include/Utilities/wxAppWithHelpers.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/common/include/Utilities/wxAppWithHelpers.h	2010/09/07 03:24:11	31
+++ trunk/common/include/Utilities/wxAppWithHelpers.h	2010/09/07 11:08:22	62
@@ -25,6 +25,22 @@
 
 class pxSynchronousCommandEvent;
 
+// --------------------------------------------------------------------------------------
+//  pxAppLog / ConsoleLogSource_App
+// --------------------------------------------------------------------------------------
+
+class ConsoleLogSource_App : public ConsoleLogSource
+{
+	typedef ConsoleLogSource _parent;
+
+public:
+	ConsoleLogSource_App();
+};
+
+extern ConsoleLogSource_App pxConLog_App;
+
+#define pxAppLog pxConLog_App.IsActive() && pxConLog_App
+
 
 // --------------------------------------------------------------------------------------
 //  ModalButtonPanel
@@ -74,8 +90,8 @@
 		DeleteObject( *obj );
 	}
 
-	void DeleteThread( Threading::PersistentThread& obj );
-	void DeleteThread( Threading::PersistentThread* obj )
+	void DeleteThread( Threading::pxThread& obj );
+	void DeleteThread( Threading::pxThread* obj )
 	{
 		if( obj == NULL ) return;
 		DeleteThread( *obj );
@@ -85,15 +101,16 @@
 	void PostCommand( int evtType, int intParam=0, long longParam=0, const wxString& stringParam=wxEmptyString );
 	void PostMethod( FnType_Void* method );
 	void PostIdleMethod( FnType_Void* method );
-	void ProcessMethod( void (*method)() );
+	void ProcessMethod( FnType_Void* method );
+
+	bool Rpc_TryInvoke( FnType_Void* method );
+	bool Rpc_TryInvokeAsync( FnType_Void* method );
 
 	sptr ProcessCommand( void* clientData, int evtType, int intParam=0, long longParam=0, const wxString& stringParam=wxEmptyString );
 	sptr ProcessCommand( int evtType, int intParam=0, long longParam=0, const wxString& stringParam=wxEmptyString );
 
-	void ProcessAction( pxInvokeActionEvent& evt );
-	void PostAction( const pxInvokeActionEvent& evt );
-
-	bool PostMethodMyself( void (*method)() );
+	void ProcessAction( pxActionEvent& evt );
+	void PostAction( const pxActionEvent& evt );
 
 	void Ping();
 	bool OnInit();
@@ -105,11 +122,11 @@
 	bool ProcessEvent( wxEvent& evt );
 	bool ProcessEvent( wxEvent* evt );
 	
-	bool ProcessEvent( pxInvokeActionEvent& evt );
-	bool ProcessEvent( pxInvokeActionEvent* evt );
+	bool ProcessEvent( pxActionEvent& evt );
+	bool ProcessEvent( pxActionEvent* evt );
 
 protected:
-	void IdleEventDispatcher( const wxChar* action );
+	void IdleEventDispatcher( const wxChar* action=wxEmptyString );
 
 	void OnIdleEvent( wxIdleEvent& evt );
 	void OnStartIdleEventTimer( wxEvent& evt );
@@ -117,11 +134,12 @@
 	void OnDeleteObject( wxCommandEvent& evt );
 	void OnDeleteThread( wxCommandEvent& evt );
 	void OnSynchronousCommand( pxSynchronousCommandEvent& evt );
-	void OnInvokeAction( pxInvokeActionEvent& evt );
+	void OnInvokeAction( pxActionEvent& evt );
 
 };
 
 namespace Msgbox
 {
 	extern int	ShowModal( BaseMessageBoxEvent& evt );
+	extern int	ShowModal( const wxString& title, const wxString& content, const MsgButtons& buttons );
 }

 

  ViewVC Help
Powered by ViewVC 1.1.22