Applied patch from Bo, WIP

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index 060e5bf51aa0afd13d3b85622e95763505ddfcbc..93224a6c295b4a39777d213084a44708e6489362 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -14,10 +14,13 @@
 #endif
 
 #include "wx/settings.h"
 #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
 
 // ----------------------------------------------------------------------------
 // global data


@@ -45,7 +48,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index))
 {
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index))
 {

-    // not implemented, the mean is in wxUniversal
+    // overridden by wxSystemSettings::GetColour in wxUniversal

     return wxColour(0,0,0);
 }
 
     return wxColour(0,0,0);
 }
 


@@ -68,6 +71,9 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
                 gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial");
             return *gs_fontDefault;
         }
                 gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial");
             return *gs_fontDefault;
         }

+        default:
+        {
+        }

     }
 
     return wxNullFont;
     }
 
     return wxNullFont;


@@ -88,6 +94,9 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         case wxSYS_VSCROLL_X:
         case wxSYS_HSCROLL_Y:
             return 15;
         case wxSYS_VSCROLL_X:
         case wxSYS_HSCROLL_Y:
             return 15;

+        default:
+        {
+        }

     }
 
     return -1;  // unsupported metric
     }
 
     return -1;  // unsupported metric


@@ -98,9 +107,12 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:

-            return false;

         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

+        case wxSYS_TABLET_PRESENT:

             return false;
             return false;

+
+        default:
+            wxFAIL_MSG( _T("unknown feature") );

     }
 
     return false;
     }
 
     return false;