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

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

diff --git a/src/cocoa/mediactrl.mm b/src/cocoa/mediactrl.mm
index e6cc52cb9b14fcac2072ecf426181aef088ce13d..46f2ef177a968e8e43e3806dc4c0475ced8e1580 100644 (file)
--- a/src/cocoa/mediactrl.mm
+++ b/src/cocoa/mediactrl.mm
@@ -24,16 +24,17 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-//---------------------------------------------------------------------------
-// Includes
-//---------------------------------------------------------------------------
-#include "wx/mediactrl.h"
-

 //---------------------------------------------------------------------------
 // Compilation guard
 //---------------------------------------------------------------------------
 #if wxUSE_MEDIACTRL
 
 //---------------------------------------------------------------------------
 // Compilation guard
 //---------------------------------------------------------------------------
 #if wxUSE_MEDIACTRL
 

+#include "wx/mediactrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/timer.h"
+#endif
+

 //===========================================================================
 //  BACKEND DECLARATIONS
 //===========================================================================
 //===========================================================================
 //  BACKEND DECLARATIONS
 //===========================================================================


@@ -47,7 +48,6 @@
 //---------------------------------------------------------------------------
 //  QT Includes
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //  QT Includes
 //---------------------------------------------------------------------------

-#include "wx/timer.h"

 #include <QuickTime/QuickTime.h>
 
 #include "wx/cocoa/autorelease.h"
 #include <QuickTime/QuickTime.h>
 
 #include "wx/cocoa/autorelease.h"

diff --git a/src/cocoa/timer.mm b/src/cocoa/timer.mm
index 2dfe2cb30a778bb79380b3e8df3455f0f2c1a167..4815472d7bc3ccb0eb80aec91884facc8f35818b 100644 (file)
--- a/src/cocoa/timer.mm
+++ b/src/cocoa/timer.mm
@@ -22,8 +22,9 @@
 
 #if wxUSE_TIMER
 
 
 #if wxUSE_TIMER
 

+#include "wx/timer.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/timer.h"

 #endif
 
 #include "wx/cocoa/autorelease.h"
 #endif
 
 #include "wx/cocoa/autorelease.h"


@@ -76,7 +77,7 @@ IMPLEMENT_CLASS(wxTimer, wxTimerBase)
 {
     m_timer->Notify(); //wxTimerBase method
 }
 {
     m_timer->Notify(); //wxTimerBase method
 }

-@end 
+@end

 
 // ----------------------------------------------------------------------------
 // wxTimer
 
 // ----------------------------------------------------------------------------
 // wxTimer


@@ -95,18 +96,18 @@ void wxTimer::Init()
 bool wxTimer::Start(int millisecs, bool oneShot)
 {
     Stop();
 bool wxTimer::Start(int millisecs, bool oneShot)
 {
     Stop();

-    
+

     wxAutoNSAutoreleasePool thePool;
 
     wxNSTimerData *timerData = [[wxNSTimerData alloc] initWithWxTimer:this];
     wxAutoNSAutoreleasePool thePool;
 
     wxNSTimerData *timerData = [[wxNSTimerData alloc] initWithWxTimer:this];

-    m_cocoaNSTimer =     [[NSTimer 
+    m_cocoaNSTimer =     [[NSTimer

             scheduledTimerWithTimeInterval: millisecs / 1000.0 //seconds
             scheduledTimerWithTimeInterval: millisecs / 1000.0 //seconds

-            target:    timerData
-            selector:  @selector(onNotify:) 
-            userInfo:  nil
-            repeats:   oneShot == false] retain];
+            target:     timerData
+            selector:   @selector(onNotify:)
+            userInfo:   nil
+            repeats:    oneShot == false] retain];

     [timerData release];
     [timerData release];

-                       
+

     return IsRunning();
 }
 
     return IsRunning();
 }
 

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index e2cb098146a7688fa5e4afc0d4b84c7d3b9e3593..44b92449d44fa28466d226247dc8df53a902d825 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -31,11 +31,11 @@
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"
     #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"
 #endif
 
 #include "wx/dcbuffer.h"
 #include "wx/tooltip.h"

-#include "wx/timer.h"

 
 #include "wx/combo.h"
 
 
 #include "wx/combo.h"
 

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 080518cd0ee4d0f5bcbdde05c0b8fa1fe7e1e682..11d97cccc433cba57f797ac6e210cf7ed3179f2e 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -32,10 +32,10 @@
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/timer.h"

 #endif
 
 #include "wx/apptrait.h"
 #endif
 
 #include "wx/apptrait.h"

-#include "wx/timer.h"

 #include "wx/module.h"
 
 #include "wx/sckaddr.h"
 #include "wx/module.h"
 
 #include "wx/sckaddr.h"

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 662fcb16df7571d1d3f9f51991b14a5c0cf0b7f6..808f61b18e7b29326e230737ecd3a8bbf749c4a2 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -24,13 +24,13 @@
     #include "wx/sizer.h"
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #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"
 #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__
 #include "wx/settings.h"
 
 #ifdef __WXMSW__

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 53b6270584321450c34b2645f8f97925b6a84637..e2aced4a81044aa237d39e5d5c6275f34f021f91 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -35,10 +35,9 @@
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/dcclient.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/dcclient.h"

-#endif
-
-#if wxUSE_TIMER
-    #include "wx/timer.h"
+    #if wxUSE_TIMER
+        #include "wx/timer.h"
+    #endif

 #endif
 
 #include "wx/sizer.h"
 #endif
 
 #include "wx/sizer.h"

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 216f8e6828fe71efe3568cec912ca44af4ed9cb4..1dd67eafb333a8fd930b490aee3e9dcbbe9c66c6 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -24,17 +24,19 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_TIPWINDOW
+
+#include "wx/tipwin.h"
+

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

+    #include "wx/timer.h"

 #endif // WX_PRECOMP
 #endif // WX_PRECOMP

+

 #ifdef __WXGTK__
     #include <gtk/gtk.h>
 #endif
 #ifdef __WXGTK__
     #include <gtk/gtk.h>
 #endif

-#include "wx/tipwin.h"
-
-#if wxUSE_TIPWINDOW

 
 

-#include "wx/timer.h"

 #include "wx/settings.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/settings.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 577ecbc4e1615e58d728763662f142675ac6ec01..3c7a235235b42612f427bbd42eb05cc5ed108ca7 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -30,10 +30,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"

+    #include "wx/timer.h"

 #endif
 
 #include "wx/generic/treectlg.h"
 #endif
 
 #include "wx/generic/treectlg.h"

-#include "wx/timer.h"

 #include "wx/textctrl.h"
 #include "wx/imaglist.h"
 #include "wx/settings.h"
 #include "wx/textctrl.h"
 #include "wx/imaglist.h"
 #include "wx/settings.h"

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 597c2a224a64b365103f01589c61ded0643701c2..862dbacbab52e14c110a1a4ff1a1ab13c8893be8 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -29,11 +29,11 @@
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/dialog.h"
     #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"
 #endif
 
 #include "wx/control.h"
 #include "wx/gtk/private.h"

-#include "wx/timer.h"

 #include "wx/settings.h"
 #include "wx/evtloop.h"
 
 #include "wx/settings.h"
 #include "wx/evtloop.h"
 

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 217551845462fe2f6c66de61c118fd33974123ca..c2ee360fb782d10ff084bfa10f95cec75f1ac5d3 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -29,11 +29,11 @@
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/dialog.h"
     #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"
 #endif
 
 #include "wx/control.h"
 #include "wx/gtk1/private.h"

-#include "wx/timer.h"

 #include "wx/settings.h"
 #include "wx/evtloop.h"
 
 #include "wx/settings.h"
 #include "wx/evtloop.h"
 

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 9a081b30f758cc8f6db301fc093f13f7f971c3c0..360a1e646b904bdf1005dbf2da7f3b9e9ebc5ba4 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -22,13 +22,13 @@
     #include "wx/dcclient.h"
     #include "wx/frame.h"
     #include "wx/dcmemory.h"
     #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"
 #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"
 #include "wx/settings.h"
 
 #include "wx/arrimpl.cpp"

diff --git a/src/mac/carbon/cfsocket.cpp b/src/mac/carbon/cfsocket.cpp
index cfeb84963a6efa0e1068dca1b3a110bbb4071edd..bc527d02c23a7692c915665b9f0d5c81be268f96 100644 (file)
--- a/src/mac/carbon/cfsocket.cpp
+++ b/src/mac/carbon/cfsocket.cpp
@@ -27,10 +27,10 @@
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/timer.h"

 #endif
 
 #include "wx/apptrait.h"
 #endif
 
 #include "wx/apptrait.h"

-#include "wx/timer.h"

 #include "wx/module.h"
 
 #include "wx/sckaddr.h"
 #include "wx/module.h"
 
 #include "wx/sckaddr.h"

diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp
index 98d929e57fca04d31f90609a1e9be12dc0efe960..e5cb61a1bc9a01c3dd36bc42b29805fd4c4e1ea8 100644 (file)
--- a/src/mac/carbon/mediactrl.cpp
+++ b/src/mac/carbon/mediactrl.cpp
@@ -42,11 +42,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/timer.h"

 #endif
 
 // uma is for wxMacFSSpec
 #include "wx/mac/uma.h"
 #endif
 
 // uma is for wxMacFSSpec
 #include "wx/mac/uma.h"

-#include "wx/timer.h"

 
 // standard QT stuff
 #ifndef __DARWIN__
 
 // standard QT stuff
 #ifndef __DARWIN__

diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp
index c04f765f72cf051d091013aa114244cdbedc7611..f6ccb1557b2b001d25ecf697a8d6a6287965df40 100644 (file)
--- a/src/mac/carbon/sound.cpp
+++ b/src/mac/carbon/sound.cpp
@@ -21,10 +21,10 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/timer.h"

 #endif
 
 #include "wx/file.h"
 #endif
 
 #include "wx/file.h"

-#include "wx/timer.h"

 
 // Carbon QT Implementation Details -
 //
 
 // Carbon QT Implementation Details -
 //

diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index 1adb42296aa29c52088655a4cf49660944fce9a3..122c76b623d0c5574b8aaf8f80ad7a8dee97d872 100644 (file)
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -17,9 +17,9 @@
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/dc.h"

+    #include "wx/timer.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/timer.h"

 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
 
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
 


@@ -425,4 +425,4 @@ void wxMacToolTip::Clear()
 #endif
 }
 
 #endif
 }
 

-#endif
+#endif // wxUSE_TOOLTIPS

diff --git a/src/mac/classic/timer.cpp b/src/mac/classic/timer.cpp
index 34e288bcdbb1313b81112fc4aaa07601a63ab80d..0b6a4df374c6c307bc8ecd8e73b70695ba5341c1 100644 (file)
--- a/src/mac/classic/timer.cpp
+++ b/src/mac/classic/timer.cpp
@@ -12,12 +12,12 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/timer.h"
+

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

-#include "wx/timer.h"
-

 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 #ifdef __WXMAC__
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 #ifdef __WXMAC__

diff --git a/src/mac/classic/tooltip.cpp b/src/mac/classic/tooltip.cpp
index 9e37daf4613a91de799507e7744213df870db179..4e66d906cb47ca1dac1366c8d732ce1cd24d1c55 100644 (file)
--- a/src/mac/classic/tooltip.cpp
+++ b/src/mac/classic/tooltip.cpp
@@ -21,9 +21,9 @@
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/dc.h"

+    #include "wx/timer.h"

 #endif
 
 #endif
 

-#include "wx/timer.h"

 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
 
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
 

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index 58c868ada8974e59abb4a93050c5fe67721c6f39..076009f6d45c49a58c773e8734076f33a56bb40c 100644 (file)
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -22,10 +22,10 @@
     #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/thread.h"
     #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/thread.h"

+    #include "wx/timer.h"

 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"

-#include "wx/timer.h"

 #include "wx/mgl/private.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/mgl/private.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index fcdc7ec4775e7bec6c0717a18d85515d3944bf7b..4f32323ea2fc5eb75641db4ed058c4b883e3bcac 100644 (file)
--- a/src/motif/spinbutt.cpp
+++ b/src/motif/spinbutt.cpp
@@ -15,8 +15,12 @@
 #if wxUSE_SPINBTN
 
 #include "wx/spinbutt.h"
 #if wxUSE_SPINBTN
 
 #include "wx/spinbutt.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/timer.h"
+#endif
+

 #include "wx/spinctrl.h"
 #include "wx/spinctrl.h"

-#include "wx/timer.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index dc724b395eb881e05c6b3ad54ea847bf80635310..770e1bfcd0fe749731c0924c08fe2c1b226c76a8 100644 (file)
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -29,10 +29,10 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"

+    #include "wx/timer.h"

 #endif
 
 #include "wx/settings.h"
 #endif
 
 #include "wx/settings.h"

-#include "wx/timer.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index 75bd13098d3cbe97e50f6d5649fe7d98fd567f16..5e34902e0c4eb41eebb1b1615faf9edc4805cfe5 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -33,9 +33,9 @@
     #include "wx/intl.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/event.h"
     #include "wx/app.h"

+    #include "wx/timer.h"

 #endif
 
 #endif
 

-#include "wx/timer.h"

 #include "wx/generic/choicdgg.h"
 
 #include "wx/dynlib.h"
 #include "wx/generic/choicdgg.h"
 
 #include "wx/dynlib.h"

diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index 1c328f7c69a511cfc2177b6478e9d0e3082d0a65..afa432cd220ddade679cc524a3475247d6ae9121 100644 (file)
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -37,11 +37,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcclient.h"
 #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
 #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/dynlib.h"
 
 //---------------------------------------------------------------------------


@@ -3340,9 +3340,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)
 // team I believe
 #define MOVIE_DELAY 20
 
 // team I believe
 #define MOVIE_DELAY 20
 

-#include "wx/timer.h"
-
-

 //---------------------------------------------------------------------------
 // wxQTLoadTimer
 //
 //---------------------------------------------------------------------------
 // wxQTLoadTimer
 //

diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp
index 8f0855822fc4272fd0a65851b890d18968a1d6ab..de07e983b14518a662d3e227c847ea3f9ad0a1cc 100644 (file)
--- a/src/msw/mediactrl_am.cpp
+++ b/src/msw/mediactrl_am.cpp
@@ -63,11 +63,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcclient.h"
 #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
 #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"
 
 #include "wx/dynlib.h"
 #include "wx/stopwatch.h"
 

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index fef9ff0dfccddfba8449361f0302949edd7019df..e9904ba27cae700518ec109b39a412985d036111 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -18,6 +18,8 @@
 
 #if wxUSE_TIMER
 
 
 #if wxUSE_TIMER
 

+#include "wx/timer.h"
+

 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/window.h"


@@ -29,8 +31,6 @@
 
 #include "wx/hashmap.h"
 
 
 #include "wx/hashmap.h"
 

-#include "wx/timer.h"
-

 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 9e85f25180dc5c2c4d1eb3d8bc040786df74a4d6..80aa2bb025bba085fb76145587eb6872d8ee70bc 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -29,6 +29,7 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/timer.h"

 #endif  //WX_PRECOMP
 
 #include "wx/msw/registry.h"
 #endif  //WX_PRECOMP
 
 #include "wx/msw/registry.h"


@@ -55,8 +56,6 @@
     #include <winsock.h>
 #endif
 
     #include <winsock.h>
 #endif
 

-#include "wx/timer.h"
-

 #if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     #include <direct.h>
 
 #if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     #include <direct.h>
 

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 9036f7d5aa84dee362cfb3e0fb5cbdcac3b5e239..6d2a8c071db39d856df2f90ab3bc88e53eb07e98 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -12,6 +12,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // 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"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/window.h"


@@ -23,8 +25,6 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-#include "wx/timer.h"
-

 #include <time.h>
 #include <sys/types.h>
 
 #include <time.h>
 #include <sys/types.h>
 

diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp
index e64fc12f9b26533d63c0983e7f5617c17e942d52..9e3748e124c7029fafd1c8491c39a17837a12d79 100644 (file)
--- a/src/os2/utilsgui.cpp
+++ b/src/os2/utilsgui.cpp
@@ -28,10 +28,10 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/cursor.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/cursor.h"

+    #include "wx/timer.h"

 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"

-#include "wx/timer.h"

 
 #include "wx/os2/private.h"     // includes <windows.h>
 
 
 #include "wx/os2/private.h"     // includes <windows.h>
 


@@ -44,29 +44,27 @@
 // ----------------------------------------------------------------------------
 
 // Sleep for nSecs seconds. Attempt a Windows implementation using timers.
 // ----------------------------------------------------------------------------
 
 // 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()
     {
 
 class wxSleepTimer: public wxTimer
 {
 public:
     inline void Notify()
     {

-        inTimer = FALSE;
+        inTimer = false;

         Stop();
     }
 };
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 #if wxUSE_RESOURCES
         Stop();
     }
 };
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 #if wxUSE_RESOURCES

-bool wxWriteResource(
-  const wxString&                   rSection
-, const wxString&                   rEntry
-, const wxString&                   rValue
-, const wxString&                   rFile
-)
+bool wxWriteResource( const wxString& rSection,
+                      const wxString& rEntry,
+                      const wxString& rValue,
+                      const wxString& rFile )

 {
 {

-    HAB                             hab = 0;
-    HINI                            hIni = 0;
+    HAB  hab = 0;
+    HINI hIni = 0;

 
     if (!rFile.empty())
     {
 
     if (!rFile.empty())
     {


@@ -86,7 +84,7 @@ bool wxWriteResource(
                                         ,(PSZ)WXSTRINGCAST rEntry
                                         ,(PSZ)WXSTRINGCAST rValue
                                        ));
                                         ,(PSZ)WXSTRINGCAST rEntry
                                         ,(PSZ)WXSTRINGCAST rValue
                                        ));

-    return FALSE;
+    return false;

 }
 
 bool wxWriteResource(
 }
 
 bool wxWriteResource(


@@ -123,34 +121,26 @@ bool wxWriteResource(
                           );
 }
 
                           );
 }
 

-bool wxWriteResource(
-  const wxString&                   rSection
-, const wxString&                   rEntry
-, int                               lValue
-, const wxString&                   rFile
-)
+bool wxWriteResource( const wxString& rSection,
+                      const wxString& rEntry,
+                      int lValue,
+                      const wxString& rFile )

 {
 {

-    wxChar                          zBuf[50];
+    wxChar zBuf[50];

 
     wxSprintf(zBuf, "%d", lValue);
 
     wxSprintf(zBuf, "%d", lValue);

-    return wxWriteResource( rSection
-                           ,rEntry
-                           ,zBuf
-                           ,rFile
-                          );
+    return wxWriteResource( rSection, rEntry, zBuf, rFile );

 }
 
 }
 

-bool wxGetResource(
-  const wxString&                   rSection
-, const wxString&                   rEntry
-, wxChar**                          ppValue
-, const wxString&                   rFile
-)
+bool wxGetResource( const wxString& rSection,
+                    const wxString& rEntry,
+                    wxChar** ppValue,
+                    const wxString& rFile )

 {
 {

-    HAB                             hab = 0;
-    HINI                            hIni = 0;
-    wxChar                          zDefunkt[] = _T("$$default");
-    char                            zBuf[1000];
+    HAB    hab = 0;
+    HINI   hIni = 0;
+    wxChar zDefunkt[] = _T("$$default");
+    char   zBuf[1000];

 
     if (!rFile.empty())
     {
 
     if (!rFile.empty())
     {


@@ -165,13 +155,13 @@ bool wxGetResource(
                                               ,1000
                                              );
             if (zBuf == NULL)
                                               ,1000
                                              );
             if (zBuf == NULL)

-                return FALSE;
+                return false;

             if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)
             if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)

-                return FALSE;
+                return false;

             zBuf[n-1] = '\0';
         }
         else
             zBuf[n-1] = '\0';
         }
         else

-            return FALSE;
+            return false;

     }
     else
     {
     }
     else
     {


@@ -183,100 +173,70 @@ bool wxGetResource(
                                           ,1000
                                          );
         if (zBuf == NULL)
                                           ,1000
                                          );
         if (zBuf == NULL)

-            return FALSE;
+            return false;

         if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)
         if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)

-            return FALSE;
+            return false;

         zBuf[n-1] = '\0';
     }
     strcpy((char*)*ppValue, zBuf);
         zBuf[n-1] = '\0';
     }
     strcpy((char*)*ppValue, zBuf);

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxGetResource(
-  const wxString&                   rSection
-, const wxString&                   rEntry
-, float*                            pValue
-, const wxString&                   rFile
-)
+bool wxGetResource( const wxString& rSection,
+                    const wxString& rEntry,
+                    float* pValue,
+                    const wxString& rFile )

 {
 {

-    wxChar*                         zStr = NULL;
+    wxChar* zStr = NULL;

 
     zStr = new wxChar[1000];
 
     zStr = new wxChar[1000];

-    bool                            bSucc = wxGetResource( rSection
-                                                          ,rEntry
-                                                          ,(wxChar **)&zStr
-                                                          ,rFile
-                                                         );
+    bool bSucc = wxGetResource( rSection, rEntry, (wxChar **)&zStr, rFile );

 
     if (bSucc)
     {
         *pValue = (float)wxStrtod(zStr, NULL);
 
     if (bSucc)
     {
         *pValue = (float)wxStrtod(zStr, NULL);

-        delete[] zStr;
-        return TRUE;
-    }
-    else
-    {
-        delete[] zStr;
-        return FALSE;

     }
     }

+
+    delete[] zStr;
+    return bSucc;

 }
 
 }
 

-bool wxGetResource(
-  const wxString&                   rSection
-, const wxString&                   rEntry
-, long*                             pValue
-, const wxString&                   rFile
-)
+bool wxGetResource( const wxString& rSection,
+                    const wxString& rEntry,
+                    long* pValue,
+                    const wxString& rFile )

 {
 {

-    wxChar*                           zStr = NULL;
+    wxChar* zStr = NULL;

 
     zStr = new wxChar[1000];
 
     zStr = new wxChar[1000];

-    bool                              bSucc = wxGetResource( rSection
-                                                            ,rEntry
-                                                            ,(wxChar **)&zStr
-                                                            ,rFile
-                                                           );
+    bool bSucc = wxGetResource( rSection, rEntry, (wxChar **)&zStr, rFile );

 
     if (bSucc)
     {
         *pValue = wxStrtol(zStr, NULL, 10);
 
     if (bSucc)
     {
         *pValue = wxStrtol(zStr, NULL, 10);

-        delete[] zStr;
-        return TRUE;
-    }
-    else
-    {
-        delete[] zStr;
-        return FALSE;

     }
     }

+
+    delete[] zStr;
+    return bSucc;

 }
 
 }
 

-bool wxGetResource(
-  const wxString&                   rSection
-, const wxString&                   rEntry
-, int*                              pValue
-, const wxString&                   rFile
-)
+bool wxGetResource( const wxString& rSection,
+                    const wxString& rEntry,
+                    int* pValue,
+                    const wxString& rFile )

 {
 {

-    wxChar*                         zStr = NULL;
+    wxChar* zStr = NULL;

 
     zStr = new wxChar[1000];
 
     zStr = new wxChar[1000];

-    bool                            bSucc = wxGetResource( rSection
-                                                          ,rEntry
-                                                          ,(wxChar **)&zStr
-                                                          ,rFile
-                                                         );
+    bool bSucc = wxGetResource( rSection, rEntry, (wxChar **)&zStr, rFile );

 
     if (bSucc)
     {
         *pValue = (int)wxStrtol(zStr, NULL, 10);
 
     if (bSucc)
     {
         *pValue = (int)wxStrtol(zStr, NULL, 10);

-        delete[] zStr;
-        return TRUE;
-    }
-    else
-    {
-        delete[] zStr;
-        return FALSE;

     }
     }

+
+    delete[] zStr;
+    return bSucc;

 }
 #endif // wxUSE_RESOURCES
 
 }
 #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);
 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.
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.

-bool wxCheckForInterrupt(
-  wxWindow*                         pWnd
-)
+bool wxCheckForInterrupt( wxWindow* pWnd )

 {
     if(pWnd)
     {
 {
     if(pWnd)
     {

-        QMSG                        vMsg;
-        HAB                         hab = 0;
-        HWND                        hwndFilter = NULLHANDLE;
+        QMSG vMsg;
+        HAB  hab = 0;
+        HWND hwndFilter = NULLHANDLE;

 
         while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE))
         {
             ::WinDispatchMsg(hab, &vMsg);
         }
 
         while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE))
         {
             ::WinDispatchMsg(hab, &vMsg);
         }

-        return TRUE;//*** temporary?
+        return true;//*** temporary?

     }
     else
     {
         wxFAIL_MSG(_T("pWnd==NULL !!!"));
     }
     else
     {
         wxFAIL_MSG(_T("pWnd==NULL !!!"));

-        return FALSE;//*** temporary?
+        return false;//*** temporary?

     }
 }
 
     }
 }
 


@@ -362,7 +320,7 @@ void wxGetMousePosition(
     *pY = vPt.y;
 };
 
     *pY = vPt.y;
 };
 

-// Return TRUE if we have a colour display
+// Return true if we have a colour display

 bool wxColourDisplay()
 {
 #if 0
 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
 #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
 }
 
 #endif
 }
 

diff --git a/src/palmos/timer.cpp b/src/palmos/timer.cpp
index 426dc3036748f2f7bc76e572930531a0beaa001d..74ae9f19652deefacdc07aaf03397b4988566809 100644 (file)
--- a/src/palmos/timer.cpp
+++ b/src/palmos/timer.cpp
@@ -18,6 +18,8 @@
 
 #if wxUSE_TIMER
 
 
 #if wxUSE_TIMER
 

+#include "wx/timer.h"
+

 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/window.h"


@@ -29,8 +31,6 @@
 
 #include "wx/hashmap.h"
 
 
 #include "wx/hashmap.h"
 

-#include "wx/timer.h"
-

 #include "wx/palmos/private.h"
 
 // from utils.cpp
 #include "wx/palmos/private.h"
 
 // from utils.cpp

diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index 3185ed3ea6194e47390bc88f772b7f5974636c3c..e35d21ae23058848444dccb2692f7e66873aaea7 100644 (file)
--- a/src/palmos/utils.cpp
+++ b/src/palmos/utils.cpp
@@ -29,12 +29,12 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #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"
 #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>
 
 #include <MemoryMgr.h>
 #include <DLServer.h>


@@ -270,4 +270,3 @@ extern long wxCharsetToCodepage(const wxChar *name)
 }
 
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
 }
 
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP

-

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index b71a5cc8a41cfc6e3f9220a4cdc6cca367725192..3c173d516e2b540e18c531eef298ed92715fb60e 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -23,9 +23,9 @@
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/timer.h"

 #endif // !PCH
 
 #endif // !PCH
 

-#include "wx/timer.h"

 #include "wx/filefn.h"
 #include "wx/ffile.h"
 #include "wx/process.h"
 #include "wx/filefn.h"
 #include "wx/ffile.h"
 #include "wx/process.h"

diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index 8d4cde34009a0097199e624ae91d24b1c8f0826a..21c2defa4086b3877c031333eae560c3d02cca0d 100644 (file)
--- a/src/unix/mediactrl.cpp
+++ b/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
 #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
 #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
 
 #ifdef __WXGTK__
 #    include "wx/gtk/win_gtk.h"     // for <gdk/gdkx.h>/GDK_WINDOW_XWINDOW

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index f6f055e6d64decdf15b52a9a5dcff735aaa208ea..1e538342f7561a88b268fa22064067f561535842 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -33,10 +33,10 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"

+    #include "wx/timer.h"

 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"

-#include "wx/timer.h"

 #include "wx/stopwatch.h"
 
 #include <stdio.h>
 #include "wx/stopwatch.h"
 
 #include <stdio.h>

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 31af47478f74ed724d832eb1716e5dd7d6381eef..a63e55214fee12445624b850885a1326edefb354 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -22,13 +22,13 @@
     #include "wx/frame.h"
     #include "wx/icon.h"
     #include "wx/dialog.h"
     #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"
 #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"
 #include "wx/filename.h"
 
 #include "wx/univ/theme.h"

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index a0a848e097f72eb101ab40162585bc6a1484d859..8a703868dec835263e87581254fc7041e5df4feb 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -26,10 +26,10 @@
     #include "wx/hash.h"
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/hash.h"
     #include "wx/app.h"
     #include "wx/window.h"

+    #include "wx/timer.h"

 #endif
 
 #include "wx/tooltip.h"
 #endif
 
 #include "wx/tooltip.h"

-#include "wx/timer.h"

 #include "wx/module.h"
 #include "wx/unix/private.h"
 #include "wx/x11/private.h"
 #include "wx/module.h"
 #include "wx/unix/private.h"
 #include "wx/x11/private.h"

diff --git a/src/x11/reparent.cpp b/src/x11/reparent.cpp
index d43de94906534221e9dfd92cc886ccad9cddcf2f..eea2b4d6fe58477ce0b39a729a2c7dd2a5f42f43 100644 (file)
--- a/src/x11/reparent.cpp
+++ b/src/x11/reparent.cpp
@@ -31,10 +31,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/timer.h"

 #endif
 
 #include "wx/evtloop.h"
 #endif
 
 #include "wx/evtloop.h"

-#include "wx/timer.h"

 
 #include "wx/x11/private.h"
 #include "X11/Xatom.h"
 
 #include "wx/x11/private.h"
 #include "X11/Xatom.h"

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 8231d415ae467346ef95f0a119da1eca81ddee69..6113d64164795d23fb0cbe35334581eb5dfccdb2 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -38,6 +38,7 @@
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"

+    #include "wx/timer.h"

 #endif
 
 #include "wx/layout.h"
 #endif
 
 #include "wx/layout.h"


@@ -58,11 +59,6 @@
 #include "wx/x11/private.h"
 #include "X11/Xutil.h"
 
 #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>
 
 // ----------------------------------------------------------------------------
 #include <string.h>
 
 // ----------------------------------------------------------------------------