X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..07fa75bc31fd49da3e4bd4a8bf056a96493bf26b:/src/gtk/settings.cpp

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 234bce0a2d..2b774f2a8b 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -97,6 +97,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
       }
       return *g_systemBtnFaceColour;
     }
+    case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNSHADOW:
     {
       GtkStyle *style = gtk_widget_get_default_style();
@@ -109,7 +110,6 @@ wxColour wxSystemSettings::GetSystemColour( int index )
       }
       return *g_systemBtnShadowColour;
     }
-    case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNHIGHLIGHT:
     {
       GtkStyle *style = gtk_widget_get_default_style();
@@ -138,6 +138,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
     case wxSYS_COLOUR_WINDOWTEXT:
     case wxSYS_COLOUR_CAPTIONTEXT:
     case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
+    case wxSYS_COLOUR_BTNTEXT:
     case wxSYS_COLOUR_INFOTEXT:
     {
       return *wxBLACK;
@@ -157,26 +158,26 @@ wxColour wxSystemSettings::GetSystemColour( int index )
 
 wxFont wxSystemSettings::GetSystemFont( int index ) 
 {
-  switch (index)
-  {
-    case wxSYS_OEM_FIXED_FONT:
-    case wxSYS_ANSI_FIXED_FONT:
-    case wxSYS_SYSTEM_FIXED_FONT:
-    {
-      return *wxNORMAL_FONT;
-    }
-    case wxSYS_ANSI_VAR_FONT:
-    case wxSYS_SYSTEM_FONT:
-    case wxSYS_DEVICE_DEFAULT_FONT:
-    case wxSYS_DEFAULT_GUI_FONT:
+    switch (index)
     {
-      if (!g_systemFont)
-        g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-      return *g_systemFont;
+        case wxSYS_OEM_FIXED_FONT:
+        case wxSYS_ANSI_FIXED_FONT:
+        case wxSYS_SYSTEM_FIXED_FONT:
+        {
+            return *wxNORMAL_FONT;
+        }
+        case wxSYS_ANSI_VAR_FONT:
+        case wxSYS_SYSTEM_FONT:
+        case wxSYS_DEVICE_DEFAULT_FONT:
+        case wxSYS_DEFAULT_GUI_FONT:
+        {
+            if (!g_systemFont)
+                g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+            return *g_systemFont;
+        }
     }
-  }
 
-  return wxNullFont;
+    return wxNullFont;
 }
 
 int wxSystemSettings::GetSystemMetric( int index )
@@ -189,7 +190,7 @@ int wxSystemSettings::GetSystemMetric( int index )
         case wxSYS_VSCROLL_X:  return 15;
     }
     
-    wxCHECK_MSG( index, 0, "wxSystemSettings::GetSystemMetric not fully implemented" );
+    wxCHECK_MSG( index, 0, _T("wxSystemSettings::GetSystemMetric not fully implemented") );
     
     return 0;
 }