[ 1495131 ] wxODComboBox const methods to work prior to SetPopupControl.

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index b148119a40198abae8dea886aeb3b2494a7309be..b0e7a2be4e328a1c8a7f2afe33ce75282d6b063c 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        settings.h
+// Name:        src/mgl/settings.cpp
 // Author:      Vaclav Slavik, Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -14,7 +14,11 @@
 #endif
 
 #include "wx/settings.h"
-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif
+
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/module.h"
@@ -28,7 +32,7 @@ static wxFont *gs_fontDefault = NULL;
 class wxSystemSettingsModule : public wxModule
 {
 public:
-    virtual bool OnInit() { return TRUE; }
+    virtual bool OnInit() { return true; }
     virtual void OnExit()
     {
         delete gs_fontDefault;
@@ -65,18 +69,21 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         case wxSYS_DEFAULT_GUI_FONT:
         {
             if ( !gs_fontDefault )
-                gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, FALSE, "Arial");
+                gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial");
             return *gs_fontDefault;
         }
         default:
-            return wxNullFont;
+        {
+        }
     }
+
+    return wxNullFont;
 }
 
 int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
 {
     int val;
-    
+
     switch (index)
     {
         case wxSYS_SCREEN_X:
@@ -87,22 +94,27 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
             return val;
         case wxSYS_VSCROLL_X:
         case wxSYS_HSCROLL_Y:
-            return 15; 
-            break;
+            return 15;
         default:
-            return -1;  // unsupported metric
+        {
+        }
     }
+
+    return -1;  // unsupported metric
 }
 
 bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
 {
     switch (index)
     {
-        case wxSYS_CAN_ICONIZE_FRAME: 
-            return FALSE; break;
+        case wxSYS_CAN_ICONIZE_FRAME:
+            return false;
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
-            return FALSE; break;
+            return false;
         default:
-            return FALSE;
+        {
+        }
     }
+
+    return false;
 }