X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d17d68f470c31f7c145b095eb1a3e0c2f581f30..55703c91786847325c6eca84da92e2834857cfaa:/src/gtk/settings.cpp

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 646386409a..61810194c3 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -56,6 +56,7 @@
 
 #define SHIFT (8*(sizeof(short int)-sizeof(char)))
 
+//wxColour *g_systemWinColour          = (wxColour *) NULL;
 wxColour *g_systemBtnFaceColour      = (wxColour *) NULL;
 wxColour *g_systemBtnShadowColour    = (wxColour *) NULL;
 wxColour *g_systemBtnHighlightColour = (wxColour *) NULL;
@@ -65,11 +66,12 @@ wxFont *g_systemFont = (wxFont *) NULL;
 
 void wxSystemSettings::Done() 
 {
-    wxDELETE(g_systemBtnFaceColour);
-    wxDELETE(g_systemBtnShadowColour);
-    wxDELETE(g_systemBtnHighlightColour);
-    wxDELETE(g_systemHighlightColour);
-    wxDELETE(g_systemFont);
+//    delete g_systemWinColour;
+    delete g_systemBtnFaceColour;
+    delete g_systemBtnShadowColour;
+    delete g_systemBtnHighlightColour;
+    delete g_systemHighlightColour;
+    delete g_systemFont;
 }
 
 wxColour wxSystemSettings::GetSystemColour( int index )
@@ -81,56 +83,55 @@ wxColour wxSystemSettings::GetSystemColour( int index )
     case wxSYS_COLOUR_ACTIVECAPTION:
     case wxSYS_COLOUR_INACTIVECAPTION:
     case wxSYS_COLOUR_MENU:
-    case wxSYS_COLOUR_WINDOW:
     case wxSYS_COLOUR_WINDOWFRAME:
     case wxSYS_COLOUR_ACTIVEBORDER:
     case wxSYS_COLOUR_INACTIVEBORDER:
     case wxSYS_COLOUR_BTNFACE:
     {
-      GtkStyle *style = gtk_widget_get_default_style();
       if (!g_systemBtnFaceColour)
       {
         g_systemBtnFaceColour = 
-	  new wxColour( style->bg[0].red >> SHIFT,
-	                style->bg[0].green >> SHIFT,
-			style->bg[0].blue >> SHIFT );
+	  new wxColour( 0xd6d6 >> SHIFT,
+	                0xd6d6 >> SHIFT,
+			0xd6d6 >> SHIFT );
       }
       return *g_systemBtnFaceColour;
     }
+    case wxSYS_COLOUR_WINDOW:
+    {
+      return *wxWHITE;
+    }
+    case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNSHADOW:
     {
-      GtkStyle *style = gtk_widget_get_default_style();
       if (!g_systemBtnShadowColour)
       {
         g_systemBtnShadowColour = 
-	  new wxColour( style->dark[0].red >> SHIFT,
-	                style->dark[0].green >> SHIFT,
-			style->dark[0].blue >> SHIFT );
+	  new wxColour( 0x7530 >> SHIFT,
+	                0x7530 >> SHIFT,
+			0x7530 >> SHIFT );
       }
       return *g_systemBtnShadowColour;
     }
-    case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNHIGHLIGHT:
     {
-      GtkStyle *style = gtk_widget_get_default_style();
       if (!g_systemBtnHighlightColour)
       {
         g_systemBtnHighlightColour = 
-	  new wxColour( style->light[0].red >> SHIFT,
-	                style->light[0].green >> SHIFT,
-			style->light[0].blue >> SHIFT );
+	  new wxColour( 0xea60 >> SHIFT,
+	                0xea60 >> SHIFT,
+			0xea60 >> SHIFT );
       }
       return *g_systemBtnHighlightColour;
     }
     case wxSYS_COLOUR_HIGHLIGHT:
     {
-      GtkStyle *style = gtk_widget_get_default_style();
       if (!g_systemHighlightColour)
       {
         g_systemHighlightColour = 
-	  new wxColour( style->bg[GTK_STATE_SELECTED].red >> SHIFT,
-	                style->bg[GTK_STATE_SELECTED].green >> SHIFT,
-			style->bg[GTK_STATE_SELECTED].blue >> SHIFT );
+	  new wxColour( 0      >> SHIFT,
+	                0      >> SHIFT,
+			0x9c40 >> SHIFT );
       }
       return *g_systemHighlightColour;
     }
@@ -138,6 +139,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;
@@ -189,7 +191,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, wxT("wxSystemSettings::GetSystemMetric not fully implemented") );
     
     return 0;
 }