Add wxUSE_THREADS checks around wxMSW functions dealing with threads.

This removes the code unneeded in wxUSE_THREADS==0 build and also fixes
compilation of wxGUIAppTraits::WaitForThread() which didn't compile any more
with wxUSE_THREADS==0 since r67185.

Closes #13050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/apptbase.h b/include/wx/msw/apptbase.h
index 366741807164662a3476a8b7d7a87d49925287d4..9e38a61d1178f6bf7099f9bafd5f84fb710f5302 100644 (file)
--- a/include/wx/msw/apptbase.h
+++ b/include/wx/msw/apptbase.h
@@ -31,6 +31,7 @@ public:
     virtual void AfterChildWaitLoop(void *data) = 0;
 
 
     virtual void AfterChildWaitLoop(void *data) = 0;
 
 

+#if wxUSE_THREADS

     // wxThread helpers
     // ----------------
 
     // wxThread helpers
     // ----------------
 


@@ -41,6 +42,7 @@ public:
     // 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, int flags) = 0;
     // 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, int flags) = 0;

+#endif // wxUSE_THREADS

 
 
 #ifndef __WXWINCE__
 
 
 #ifndef __WXWINCE__


@@ -60,9 +62,11 @@ public:
 #endif // !__WXWINCE__
 
 protected:
 #endif // !__WXWINCE__
 
 protected:

+#if wxUSE_THREADS

     // implementation of WaitForThread() for the console applications which is
     // implementation of WaitForThread() for the console applications which is

-    // also used by the GUI code if it doesn't [yet|already} dispatch events
+    // also used by the GUI code if it doesn't [yet|already] dispatch events

     WXDWORD DoSimpleWaitForThread(WXHANDLE hThread);
     WXDWORD DoSimpleWaitForThread(WXHANDLE hThread);

+#endif // wxUSE_THREADS

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

diff --git a/include/wx/msw/apptrait.h b/include/wx/msw/apptrait.h
index fff22eb0a284593537d7289647fcf6d7b301a1ae..75972e3bfa61dbb0ca97b12c438513dffdf75a3d 100644 (file)
--- a/include/wx/msw/apptrait.h
+++ b/include/wx/msw/apptrait.h
@@ -24,9 +24,11 @@ public:
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);

-#endif
+#endif // wxUSE_TIMER
+#if wxUSE_THREADS

     virtual bool DoMessageFromThreadWait();
     virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
     virtual bool DoMessageFromThreadWait();
     virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);

+#endif // wxUSE_THREADS

 #ifndef __WXWINCE__
     virtual bool CanUseStderr() { return true; }
     virtual bool WriteToStderr(const wxString& text);
 #ifndef __WXWINCE__
     virtual bool CanUseStderr() { return true; }
     virtual bool WriteToStderr(const wxString& text);


@@ -43,10 +45,12 @@ public:
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);

-#endif
+#endif // wxUSE_TIMER
+#if wxUSE_THREADS

     virtual bool DoMessageFromThreadWait();
     virtual bool DoMessageFromThreadWait();

-    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;

     virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
     virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);

+#endif // wxUSE_THREADS
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;

 
 #ifndef __WXWINCE__
     virtual bool CanUseStderr();
 
 #ifndef __WXWINCE__
     virtual bool CanUseStderr();

diff --git a/include/wx/palmos/apptbase.h b/include/wx/palmos/apptbase.h
index 07a8253cd8e92fea4c0ef95a0a4b5a02d8f68eaa..8b1a6af5d710a696e11ab9cac48398b498363e30 100644 (file)
--- a/include/wx/palmos/apptbase.h
+++ b/include/wx/palmos/apptbase.h
@@ -31,12 +31,14 @@ public:
     virtual void AfterChildWaitLoop(void *data) = 0;
 
 
     virtual void AfterChildWaitLoop(void *data) = 0;
 
 

+#if wxUSE_THREADS

     // wxThread helpers
     // ----------------
 
     // process a message while waiting for a(nother) thread, should return
     // false if and only if we have to exit the application
     virtual bool DoMessageFromThreadWait() = 0;
     // wxThread helpers
     // ----------------
 
     // process a message while waiting for a(nother) thread, should return
     // false if and only if we have to exit the application
     virtual bool DoMessageFromThreadWait() = 0;

+#endif // wxUSE_THREADS

 };
 
 #endif // _WX_PALMOS_APPTBASE_H_
 };
 
 #endif // _WX_PALMOS_APPTBASE_H_

diff --git a/include/wx/palmos/apptrait.h b/include/wx/palmos/apptrait.h
index 311514fe3cae8781b59a177dd02c550c172eeeba..998649ad6a7bfaf3a6d0311945dc254f8a54740f 100644 (file)
--- a/include/wx/palmos/apptrait.h
+++ b/include/wx/palmos/apptrait.h
@@ -30,9 +30,11 @@ public:
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) { return new wxPalmOSTimerImpl(timer); }
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) { return new wxPalmOSTimerImpl(timer); }

-#endif
+#endif // wxUSE_TIMER
+#if wxUSE_THREADS

     virtual bool DoMessageFromThreadWait();
     virtual WXDWORD WaitForThread(WXHANDLE hThread);
     virtual bool DoMessageFromThreadWait();
     virtual WXDWORD WaitForThread(WXHANDLE hThread);

+#endif // wxUSE_THREADS

 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI


@@ -46,8 +48,10 @@ public:
 #if wxUSE_TIMER
     // there is no wxTimer support yet
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #if wxUSE_TIMER
     // there is no wxTimer support yet
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);

-#endif
+#endif // wxUSE_TIMER
+#if wxUSE_THREADS

     virtual bool DoMessageFromThreadWait();
     virtual bool DoMessageFromThreadWait();

+#endif // wxUSE_THREADS

     virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 };
 
     virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 };
 

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 324dd87457c9d087802a6bdb3048286777660552..8df236020fc881019c00bcc13610558a0910381d 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -219,6 +219,7 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
     delete data;
 }
 
     delete data;
 }
 

+#if wxUSE_THREADS

 bool wxGUIAppTraits::DoMessageFromThreadWait()
 {
     // we should return false only if the app should exit, i.e. only if
 bool wxGUIAppTraits::DoMessageFromThreadWait()
 {
     // we should return false only if the app should exit, i.e. only if


@@ -258,6 +259,7 @@ DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread, int flags)
                QS_ALLPOSTMESSAGE
              );
 }
                QS_ALLPOSTMESSAGE
              );
 }

+#endif // wxUSE_THREADS

 
 wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
 {
 
 wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
 {

diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp
index 91597dcb5f88f05cb5d74ac9de756d93c66b0256..67ab1674a6ea4423aee72d14c953676c59bd8301 100644 (file)
--- a/src/msw/basemsw.cpp
+++ b/src/msw/basemsw.cpp
@@ -43,10 +43,12 @@
 // wxAppTraits implementation
 // ============================================================================
 
 // wxAppTraits implementation
 // ============================================================================
 

+#if wxUSE_THREADS

 WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
 {
     return ::WaitForSingleObject((HANDLE)hThread, INFINITE);
 }
 WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
 {
     return ::WaitForSingleObject((HANDLE)hThread, INFINITE);
 }

+#endif // wxUSE_THREADS

 
 // ============================================================================
 // wxConsoleAppTraits implementation
 
 // ============================================================================
 // wxConsoleAppTraits implementation


@@ -63,12 +65,19 @@ void wxConsoleAppTraits::AfterChildWaitLoop(void * WXUNUSED(data))
     // nothing to do here
 }
 
     // nothing to do here
 }
 

+#if wxUSE_THREADS

 bool wxConsoleAppTraits::DoMessageFromThreadWait()
 {
     // nothing to process here
     return true;
 }
 
 bool wxConsoleAppTraits::DoMessageFromThreadWait()
 {
     // nothing to process here
     return true;
 }
 

+WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread, int WXUNUSED(flags))
+{
+    return DoSimpleWaitForThread(hThread);
+}
+#endif // wxUSE_THREADS
+

 #if wxUSE_TIMER
 
 wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
 #if wxUSE_TIMER
 
 wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)


@@ -88,11 +97,6 @@ wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
 }
 
 
 }
 
 

-WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread, int WXUNUSED(flags))
-{
-    return DoSimpleWaitForThread(hThread);
-}
-

 bool wxConsoleAppTraits::WriteToStderr(const wxString& text)
 {
     return wxFprintf(stderr, "%s", text) != -1;
 bool wxConsoleAppTraits::WriteToStderr(const wxString& text)
 {
     return wxFprintf(stderr, "%s", text) != -1;

diff --git a/src/palmos/app.cpp b/src/palmos/app.cpp
index 8ff97b1088be1eede7ac5b25fe3ab4348f7f6961..5e78e97f62ea76750ce8b1b45a8824bad97108eb 100644 (file)
--- a/src/palmos/app.cpp
+++ b/src/palmos/app.cpp
@@ -104,10 +104,12 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
 {
 }
 
 {
 }
 

+#if wxUSE_THREADS

 bool wxGUIAppTraits::DoMessageFromThreadWait()
 {
     return false;
 }
 bool wxGUIAppTraits::DoMessageFromThreadWait()
 {
     return false;
 }

+#endif // wxUSE_THREADS

 
 wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
 {
 
 wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
 {

diff --git a/src/palmos/base.cpp b/src/palmos/base.cpp
index 2feeb27b1203dcb9d535c0957857b6f34c9aa4a0..5792e14937336a8bef5d061ae93ee81d3f4fc565 100644 (file)
--- a/src/palmos/base.cpp
+++ b/src/palmos/base.cpp
@@ -44,6 +44,7 @@ void wxConsoleAppTraits::AfterChildWaitLoop(void * WXUNUSED(data))
 {
 }
 
 {
 }
 

+#if wxUSE_THREADS

 bool wxConsoleAppTraits::DoMessageFromThreadWait()
 {
     return true;
 bool wxConsoleAppTraits::DoMessageFromThreadWait()
 {
     return true;


@@ -54,6 +55,7 @@ WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread)
     // TODO
     return 0;
 }
     // TODO
     return 0;
 }

+#endif // wxUSE_THREADS

 
 #if wxUSE_CONSOLE_EVENTLOOP
 wxEventLoopBase *
 
 #if wxUSE_CONSOLE_EVENTLOOP
 wxEventLoopBase *