Bug fix in GetLabelFromText

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

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 89d6fe92c55206021703d37ec6955bc04b3e5f34..ca5965f55df08e43b1cbd2a4bf6ba388afc34fcf 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -2,9 +2,8 @@
 // Name:        settings.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        settings.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,6 +13,10 @@
 #endif
 
 #include "wx/settings.h"
 #endif
 
 #include "wx/settings.h"

+#include "wx/debug.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0
 
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0


@@ -53,87 +56,109 @@
 
 #define SHIFT (8*(sizeof(short int)-sizeof(char)))
 
 
 #define SHIFT (8*(sizeof(short int)-sizeof(char)))
 

-wxColour *g_systemBtnFaceColour      = NULL;
-wxColour *g_systemBtnShadowColour    = NULL;
-wxColour *g_systemBtnHighlightColour = NULL;
-wxColour *g_systemHighlightColour    = NULL;
+//wxColour *g_systemWinColour          = (wxColour *) NULL;
+wxColour *g_systemBtnFaceColour      = (wxColour *) NULL;
+wxColour *g_systemBtnShadowColour    = (wxColour *) NULL;
+wxColour *g_systemBtnHighlightColour = (wxColour *) NULL;
+wxColour *g_systemHighlightColour    = (wxColour *) NULL;

 
 

-wxFont *g_systemFont = 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 )
 {
 }
 
 wxColour wxSystemSettings::GetSystemColour( int index )
 {

-  switch (index)
-  {
-    case wxSYS_COLOUR_SCROLLBAR:
-    case wxSYS_COLOUR_BACKGROUND:
-    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:
+    switch (index)

     {
     {

-      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 );
-      }
-      return *g_systemBtnFaceColour;
-    }
-    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 );
-      }
-      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 );
-      }
-      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 );
-      }
-      return *g_systemHighlightColour;
-    }
+        case wxSYS_COLOUR_SCROLLBAR:
+        case wxSYS_COLOUR_BACKGROUND:
+        case wxSYS_COLOUR_ACTIVECAPTION:
+        case wxSYS_COLOUR_INACTIVECAPTION:
+        case wxSYS_COLOUR_MENU:
+        case wxSYS_COLOUR_WINDOWFRAME:
+        case wxSYS_COLOUR_ACTIVEBORDER:
+        case wxSYS_COLOUR_INACTIVEBORDER:
+        case wxSYS_COLOUR_BTNFACE:
+        {
+            if (!g_systemBtnFaceColour)
+            {
+                g_systemBtnFaceColour = 
+                       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:
+        {
+            if (!g_systemBtnShadowColour)
+            {
+                g_systemBtnShadowColour = 
+                       new wxColour( 0x7530 >> SHIFT,
+                                     0x7530 >> SHIFT,
+                                             0x7530 >> SHIFT );
+            }
+            return *g_systemBtnShadowColour;
+        }
+        case wxSYS_COLOUR_BTNHIGHLIGHT:
+        {
+            if (!g_systemBtnHighlightColour)
+            {
+                g_systemBtnHighlightColour = 
+                       new wxColour( 0xea60 >> SHIFT,
+                                     0xea60 >> SHIFT,
+                                             0xea60 >> SHIFT );
+            }
+            return *g_systemBtnHighlightColour;
+        }
+        case wxSYS_COLOUR_HIGHLIGHT:
+        {
+            if (!g_systemHighlightColour)
+            {
+                GtkWidget *widget = gtk_button_new();
+                GtkStyle *def = gtk_rc_get_style( widget );
+                if (!def)
+                    def = gtk_widget_get_default_style();
+                if (def)
+                {
+                    int red = def->bg[GTK_STATE_SELECTED].red;
+                    int green = def->bg[GTK_STATE_SELECTED].green;
+                    int blue = def->bg[GTK_STATE_SELECTED].blue;
+                    g_systemHighlightColour = 
+                           new wxColour( red    >> SHIFT,
+                                         green  >> SHIFT,
+                                                 blue   >> SHIFT );
+                }
+                else
+                {
+                    g_systemHighlightColour = 
+                           new wxColour( 0      >> SHIFT,
+                                         0      >> SHIFT,
+                                                 0x9c40 >> SHIFT );
+                }
+                gtk_widget_destroy( widget );
+
+            }
+            return *g_systemHighlightColour;
+        }

     case wxSYS_COLOUR_MENUTEXT:
     case wxSYS_COLOUR_WINDOWTEXT:
     case wxSYS_COLOUR_CAPTIONTEXT:
     case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
     case wxSYS_COLOUR_MENUTEXT:
     case wxSYS_COLOUR_WINDOWTEXT:
     case wxSYS_COLOUR_CAPTIONTEXT:
     case wxSYS_COLOUR_INACTIVECAPTIONTEXT:

+    case wxSYS_COLOUR_BTNTEXT:

     case wxSYS_COLOUR_INFOTEXT:
     {
       return *wxBLACK;
     case wxSYS_COLOUR_INFOTEXT:
     {
       return *wxBLACK;


@@ -153,36 +178,39 @@ wxColour wxSystemSettings::GetSystemColour( int index )
 
 wxFont wxSystemSettings::GetSystemFont( 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 )
 {
 }
 
 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;
-}
\ No newline at end of file
+    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;
+}