Don't hardcode wxPreviewControlBar size in print preview code.

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

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index 4f7ebe8bf1f7c30acdb2d5bb69acbdc6dd864928..729daa50117ce694c1f1d0608b112862958374af 100644 (file)
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -44,7 +44,7 @@
 
     typedef ulong wxTimerTick_t;
 
 
     typedef ulong wxTimerTick_t;
 

-    #define wxTimerTickFmtSpec _T("lu")
+    #define wxTimerTickFmtSpec wxT("lu")

     #define wxTimerTickPrintfArg(tt) (tt)
 
     #ifdef __DOS__
     #define wxTimerTickPrintfArg(tt) (tt)
 
     #ifdef __DOS__


@@ -74,10 +74,10 @@
     typedef wxLongLong wxTimerTick_t;
 
     #if wxUSE_LONGLONG_WX
     typedef wxLongLong wxTimerTick_t;
 
     #if wxUSE_LONGLONG_WX

-        #define wxTimerTickFmtSpec wxLongLongFmtSpec _T("d")
+        #define wxTimerTickFmtSpec wxLongLongFmtSpec "d"

         #define wxTimerTickPrintfArg(tt) (tt.GetValue())
     #else // using native wxLongLong
         #define wxTimerTickPrintfArg(tt) (tt.GetValue())
     #else // using native wxLongLong

-        #define wxTimerTickFmtSpec _T("s")
+        #define wxTimerTickFmtSpec wxT("s")

         #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str())
     #endif // wx/native long long
 
         #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str())
     #endif // wx/native long long
 


@@ -273,7 +273,7 @@ DECLARE_DYNAMIC_CLASS(wxTimerModule)
 public:
     wxTimerModule() {}
     bool OnInit() { return true; }
 public:
     wxTimerModule() {}
     bool OnInit() { return true; }

-    void OnExit() { delete gs_scheduler; gs_scheduler = NULL; }
+    void OnExit() { wxDELETE(gs_scheduler); }

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule)