From: Paul Cornett Date: Mon, 16 Feb 2009 17:19:17 +0000 (+0000) Subject: fix evtloop.h header dependency X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1e04d2bf54dcb336e20a27e906dcebdca368790b?ds=sidebyside fix evtloop.h header dependency implementation headers go first to catch this kind of problem, don't move them to fix a build error git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index 9ff5edbe64..82d81c331a 100644 --- a/include/wx/evtloop.h +++ b/include/wx/evtloop.h @@ -12,9 +12,9 @@ #ifndef _WX_EVTLOOP_H_ #define _WX_EVTLOOP_H_ +#include "wx/event.h" #include "wx/utils.h" - /* NOTE ABOUT wxEventLoopBase::YieldFor LOGIC ------------------------------------------ diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm index abffb75f88..7981fd26ee 100644 --- a/src/cocoa/evtloop.mm +++ b/src/cocoa/evtloop.mm @@ -11,13 +11,13 @@ #include "wx/wxprec.h" +#include "wx/evtloop.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" #endif //WX_PRECOMP -#include "wx/evtloop.h" - #import #import #import diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp index dc42cdbf02..482324cd4e 100644 --- a/src/common/evtloopcmn.cpp +++ b/src/common/evtloopcmn.cpp @@ -9,14 +9,6 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -24,13 +16,12 @@ #pragma hdrstop #endif +#include "wx/evtloop.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/event.h" #endif //WX_PRECOMP -#include "wx/evtloop.h" - // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp index aa294c31c4..d452e18d3a 100644 --- a/src/msw/evtloop.cpp +++ b/src/msw/evtloop.cpp @@ -24,14 +24,16 @@ #pragma hdrstop #endif +#include "wx/evtloop.h" + #ifndef WX_PRECOMP #if wxUSE_GUI #include "wx/window.h" #endif #include "wx/app.h" + #include "wx/log.h" #endif //WX_PRECOMP -#include "wx/evtloop.h" #include "wx/thread.h" #include "wx/except.h" #include "wx/msw/private.h" diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm index a1c1f613d6..1d607f9eaf 100644 --- a/src/osx/cocoa/evtloop.mm +++ b/src/osx/cocoa/evtloop.mm @@ -24,13 +24,12 @@ #pragma hdrstop #endif +#include "wx/evtloop.h" #ifndef WX_PRECOMP #include "wx/app.h" #endif // WX_PRECOMP -#include "wx/evtloop.h" - #include "wx/osx/private.h" // ============================================================================ diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp index 99d9c1e34e..4edf70e696 100644 --- a/src/unix/evtloopunix.cpp +++ b/src/unix/evtloopunix.cpp @@ -21,6 +21,8 @@ #if wxUSE_CONSOLE_EVENTLOOP +#include "wx/evtloop.h" + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/log.h" @@ -28,7 +30,6 @@ #include #include "wx/apptrait.h" -#include "wx/evtloop.h" #include "wx/thread.h" #include "wx/module.h" #include "wx/unix/pipe.h"