Reversed the meaning of black and white in wxRegion::ConvertToBitmap

[wxWidgets.git] / include / wx / timer.h

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 2c030fbd07e640dde65ecd53a1c1cb428ccfff72..33042164ed0b1ffb25581e7bd945d6ed3aed8cb2 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -7,7 +7,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_BASE_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_BASE_


@@ -103,6 +103,8 @@ protected:
 
     int     m_milli;        // the timer interval
     bool    m_oneShot;      // TRUE if one shot
 
     int     m_milli;        // the timer interval
     bool    m_oneShot;      // TRUE if one shot

+
+    DECLARE_NO_COPY_CLASS(wxTimerBase)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -115,14 +117,12 @@ protected:
     #include "wx/motif/timer.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/timer.h"
     #include "wx/motif/timer.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/timer.h"

-#elif defined(__WXX11__) || defined(__WXMGL__)
+#elif defined(__WXX11__) || defined(__WXMGL__) || defined(__WXCOCOA__)

     #include "wx/generic/timer.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/timer.h"
 #elif defined(__WXPM__)
     #include "wx/os2/timer.h"
     #include "wx/generic/timer.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/timer.h"
 #elif defined(__WXPM__)
     #include "wx/os2/timer.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/timer.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -205,10 +205,21 @@ public:
     void Start(long t0 = 0);
 
     // pause the stop watch
     void Start(long t0 = 0);
 
     // pause the stop watch

-    void Pause() { if ( !m_pauseCount++) m_pause = GetElapsedTime(); }
+    void Pause()
+    {
+        if ( !m_pauseCount++ )
+            m_pause = GetElapsedTime();
+    }

 
     // resume it
 
     // resume it

-    void Resume() { if ( !--m_pauseCount ) Start(m_pause); }
+    void Resume()
+    {
+        wxASSERT_MSG( m_pauseCount > 0,
+                      _T("Resuming stop watch which is not paused") );
+
+        if ( !--m_pauseCount )
+            Start(m_pause);
+    }

 
     // get elapsed time since the last Start() in milliseconds
     long Time() const;
 
     // get elapsed time since the last Start() in milliseconds
     long Time() const;