added wxEncodingToCodepage() and implemented it properly (using in32 API instead...

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 7593cfd406b8158c7cd7d4b81b5a5af995f1443f..f835029b3cab13bc40386033dc1681cb328f2e52 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -22,7 +22,7 @@
 #include "wx/longlong.h"
 #include "wx/event.h"
 
 #include "wx/longlong.h"
 #include "wx/event.h"
 

-#if wxUSE_GUI
+#if wxUSE_GUI && wxUSE_TIMER

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


@@ -49,6 +49,10 @@ public:
     void SetOwner(wxEvtHandler *owner, int id = -1)
         { m_owner = owner; m_idTimer = id; }
 
     void SetOwner(wxEvtHandler *owner, int id = -1)
         { m_owner = owner; m_idTimer = id; }
 

+#ifdef __DARWIN__
+    virtual ~wxTimerBase() { }
+#endif
+

     // working with the timer
     // ----------------------
 
     // working with the timer
     // ----------------------
 


@@ -105,8 +109,8 @@ 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(__WXQT__)
-    #include "wx/qt/timer.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/timer.h"

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


@@ -163,6 +167,9 @@ public:
     // accessors
     int GetInterval() const { return m_interval; }
 
     // accessors
     int GetInterval() const { return m_interval; }
 

+    // implement the base class pure virtual
+    virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
+

 private:
     int m_interval;
 
 private:
     int m_interval;
 


@@ -174,12 +181,14 @@ typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
 #define EVT_TIMER(id, func) \
     DECLARE_EVENT_TABLE_ENTRY( wxEVT_TIMER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL),
 
 #define EVT_TIMER(id, func) \
     DECLARE_EVENT_TABLE_ENTRY( wxEVT_TIMER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL),
 

-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && wxUSE_TIMER

 
 // ----------------------------------------------------------------------------
 // wxStopWatch: measure time intervals with up to 1ms resolution
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxStopWatch: measure time intervals with up to 1ms resolution
 // ----------------------------------------------------------------------------
 

+#if wxUSE_STOPWATCH
+

 class WXDLLEXPORT wxStopWatch
 {
 public:
 class WXDLLEXPORT wxStopWatch
 {
 public:


@@ -201,6 +210,9 @@ private:
     long m_pause;         // the time of the last Pause() or 0
 };
 
     long m_pause;         // the time of the last Pause() or 0
 };
 

+#endif // wxUSE_STOPWATCH
+
+#if wxUSE_LONGLONG

 
 // Starts a global timer
 // -- DEPRECATED: use wxStopWatch instead
 
 // Starts a global timer
 // -- DEPRECATED: use wxStopWatch instead


@@ -210,6 +222,8 @@ void WXDLLEXPORT wxStartTimer();
 // -- DEPRECATED: use wxStopWatch instead
 long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
 
 // -- DEPRECATED: use wxStopWatch instead
 long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
 

+#endif // wxUSE_LONGLONG
+

 // ----------------------------------------------------------------------------
 // global time functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global time functions
 // ----------------------------------------------------------------------------


@@ -220,8 +234,10 @@ extern long WXDLLEXPORT wxGetLocalTime();
 // Get number of seconds since GMT 00:00:00, Jan 1st 1970.
 extern long WXDLLEXPORT wxGetUTCTime();
 
 // Get number of seconds since GMT 00:00:00, Jan 1st 1970.
 extern long WXDLLEXPORT wxGetUTCTime();
 

+#if wxUSE_LONGLONG

 // Get number of milliseconds since local time 00:00:00 Jan 1st 1970
 extern wxLongLong WXDLLEXPORT wxGetLocalTimeMillis();
 // Get number of milliseconds since local time 00:00:00 Jan 1st 1970
 extern wxLongLong WXDLLEXPORT wxGetLocalTimeMillis();

+#endif // wxUSE_LONGLONG

 
 #define wxGetCurrentTime() wxGetLocalTime()
 
 
 #define wxGetCurrentTime() wxGetLocalTime()