do accept focus in notebook as it needs it for tabs

[wxWidgets.git] / src / os2 / timer.cpp

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index cb2d9518ccaef8046fe2b9f9efea3f938f6be15c..6d2a8c071db39d856df2f90ab3bc88e53eb07e98 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        timer.cpp
+// Name:        src/os2/timer.cpp

 // Purpose:     wxTimer implementation
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxTimer implementation
 // Author:      David Webster
 // Modified by:


@@ -12,20 +12,18 @@
 // 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/window.h"
-#include "wx/os2/private.h"
+#include "wx/timer.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-    #include "wx/setup.h"

     #include "wx/list.h"
     #include "wx/list.h"

+    #include "wx/window.h"

     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/event.h"
     #include "wx/app.h"

+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/intl.h"
-#include "wx/log.h"
-
-#include "wx/timer.h"
+#include "wx/os2/private.h"

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


@@ -98,18 +96,13 @@ void wxTimer::Notify()
     (void)m_owner->ProcessEvent(vEvent);
 } // end of wxTimer::Notify
 
     (void)m_owner->ProcessEvent(vEvent);
 } // end of wxTimer::Notify
 

-bool wxTimer::Start(
-  int                               nMilliseconds
-, bool                              bOneShot
-)
+bool wxTimer::Start( int nMilliseconds, bool bOneShot )

 {
 {

-    (void)wxTimerBase::Start( nMilliseconds
-                             ,bOneShot
-                            );
+    (void)wxTimerBase::Start( nMilliseconds, bOneShot );

 
 

-    wxCHECK_MSG( m_milli > 0L, FALSE, wxT("invalid value for timer") );
+    wxCHECK_MSG( m_milli > 0L, false, wxT("invalid value for timer") );

 
 

-    wxWindow*                       pWin = NULL;
+    wxWindow* pWin = NULL;

 
     if (m_owner)
     {
 
     if (m_owner)
     {


@@ -150,7 +143,7 @@ bool wxTimer::Start(
     {
         wxLogSysError(_("Couldn't create a timer"));
 
     {
         wxLogSysError(_("Couldn't create a timer"));
 

-        return(FALSE);
+        return false;

     }
 }
 
     }
 }
 


@@ -206,4 +199,3 @@ ULONG wxTimerProc(
     wxProcessTimer(*(node->second));
     return 0;
 }
     wxProcessTimer(*(node->second));
     return 0;
 }

-