remove unneccessary header dependencies on wx/thread.h

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 5e5c4177a23c7f3173833bc03c3b157ddffb65ff..ffea5e3562f68ce87b5215c226891bcca8c5f96b 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_EVENT_H__
-#define _WX_EVENT_H__
+#ifndef _WX_EVENT_H_
+#define _WX_EVENT_H_
 
 #include "wx/defs.h"
 #include "wx/cpp.h"
@@ -22,8 +22,6 @@
     #include "wx/cursor.h"
 #endif
 
-#include "wx/thread.h"
-
 #include "wx/dynarray.h"
 
 // ----------------------------------------------------------------------------
@@ -31,7 +29,9 @@
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_FWD_BASE wxList;
-
+#if wxUSE_THREADS
+    class WXDLLIMPEXP_FWD_BASE wxCriticalSection;
+#endif
 #if wxUSE_GUI
     class WXDLLIMPEXP_FWD_CORE wxDC;
     class WXDLLIMPEXP_FWD_CORE wxMenu;
@@ -3112,4 +3112,4 @@ WXDLLIMPEXP_CORE wxWindow* wxFindFocusDescendant(wxWindow* ancestor);
 
 #endif // wxUSE_GUI
 
-#endif // _WX_EVENT_H__
+#endif // _WX_EVENT_H_

diff --git a/include/wx/log.h b/include/wx/log.h
index a3cf858c4fa98be288b0c1693e29ef18ec11c228..30e0edb2cae0016aa06d0f603dd43f5fae056d1c 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -14,7 +14,9 @@
 
 #include "wx/defs.h"
 
-#include "wx/thread.h"
+#if wxUSE_THREADS
+    class WXDLLIMPEXP_FWD_BASE wxCriticalSection;
+#endif
 
 // ----------------------------------------------------------------------------
 // common constants for use in wxUSE_LOG/!wxUSE_LOG
@@ -316,7 +318,9 @@ private:
     // with the number of times it was repeated
     static bool        ms_bRepetCounting;
 
-    wxCRIT_SECT_DECLARE(ms_prevCS);     // protects the ms_prev values below
+#if wxUSE_THREADS
+    static wxCriticalSection ms_prevCS; // protects the ms_prev values below
+#endif
     static wxString    ms_prevString;   // previous message that was logged
     static unsigned    ms_prevCounter;  // how many times it was repeated
     static time_t      ms_prevTimeStamp;// timestamp of the previous message

diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h
index 62b4ec7effeb03729215ec0860b29b8a00d39c28..614a9d8f53194b498dc0abcf11f8d46e3d11161f 100644 (file)
--- a/include/wx/unix/joystick.h
+++ b/include/wx/unix/joystick.h
@@ -9,11 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __JOYSTICKH__
-#define __JOYSTICKH__
+#ifndef _WX_UNIX_JOYSTICK_H_
+#define _WX_UNIX_JOYSTICK_H_
 
 #include "wx/event.h"
-#include "wx/thread.h"
 
 class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
 
@@ -93,5 +92,4 @@ protected:
     wxJoystickThread*   m_thread;
 };
 
-#endif
-    // __JOYSTICKH__
+#endif // _WX_UNIX_JOYSTICK_H_

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 0a33d3b00f966a95587b053b3565e47a33418c1b..68ae29e35821adee26a75bde6657667dfe9d6071 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -44,6 +44,7 @@
 #include "wx/msgout.h"
 #include "wx/ptr_scpd.h"
 #include "wx/tokenzr.h"
+#include "wx/thread.h"
 
 #if wxUSE_EXCEPTIONS && wxUSE_STL
     #include <exception>

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 0b196d5d72dac8bc42086d0619f80298019ff0ba..c6943ad14e306bc8253eb34451d8946a53315864 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -43,6 +43,8 @@
     #endif // wxUSE_GUI
 #endif
 
+#include "wx/thread.h"
+
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 5a185bf899c0a7e8a1e53e8b943fcbfffb74595b..fc7248f61a8e0d685e67f6732dfc5209e81dd09d 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -32,6 +32,7 @@
 #include "wx/url.h"
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
+#include "wx/thread.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true)

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 203d79a063ee15f2f94fd29dfa31f47b820d7c9b..825901734d8fec9c43594f07c9020900862881de 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -37,9 +37,9 @@
 #endif
 
 #include "wx/apptrait.h"
-
 #include "wx/sckaddr.h"
 #include "wx/stopwatch.h"
+#include "wx/thread.h"
 
 // DLL options compatibility check:
 #include "wx/build.h"

diff --git a/src/common/timerimpl.cpp b/src/common/timerimpl.cpp
index 3f94268d218ef9f88d6a81870df78c398ab2a0f5..4ab6fa8e23950216290c6ae1075ba22be5064a21 100644 (file)
--- a/src/common/timerimpl.cpp
+++ b/src/common/timerimpl.cpp
@@ -29,6 +29,7 @@
 
 #include "wx/private/timer.h"
 #include "wx/utils.h"               // for wxNewId()
+#include "wx/thread.h"
 
 wxTimerImpl::wxTimerImpl(wxTimer *timer)
 {

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 4a2bf618732431b9dceb17cd13e8d1365ec36759..566f3a34a7931297a85a9de229829abc96ea064f 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -39,6 +39,7 @@
 #include "wx/docview.h"
 #include "wx/filename.h"
 #include "wx/link.h"
+#include "wx/thread.h"
 
 #include <string.h>
 

diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index 9a6de9e120abb2e0fc70a443274fe8c122d05fbc..a7a347456ab79419b00626784044045153e15336 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -18,6 +18,7 @@
     #include "wx/app.h"
 #endif
 
+#include "wx/thread.h"
 #include "wx/mac/uma.h"
 
 

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index f44ec41d345ec4ae6a4e20abc90b9e5e89731d43..34c4a0ea7ccdd2c4f2b1897daea789c0ee546549 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -44,6 +44,7 @@
 
 #include "wx/filefn.h"
 #include "wx/sysopt.h"
+#include "wx/thread.h"
 
 #include "wx/mac/uma.h"
 #include "wx/mac/carbon/private/mactext.h"

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 9606840cdd95e2e1abbab3c133c0b7e8203e108d..ef5379e82b6e03d39e20da5fa3b8673dd571fb74 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -49,6 +49,7 @@
 #include "wx/filename.h"
 #include "wx/dynlib.h"
 #include "wx/evtloop.h"
+#include "wx/thread.h"
 
 #include "wx/msw/private.h"
 #include "wx/msw/ole/oleutils.h"

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 48dfc765232c5f3ce1ae8708fb10867c91c4644a..63f1688349630ce88af04ad2806c22c2130be65d 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -32,18 +32,14 @@
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
-
-
+#include "wx/thread.h"
 #include "wx/except.h"
 #include "wx/ptr_scpd.h"
-
 #include "wx/msw/private.h"
 
 #if wxUSE_GUI
     #include "wx/tooltip.h"
     #if wxUSE_THREADS
-        #include "wx/thread.h"
-
         // define the list of MSG strutures
         WX_DECLARE_LIST(MSG, wxMsgList);
 

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 60dc54d9e1738c628c5f746dd33cd83cfd2b65f9..703088a463d8b37d3c111e471f3c8e01e1913258 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -36,7 +36,7 @@
 #endif
 
 #include "wx/process.h"
-
+#include "wx/thread.h"
 #include "wx/apptrait.h"
 
 

diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp
index 15f49db961bc7ddd115bfbad4fb4feefe480df07..b96c009826e6503e0a03e26a397f18836c405b66 100644 (file)
--- a/src/unix/joystick.cpp
+++ b/src/unix/joystick.cpp
@@ -21,6 +21,8 @@
     #include "wx/window.h"
 #endif //WX_PRECOMP
 
+#include "wx/thread.h"
+
 #include <linux/joystick.h>
 #include <sys/types.h>
 #include <sys/stat.h>