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 9ff5edbe649aaaf7da86bf9324659ccdab98a985..82d81c331af9935b58e489ad334b95e9523a2449 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -12,9 +12,9 @@
 #ifndef _WX_EVTLOOP_H_
 #define _WX_EVTLOOP_H_
 
 #ifndef _WX_EVTLOOP_H_
 #define _WX_EVTLOOP_H_
 

+#include "wx/event.h"

 #include "wx/utils.h"
 
 #include "wx/utils.h"
 

-

 /*
     NOTE ABOUT wxEventLoopBase::YieldFor LOGIC
     ------------------------------------------
 /*
     NOTE ABOUT wxEventLoopBase::YieldFor LOGIC
     ------------------------------------------

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index abffb75f8885ef669e96469b64723b9aaf57e025..7981fd26eee3546be769fcb4a6b2532f75f4b436 100644 (file)
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -11,13 +11,13 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#include "wx/evtloop.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #endif //WX_PRECOMP
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #endif //WX_PRECOMP
 

-#include "wx/evtloop.h"
-

 #import <AppKit/NSApplication.h>
 #import <AppKit/NSEvent.h>
 #import <Foundation/NSRunLoop.h>
 #import <AppKit/NSApplication.h>
 #import <AppKit/NSEvent.h>
 #import <Foundation/NSRunLoop.h>

diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index dc42cdbf023fe0f069f6853bd15bf1f457a0f136..482324cd4e0ac64d8788db88a9560c6095ec2da8 100644 (file)
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -9,14 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -24,13 +16,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/evtloop.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/event.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/evtloop.h"
-

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index aa294c31c4787f1559d037d4f8b11c9d2fa9c822..d452e18d3a91e65fb13c5a675b12d69239da41dc 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -24,14 +24,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/evtloop.h"
+

 #ifndef WX_PRECOMP
     #if wxUSE_GUI
         #include "wx/window.h"
     #endif
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #if wxUSE_GUI
         #include "wx/window.h"
     #endif
     #include "wx/app.h"

+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/evtloop.h"

 #include "wx/thread.h"
 #include "wx/except.h"
 #include "wx/msw/private.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 a1c1f613d66e91ca9bbc7480fbf3c0203c1d8c1f..1d607f9eaf4022a5dc0b0f58b96d897dc5a248ea 100644 (file)
--- a/src/osx/cocoa/evtloop.mm
+++ b/src/osx/cocoa/evtloop.mm
@@ -24,13 +24,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/evtloop.h"

 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif // WX_PRECOMP
 
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif // WX_PRECOMP
 

-#include "wx/evtloop.h"
-

 #include "wx/osx/private.h"
 
 // ============================================================================
 #include "wx/osx/private.h"
 
 // ============================================================================

diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp
index 99d9c1e34e7d4d9edeef6b09beb6d51bb2fb4226..4edf70e6969dbaed9077ecacd548510efe8bf811 100644 (file)
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -21,6 +21,8 @@
 
 #if wxUSE_CONSOLE_EVENTLOOP
 
 
 #if wxUSE_CONSOLE_EVENTLOOP
 

+#include "wx/evtloop.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"


@@ -28,7 +30,6 @@
 
 #include <errno.h>
 #include "wx/apptrait.h"
 
 #include <errno.h>
 #include "wx/apptrait.h"

-#include "wx/evtloop.h"

 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/unix/pipe.h"
 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/unix/pipe.h"