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

include/wx/event.h

@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_EVENT_H__
+#ifndef _WX_EVENT_H_
-#define _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_

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

include/wx/unix/joystick.h

@@ -9,11 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __JOYSTICKH__
+#ifndef _WX_UNIX_JOYSTICK_H_
-#define __JOYSTICKH__
+#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
+#endif // _WX_UNIX_JOYSTICK_H_
-    // __JOYSTICKH__

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>

src/common/event.cpp

@@ -43,6 +43,8 @@
     #endif // wxUSE_GUI
 #endif
 
+#include "wx/thread.h"
+
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------

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)

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"

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)
 {

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>
 

src/mac/carbon/msgdlg.cpp

@@ -18,6 +18,7 @@
     #include "wx/app.h"
 #endif
 
+#include "wx/thread.h"
 #include "wx/mac/uma.h"
 
 

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"

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"

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);
 

src/msw/utilsexc.cpp

@@ -36,7 +36,7 @@
 #endif
 
 #include "wx/process.h"
-
+#include "wx/thread.h"
 #include "wx/apptrait.h"
 
 

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>