Always use active wxTranslations instance via wxLocale.

[wxWidgets.git] / src / mgl / settings.cpp

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index 01ca9d65b955b5e6392afeb44d335e4ede229151..3f3b87166020af58b5f53aec727e977faede0a6a 100644 (file)
--- 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
 // ----------------------------------------------------------------------------
@@ -49,7 +48,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 +91,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 +109,7 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
             return false;
 
         default:
-            wxFAIL_MSG( _T("unknown feature") );
+            wxFAIL_MSG( wxT("unknown feature") );
     }
 
     return false;