X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2739d4f0528b324700973169b67750107568bf12..a7f8eb6d0fe67f96eb6b7e3a88ba27d80756162b:/include/wx/msw/apptbase.h?ds=inline

diff --git a/include/wx/msw/apptbase.h b/include/wx/msw/apptbase.h
index e7cfa68886..0284e348d7 100644
--- a/include/wx/msw/apptbase.h
+++ b/include/wx/msw/apptbase.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     22.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -16,7 +16,7 @@
 // wxAppTraits: the MSW version adds extra hooks needed by MSW-only code
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase
+class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
 {
 public:
     // wxExecute() support methods
@@ -41,12 +41,14 @@ public:
     // false if and only if we have to exit the application
     virtual bool DoMessageFromThreadWait() = 0;
 
-    // other miscellaneous helpers
-    // ---------------------------
+    // 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;
 
-    // under MSW this function does the same thing for console and GUI
-    // applications so we can implement it directly in the base class
-    virtual int GetOSVersion(int *verMaj, int *verMin);
+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_