X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b626fee23896d546ec80d2baf57f74620dfcf278..2db3b9a6a40343d0a2b6c5008e5ed9768f4a7358:/src/mgl/settings.cpp?ds=sidebyside diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp index 01ca9d65b9..107eb14b12 100644 --- a/src/mgl/settings.cpp +++ b/src/mgl/settings.cpp @@ -19,10 +19,9 @@ #include "wx/colour.h" #include "wx/font.h" #include "wx/gdicmn.h" + #include "wx/module.h" #endif -#include "wx/module.h" - // ---------------------------------------------------------------------------- // global data // ---------------------------------------------------------------------------- @@ -35,8 +34,7 @@ public: virtual bool OnInit() { return true; } virtual void OnExit() { - delete gs_fontDefault; - gs_fontDefault = NULL; + wxDELETE(gs_fontDefault); } private: @@ -49,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); } @@ -92,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: { } @@ -113,7 +108,7 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) return false; default: - wxFAIL_MSG( _T("unknown feature") ); + wxFAIL_MSG( wxT("unknown feature") ); } return false;