X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2ca375c5620209d77a88d2d378bdcdedbc82e7e..e562dfb1a0dbabd0a93d50495de52e827efc59a9:/src/generic/timer.cpp?ds=sidebyside diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp index 4f7ebe8bf1..729daa5011 100644 --- a/src/generic/timer.cpp +++ b/src/generic/timer.cpp @@ -44,7 +44,7 @@ typedef ulong wxTimerTick_t; - #define wxTimerTickFmtSpec _T("lu") + #define wxTimerTickFmtSpec wxT("lu") #define wxTimerTickPrintfArg(tt) (tt) #ifdef __DOS__ @@ -74,10 +74,10 @@ 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 wxTimerTickFmtSpec _T("s") + #define wxTimerTickFmtSpec wxT("s") #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; } - void OnExit() { delete gs_scheduler; gs_scheduler = NULL; } + void OnExit() { wxDELETE(gs_scheduler); } }; IMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule)