debug check for infinite loop in InitializeClasses() added

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 3413b18b50a689903650c8b91db7e4571c2a4cf7..99894b71a27510b7b8b7f9c7106d20fc62f92e63 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -13,6 +13,10 @@
 #endif
 
 #include "wx/settings.h"
+#include "wx/debug.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0
@@ -52,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;
@@ -59,12 +64,14 @@ wxColour *g_systemHighlightColour    = (wxColour *) NULL;
 
 wxFont *g_systemFont = (wxFont *) NULL;
 
-void wxSystemSettings::Done() {
-  wxDELETE(g_systemBtnFaceColour);
-  wxDELETE(g_systemBtnShadowColour);
-  wxDELETE(g_systemBtnHighlightColour);
-  wxDELETE(g_systemHighlightColour);
-  wxDELETE(g_systemFont);
+void wxSystemSettings::Done() 
+{
+//    delete g_systemWinColour;
+    delete g_systemBtnFaceColour;
+    delete g_systemBtnShadowColour;
+    delete g_systemBtnHighlightColour;
+    delete g_systemHighlightColour;
+    delete g_systemFont;
 }
 
 wxColour wxSystemSettings::GetSystemColour( int index )
@@ -76,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;
     }
@@ -133,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;
@@ -152,36 +159,39 @@ 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( "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" );
-      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 )
 {
-  switch (index)
-  {
-    case wxSYS_SCREEN_X:
-      return gdk_screen_width();
-    case wxSYS_SCREEN_Y:
-      return gdk_screen_height();
-  }
-  return 0;
+    switch (index)
+    {
+        case wxSYS_SCREEN_X:   return gdk_screen_width();
+        case wxSYS_SCREEN_Y:   return gdk_screen_height();
+        case wxSYS_HSCROLL_Y:  return 15;
+        case wxSYS_VSCROLL_X:  return 15;
+    }
+    
+    wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented") );
+    
+    return 0;
 }