X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02761f6cd478e3c2c97cf6f93442747f7b029833..bca6bd3823b9e2ca8200e2c0a4fa8d15bb1d5c9a:/src/mgl/settings.cpp diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp index 63fc4576ca..107eb14b12 100644 --- a/src/mgl/settings.cpp +++ b/src/mgl/settings.cpp @@ -34,8 +34,7 @@ public: virtual bool OnInit() { return true; } virtual void OnExit() { - delete gs_fontDefault; - gs_fontDefault = NULL; + wxDELETE(gs_fontDefault); } private: @@ -48,7 +47,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule) wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index)) { - // not implemented, the mean is in wxUniversal + // overridden by wxSystemSettings::GetColour in wxUniversal return wxColour(0,0,0); } @@ -91,9 +90,6 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w case wxSYS_SCREEN_Y: wxDisplaySize(NULL, &val); return val; - case wxSYS_VSCROLL_X: - case wxSYS_HSCROLL_Y: - return 15; default: { } @@ -112,7 +108,7 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) return false; default: - wxFAIL_MSG( _T("unknown feature") ); + wxFAIL_MSG( wxT("unknown feature") ); } return false;