From: Paul Cornett Date: Mon, 3 Dec 2007 02:55:14 +0000 (+0000) Subject: remove unneccessary header dependencies on wx/thread.h X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/204abcd474fa99071b7bb5b00f7e212b0bde16dc 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 5e5c4177a2..ffea5e3562 100644 --- 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 a3cf858c4f..30e0edb2ca 100644 --- 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 62b4ec7eff..614a9d8f53 100644 --- 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 0a33d3b00f..68ae29e358 100644 --- 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 diff --git a/src/common/event.cpp b/src/common/event.cpp index 0b196d5d72..c6943ad14e 100644 --- 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 5a185bf899..fc7248f61a 100644 --- 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 203d79a063..825901734d 100644 --- 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 3f94268d21..4ab6fa8e23 100644 --- 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 4a2bf61873..566f3a34a7 100644 --- 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 diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp index 9a6de9e120..a7a347456a 100644 --- 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 f44ec41d34..34c4a0ea7c 100644 --- 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 9606840cdd..ef5379e82b 100644 --- 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 48dfc76523..63f1688349 100644 --- 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 60dc54d9e1..703088a463 100644 --- 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 15f49db961..b96c009826 100644 --- 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 #include #include