X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78f933650057d0e09ee06b59f7d23cb83b48e1b3..089e95217e26509f2c1a51ba490a5dd0bad22a96:/src/mgl/settings.cpp

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index 465cf23591..9b2d8621b4 100644
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -14,10 +14,13 @@
 #endif
 
 #include "wx/settings.h"
-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/gdicmn.h"
-#include "wx/module.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+    #include "wx/font.h"
+    #include "wx/gdicmn.h"
+    #include "wx/module.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // global data
@@ -45,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);
 }
 
@@ -88,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:
         {
         }
@@ -104,12 +104,12 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:
-            return false;
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+        case wxSYS_TABLET_PRESENT:
             return false;
+
         default:
-        {
-        }
+            wxFAIL_MSG( _T("unknown feature") );
     }
 
     return false;