fix OS/2 compilation of wxDoGetCwd()

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index c051f96414a38b0726b26f5e9fd6c22866312ff3..9b2d8621b4fe464776941be42980d6fec9568c58 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -18,11 +18,10 @@
 #ifndef WX_PRECOMP
     #include "wx/colour.h"
     #include "wx/font.h"
+    #include "wx/gdicmn.h"
+    #include "wx/module.h"
 #endif
 
-#include "wx/gdicmn.h"
-#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:
         {
         }
@@ -108,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;