1. Moved m_usePrimary to wxClipboardBase as it's now also used by wxMSW/wxMac

[wxWidgets.git] / include / wx / msw / apptbase.h

diff --git a/include/wx/msw/apptbase.h b/include/wx/msw/apptbase.h
index f08f50d1484c72f6d4b0dcc66bdc23685b8f5c9b..0284e348d7b4e24dced67b1d06ffc5e3675c7f91 100644 (file)
--- a/include/wx/msw/apptbase.h
+++ b/include/wx/msw/apptbase.h
@@ -41,8 +41,14 @@ public:
     // false if and only if we have to exit the application
     virtual bool DoMessageFromThreadWait() = 0;
 
     // false if and only if we have to exit the application
     virtual bool DoMessageFromThreadWait() = 0;
 

-    // wait for the handle to be signaled
+    // wait for the handle to be signaled, return WAIT_OBJECT_0 if it is or, in
+    // the GUI code, WAIT_OBJECT_0 + 1 if a Windows message arrived

     virtual WXDWORD WaitForThread(WXHANDLE hThread) = 0;
     virtual WXDWORD WaitForThread(WXHANDLE hThread) = 0;

+
+protected:
+    // implementation of WaitForThread() for the console applications which is
+    // also used by the GUI code if it doesn't [yet|already} dispatch events
+    WXDWORD DoSimpleWaitForThread(WXHANDLE hThread);

 };
 
 #endif // _WX_MSW_APPTBASE_H_
 };
 
 #endif // _WX_MSW_APPTBASE_H_