Include wx/timer.h according to precompiled headers of wx/wx.h (with other minor cleaning).

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

src/cocoa/mediactrl.mm

@@ -24,16 +24,17 @@
 #pragma hdrstop
 #endif
 
-//---------------------------------------------------------------------------
-// Includes
-//---------------------------------------------------------------------------
-#include "wx/mediactrl.h"
-
 //---------------------------------------------------------------------------
 // Compilation guard
 //---------------------------------------------------------------------------
 #if wxUSE_MEDIACTRL
 
+#include "wx/mediactrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/timer.h"
+#endif
+
 //===========================================================================
 //  BACKEND DECLARATIONS
 //===========================================================================
@@ -47,7 +48,6 @@
 //---------------------------------------------------------------------------
 //  QT Includes
 //---------------------------------------------------------------------------
-#include "wx/timer.h"
 #include <QuickTime/QuickTime.h>
 
 #include "wx/cocoa/autorelease.h"

src/cocoa/timer.mm

@@ -22,8 +22,9 @@
 
 #if wxUSE_TIMER
 
+#include "wx/timer.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/timer.h"
 #endif
 
 #include "wx/cocoa/autorelease.h"
@@ -76,7 +77,7 @@ IMPLEMENT_CLASS(wxTimer, wxTimerBase)
 {
     m_timer->Notify(); //wxTimerBase method
 }
-@end 
+@end
 
 // ----------------------------------------------------------------------------
 // wxTimer
@@ -95,18 +96,18 @@ void wxTimer::Init()
 bool wxTimer::Start(int millisecs, bool oneShot)
 {
     Stop();
-    
+
     wxAutoNSAutoreleasePool thePool;
 
     wxNSTimerData *timerData = [[wxNSTimerData alloc] initWithWxTimer:this];
-    m_cocoaNSTimer =     [[NSTimer 
+    m_cocoaNSTimer =     [[NSTimer
             scheduledTimerWithTimeInterval: millisecs / 1000.0 //seconds
-            target:	timerData
+            target:     timerData
-            selector:	@selector(onNotify:) 
+            selector:   @selector(onNotify:)
-            userInfo:	nil
+            userInfo:   nil
-            repeats:	oneShot == false] retain];
+            repeats:    oneShot == false] retain];
     [timerData release];
-                       
+
     return IsRunning();
 }
 

src/common/combocmn.cpp

@@ -31,11 +31,11 @@
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/dcbuffer.h"
 #include "wx/tooltip.h"
-#include "wx/timer.h"
 
 #include "wx/combo.h"
 

src/common/socket.cpp

@@ -32,10 +32,10 @@
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/apptrait.h"
-#include "wx/timer.h"
 #include "wx/module.h"
 
 #include "wx/sckaddr.h"

src/generic/datavgen.cpp

@@ -24,13 +24,13 @@
     #include "wx/sizer.h"
     #include "wx/log.h"
     #include "wx/dcclient.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/stockitem.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #include "wx/renderer.h"
-#include "wx/timer.h"
 #include "wx/settings.h"
 
 #ifdef __WXMSW__

src/generic/scrlwing.cpp

@@ -35,10 +35,9 @@
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/dcclient.h"
-#endif
+    #if wxUSE_TIMER
-
+        #include "wx/timer.h"
-#if wxUSE_TIMER
+    #endif
-    #include "wx/timer.h"
 #endif
 
 #include "wx/sizer.h"

src/generic/tipwin.cpp

@@ -24,17 +24,19 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_TIPWINDOW
+
+#include "wx/tipwin.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
+    #include "wx/timer.h"
 #endif // WX_PRECOMP
+
 #ifdef __WXGTK__
     #include <gtk/gtk.h>
 #endif
-#include "wx/tipwin.h"
 
-#if wxUSE_TIPWINDOW
-
-#include "wx/timer.h"
 #include "wx/settings.h"
 
 // ----------------------------------------------------------------------------

src/generic/treectlg.cpp

@@ -30,10 +30,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/generic/treectlg.h"
-#include "wx/timer.h"
 #include "wx/textctrl.h"
 #include "wx/imaglist.h"
 #include "wx/settings.h"

src/gtk/toplevel.cpp

@@ -29,11 +29,11 @@
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/dialog.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/control.h"
 #include "wx/gtk/private.h"
-#include "wx/timer.h"
 #include "wx/settings.h"
 #include "wx/evtloop.h"
 

src/gtk1/toplevel.cpp

@@ -29,11 +29,11 @@
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/dialog.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/control.h"
 #include "wx/gtk1/private.h"
-#include "wx/timer.h"
 #include "wx/settings.h"
 #include "wx/evtloop.h"
 

src/html/htmlwin.cpp

@@ -22,13 +22,13 @@
     #include "wx/dcclient.h"
     #include "wx/frame.h"
     #include "wx/dcmemory.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmlproc.h"
 #include "wx/clipbrd.h"
 #include "wx/dataobj.h"
-#include "wx/timer.h"
 #include "wx/settings.h"
 
 #include "wx/arrimpl.cpp"

src/mac/carbon/cfsocket.cpp

@@ -27,10 +27,10 @@
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/apptrait.h"
-#include "wx/timer.h"
 #include "wx/module.h"
 
 #include "wx/sckaddr.h"

src/mac/carbon/mediactrl.cpp

@@ -42,11 +42,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/timer.h"
 #endif
 
 // uma is for wxMacFSSpec
 #include "wx/mac/uma.h"
-#include "wx/timer.h"
 
 // standard QT stuff
 #ifndef __DARWIN__

src/mac/carbon/sound.cpp

@@ -21,10 +21,10 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/file.h"
-#include "wx/timer.h"
 
 // Carbon QT Implementation Details -
 //

src/mac/carbon/tooltip.cpp

@@ -17,9 +17,9 @@
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/dc.h"
+    #include "wx/timer.h"
 #endif // WX_PRECOMP
 
-#include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
 
@@ -425,4 +425,4 @@ void wxMacToolTip::Clear()
 #endif
 }
 
-#endif
+#endif // wxUSE_TOOLTIPS

src/mac/classic/timer.cpp

@@ -12,12 +12,12 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/timer.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #endif
 
-#include "wx/timer.h"
-
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 #ifdef __WXMAC__

src/mac/classic/tooltip.cpp

@@ -21,9 +21,9 @@
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/dc.h"
+    #include "wx/timer.h"
 #endif
 
-#include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
 

src/mgl/evtloop.cpp

@@ -22,10 +22,10 @@
     #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/thread.h"
+    #include "wx/timer.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
-#include "wx/timer.h"
 #include "wx/mgl/private.h"
 
 // ----------------------------------------------------------------------------

src/motif/spinbutt.cpp

@@ -15,8 +15,12 @@
 #if wxUSE_SPINBTN
 
 #include "wx/spinbutt.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/timer.h"
+#endif
+
 #include "wx/spinctrl.h"
-#include "wx/timer.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint

src/motif/toolbar.cpp

@@ -29,10 +29,10 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/settings.h"
-#include "wx/timer.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint

src/msw/dialup.cpp

@@ -33,9 +33,9 @@
     #include "wx/intl.h"
     #include "wx/event.h"
     #include "wx/app.h"
+    #include "wx/timer.h"
 #endif
 
-#include "wx/timer.h"
 #include "wx/generic/choicdgg.h"
 
 #include "wx/dynlib.h"

src/msw/mediactrl.cpp

@@ -37,11 +37,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcclient.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/math.h"        // log10 & pow
 #include "wx/msw/private.h" // user info and wndproc setting/getting
-#include "wx/timer.h"
 #include "wx/dynlib.h"
 
 //---------------------------------------------------------------------------
@@ -3340,9 +3340,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)
 // team I believe
 #define MOVIE_DELAY 20
 
-#include "wx/timer.h"
-
-
 //---------------------------------------------------------------------------
 // wxQTLoadTimer
 //

src/msw/mediactrl_am.cpp

@@ -63,11 +63,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcclient.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/math.h"        // log10 & pow
 #include "wx/msw/private.h" // user info and wndproc setting/getting
-#include "wx/timer.h"
 #include "wx/dynlib.h"
 #include "wx/stopwatch.h"
 

src/msw/timer.cpp

@@ -18,6 +18,8 @@
 
 #if wxUSE_TIMER
 
+#include "wx/timer.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/window.h"
@@ -29,8 +31,6 @@
 
 #include "wx/hashmap.h"
 
-#include "wx/timer.h"
-
 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------

src/msw/utils.cpp

@@ -29,6 +29,7 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/timer.h"
 #endif  //WX_PRECOMP
 
 #include "wx/msw/registry.h"
@@ -55,8 +56,6 @@
     #include <winsock.h>
 #endif
 
-#include "wx/timer.h"
-
 #if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     #include <direct.h>
 

src/os2/timer.cpp

@@ -12,6 +12,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/timer.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/window.h"
@@ -23,8 +25,6 @@
 
 #include "wx/os2/private.h"
 
-#include "wx/timer.h"
-
 #include <time.h>
 #include <sys/types.h>
 

src/os2/utilsgui.cpp

@@ -28,10 +28,10 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/cursor.h"
+    #include "wx/timer.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
-#include "wx/timer.h"
 
 #include "wx/os2/private.h"     // includes <windows.h>
 
@@ -44,29 +44,27 @@
 // ----------------------------------------------------------------------------
 
 // Sleep for nSecs seconds. Attempt a Windows implementation using timers.
-static bool inTimer = FALSE;
+static bool inTimer = false;
 
 class wxSleepTimer: public wxTimer
 {
 public:
     inline void Notify()
     {
-        inTimer = FALSE;
+        inTimer = false;
         Stop();
     }
 };
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 #if wxUSE_RESOURCES
-bool wxWriteResource(
+bool wxWriteResource( const wxString& rSection,
-  const wxString&                   rSection
+                      const wxString& rEntry,
-, const wxString&                   rEntry
+                      const wxString& rValue,
-, const wxString&                   rValue
+                      const wxString& rFile )
-, const wxString&                   rFile
-)
 {
-    HAB                             hab = 0;
+    HAB  hab = 0;
-    HINI                            hIni = 0;
+    HINI hIni = 0;
 
     if (!rFile.empty())
     {
@@ -86,7 +84,7 @@ bool wxWriteResource(
                                         ,(PSZ)WXSTRINGCAST rEntry
                                         ,(PSZ)WXSTRINGCAST rValue
                                        ));
-    return FALSE;
+    return false;
 }
 
 bool wxWriteResource(
@@ -123,34 +121,26 @@ bool wxWriteResource(
                           );
 }
 
-bool wxWriteResource(
+bool wxWriteResource( const wxString& rSection,
-  const wxString&                   rSection
+                      const wxString& rEntry,
-, const wxString&                   rEntry
+                      int lValue,
-, int                               lValue
+                      const wxString& rFile )
-, const wxString&                   rFile
-)
 {
-    wxChar                          zBuf[50];
+    wxChar zBuf[50];
 
     wxSprintf(zBuf, "%d", lValue);
-    return wxWriteResource( rSection
+    return wxWriteResource( rSection, rEntry, zBuf, rFile );
-                           ,rEntry
-                           ,zBuf
-                           ,rFile
-                          );
 }
 
-bool wxGetResource(
+bool wxGetResource( const wxString& rSection,
-  const wxString&                   rSection
+                    const wxString& rEntry,
-, const wxString&                   rEntry
+                    wxChar** ppValue,
-, wxChar**                          ppValue
+                    const wxString& rFile )
-, const wxString&                   rFile
-)
 {
-    HAB                             hab = 0;
+    HAB    hab = 0;
-    HINI                            hIni = 0;
+    HINI   hIni = 0;
-    wxChar                          zDefunkt[] = _T("$$default");
+    wxChar zDefunkt[] = _T("$$default");
-    char                            zBuf[1000];
+    char   zBuf[1000];
 
     if (!rFile.empty())
     {
@@ -165,13 +155,13 @@ bool wxGetResource(
                                               ,1000
                                              );
             if (zBuf == NULL)
-                return FALSE;
+                return false;
             if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)
-                return FALSE;
+                return false;
             zBuf[n-1] = '\0';
         }
         else
-            return FALSE;
+            return false;
     }
     else
     {
@@ -183,100 +173,70 @@ bool wxGetResource(
                                           ,1000
                                          );
         if (zBuf == NULL)
-            return FALSE;
+            return false;
         if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)
-            return FALSE;
+            return false;
         zBuf[n-1] = '\0';
     }
     strcpy((char*)*ppValue, zBuf);
-    return TRUE;
+    return true;
 }
 
-bool wxGetResource(
+bool wxGetResource( const wxString& rSection,
-  const wxString&                   rSection
+                    const wxString& rEntry,
-, const wxString&                   rEntry
+                    float* pValue,
-, float*                            pValue
+                    const wxString& rFile )
-, const wxString&                   rFile
-)
 {
-    wxChar*                         zStr = NULL;
+    wxChar* zStr = NULL;
 
     zStr = new wxChar[1000];
-    bool                            bSucc = wxGetResource( rSection
+    bool bSucc = wxGetResource( rSection, rEntry, (wxChar **)&zStr, rFile );
-                                                          ,rEntry
-                                                          ,(wxChar **)&zStr
-                                                          ,rFile
-                                                         );
 
     if (bSucc)
     {
         *pValue = (float)wxStrtod(zStr, NULL);
-        delete[] zStr;
-        return TRUE;
-    }
-    else
-    {
-        delete[] zStr;
-        return FALSE;
     }
+
+    delete[] zStr;
+    return bSucc;
 }
 
-bool wxGetResource(
+bool wxGetResource( const wxString& rSection,
-  const wxString&                   rSection
+                    const wxString& rEntry,
-, const wxString&                   rEntry
+                    long* pValue,
-, long*                             pValue
+                    const wxString& rFile )
-, const wxString&                   rFile
-)
 {
-    wxChar*                           zStr = NULL;
+    wxChar* zStr = NULL;
 
     zStr = new wxChar[1000];
-    bool                              bSucc = wxGetResource( rSection
+    bool bSucc = wxGetResource( rSection, rEntry, (wxChar **)&zStr, rFile );
-                                                            ,rEntry
-                                                            ,(wxChar **)&zStr
-                                                            ,rFile
-                                                           );
 
     if (bSucc)
     {
         *pValue = wxStrtol(zStr, NULL, 10);
-        delete[] zStr;
-        return TRUE;
-    }
-    else
-    {
-        delete[] zStr;
-        return FALSE;
     }
+
+    delete[] zStr;
+    return bSucc;
 }
 
-bool wxGetResource(
+bool wxGetResource( const wxString& rSection,
-  const wxString&                   rSection
+                    const wxString& rEntry,
-, const wxString&                   rEntry
+                    int* pValue,
-, int*                              pValue
+                    const wxString& rFile )
-, const wxString&                   rFile
-)
 {
-    wxChar*                         zStr = NULL;
+    wxChar* zStr = NULL;
 
     zStr = new wxChar[1000];
-    bool                            bSucc = wxGetResource( rSection
+    bool bSucc = wxGetResource( rSection, rEntry, (wxChar **)&zStr, rFile );
-                                                          ,rEntry
-                                                          ,(wxChar **)&zStr
-                                                          ,rFile
-                                                         );
 
     if (bSucc)
     {
         *pValue = (int)wxStrtol(zStr, NULL, 10);
-        delete[] zStr;
-        return TRUE;
-    }
-    else
-    {
-        delete[] zStr;
-        return FALSE;
     }
+
+    delete[] zStr;
+    return bSucc;
 }
 #endif // wxUSE_RESOURCES
 
@@ -313,7 +273,7 @@ void wxEndBusyCursor()
     }
 }
 
-// TRUE if we're between the above two calls
+// true if we're between the above two calls
 bool wxIsBusy()
 {
     return (gs_wxBusyCursorCount > 0);
@@ -321,26 +281,24 @@ bool wxIsBusy()
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
-bool wxCheckForInterrupt(
+bool wxCheckForInterrupt( wxWindow* pWnd )
-  wxWindow*                         pWnd
-)
 {
     if(pWnd)
     {
-        QMSG                        vMsg;
+        QMSG vMsg;
-        HAB                         hab = 0;
+        HAB  hab = 0;
-        HWND                        hwndFilter = NULLHANDLE;
+        HWND hwndFilter = NULLHANDLE;
 
         while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE))
         {
             ::WinDispatchMsg(hab, &vMsg);
         }
-        return TRUE;//*** temporary?
+        return true;//*** temporary?
     }
     else
     {
         wxFAIL_MSG(_T("pWnd==NULL !!!"));
-        return FALSE;//*** temporary?
+        return false;//*** temporary?
     }
 }
 
@@ -362,7 +320,7 @@ void wxGetMousePosition(
     *pY = vPt.y;
 };
 
-// Return TRUE if we have a colour display
+// Return true if we have a colour display
 bool wxColourDisplay()
 {
 #if 0
@@ -377,7 +335,7 @@ bool wxColourDisplay()
 #else
     // I don't see how the PM display could not be color. Besides, this
     // was leaking DCs and PSs!!!  MN
-    return TRUE;
+    return true;
 #endif
 }
 

src/palmos/timer.cpp

@@ -18,6 +18,8 @@
 
 #if wxUSE_TIMER
 
+#include "wx/timer.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/window.h"
@@ -29,8 +31,6 @@
 
 #include "wx/hashmap.h"
 
-#include "wx/timer.h"
-
 #include "wx/palmos/private.h"
 
 // from utils.cpp

src/palmos/utils.cpp

@@ -29,12 +29,12 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/timer.h"
 #endif  //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #include "wx/dynload.h"
 #include "wx/confbase.h"
-#include "wx/timer.h"
 
 #include <MemoryMgr.h>
 #include <DLServer.h>
@@ -270,4 +270,3 @@ extern long wxCharsetToCodepage(const wxChar *name)
 }
 
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
-

src/unix/dialup.cpp

@@ -23,9 +23,9 @@
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/timer.h"
 #endif // !PCH
 
-#include "wx/timer.h"
 #include "wx/filefn.h"
 #include "wx/ffile.h"
 #include "wx/process.h"

src/unix/mediactrl.cpp

@@ -31,10 +31,10 @@
 #ifndef  WX_PRECOMP
     #include "wx/log.h"             // wxLogDebug/wxLogSysError/wxLogTrace
     #include "wx/app.h"             // wxTheApp->argc, wxTheApp->argv
+    #include "wx/timer.h"           // wxTimer
 #endif
 
 #include "wx/thread.h"              // wxMutex/wxMutexLocker
-#include "wx/timer.h"               // wxTimer
 
 #ifdef __WXGTK__
 #    include "wx/gtk/win_gtk.h"     // for <gdk/gdkx.h>/GDK_WINDOW_XWINDOW

src/unix/threadpsx.cpp

@@ -33,10 +33,10 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/module.h"
-#include "wx/timer.h"
 #include "wx/stopwatch.h"
 
 #include <stdio.h>

src/x11/app.cpp

@@ -22,13 +22,13 @@
     #include "wx/frame.h"
     #include "wx/icon.h"
     #include "wx/dialog.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/evtloop.h"
-#include "wx/timer.h"
 #include "wx/filename.h"
 
 #include "wx/univ/theme.h"

src/x11/evtloop.cpp

@@ -26,10 +26,10 @@
     #include "wx/hash.h"
     #include "wx/app.h"
     #include "wx/window.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/tooltip.h"
-#include "wx/timer.h"
 #include "wx/module.h"
 #include "wx/unix/private.h"
 #include "wx/x11/private.h"

src/x11/reparent.cpp

@@ -31,10 +31,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/evtloop.h"
-#include "wx/timer.h"
 
 #include "wx/x11/private.h"
 #include "X11/Xatom.h"

src/x11/window.cpp

@@ -38,6 +38,7 @@
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
+    #include "wx/timer.h"
 #endif
 
 #include "wx/layout.h"
@@ -58,11 +59,6 @@
 #include "wx/x11/private.h"
 #include "X11/Xutil.h"
 
-#if wxUSE_NANOX
-// For wxGetLocalTime, used by XButtonEventGetTime
-#include "wx/timer.h"
-#endif
-
 #include <string.h>
 
 // ----------------------------------------------------------------------------