X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..8a31648287be0ef976f133de2786b137f1e98340:/src/generic/timer.cpp?ds=inline diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp index 00713f32b2..8e76ca8c23 100644 --- a/src/generic/timer.cpp +++ b/src/generic/timer.cpp @@ -49,7 +49,7 @@ #ifdef __DOS__ // Under DOS the MGL timer has a 24hr period, so consider the 12 hours - // before y to be 'less' and the the 12 hours after 'greater' modulo + // before y to be 'less' and the 12 hours after 'greater' modulo // 24 hours. inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y) { @@ -74,7 +74,7 @@ typedef wxLongLong wxTimerTick_t; #if wxUSE_LONGLONG_WX - #define wxTimerTickFmtSpec wxLongLongFmtSpec wxT("d") + #define wxTimerTickFmtSpec wxLongLongFmtSpec "d" #define wxTimerTickPrintfArg(tt) (tt.GetValue()) #else // using native wxLongLong #define wxTimerTickFmtSpec wxT("s") @@ -273,7 +273,7 @@ DECLARE_DYNAMIC_CLASS(wxTimerModule) public: wxTimerModule() {} bool OnInit() { return true; } - void OnExit() { delete gs_scheduler; gs_scheduler = NULL; } + void OnExit() { wxDELETE(gs_scheduler); } }; IMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule)