added wxBU_EXACTFIT style

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 802544a91bbfafece940bd57215624a578c1d6ad..6a494be5ace5e8eed86072e3d6a4061288d77ead 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 __WXMAC_X__
+    virtual ~wxTimerBase() {} // Added min for Mac X
+#endif
+

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


@@ -172,14 +176,16 @@ private:
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
 
 #define EVT_TIMER(id, func) \
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
 
 #define EVT_TIMER(id, func) \

-    wxEventTableEntry( wxEVT_TIMER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL),
+    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 +207,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 +219,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 +231,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()