extracted 4 copies of identical code into a function

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 4aae2448f713da73d841bff3c8d3d43a1cd1f737..ac4b1ef49475b72fb63b098122496d9560514c22 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -73,7 +73,7 @@ wxColour *g_systemBtnTextColour       = (wxColour *) NULL;
 
 wxFont *g_systemFont = (wxFont *) NULL;
 
 
 wxFont *g_systemFont = (wxFont *) NULL;
 

-void wxSystemSettings::Done() 
+void wxSystemSettings::Done()

 {
 //    delete g_systemWinColour;
     delete g_systemBtnFaceColour;
 {
 //    delete g_systemWinColour;
     delete g_systemBtnFaceColour;


@@ -86,6 +86,42 @@ void wxSystemSettings::Done()
     delete g_systemBtnTextColour;
 }
 
     delete g_systemBtnTextColour;
 }
 

+// kind of widget to use in GetColourFromGTKWidget
+enum GtkWidgetType
+{
+    GTK_BUTTON,
+    GTK_LIST
+};
+
+// wxSystemSettings::GetSystemColour() helper: get the colours from a GTK+
+// widget style, return true if we did get them, false to use defaults
+static bool GetColourFromGTKWidget(GtkWidgetType type, GtkStateType state,
+                                   int& red, int& green, int& blue)
+{
+    GtkWidget *widget = type == GTK_BUTTON ? gtk_button_new() : gtk_list_new();
+    GtkStyle *def = gtk_rc_get_style( widget );
+    if ( !def )
+        def = gtk_widget_get_default_style();
+
+    bool ok;
+    if ( def )
+    {
+        red = def->bg[state].red;
+        green = def->bg[state].green;
+        blue = def->bg[state].blue;
+
+        ok = TRUE;
+    }
+    else
+    {
+        ok = FALSE;
+    }
+
+    gtk_widget_destroy( widget );
+
+    return ok;
+}
+

 wxColour wxSystemSettings::GetSystemColour( int index )
 {
     switch (index)
 wxColour wxSystemSettings::GetSystemColour( int index )
 {
     switch (index)


@@ -100,57 +136,32 @@ wxColour wxSystemSettings::GetSystemColour( int index )
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_3DLIGHT:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_3DLIGHT:

-        {

             if (!g_systemBtnFaceColour)
             {
             if (!g_systemBtnFaceColour)
             {

-                GtkWidget *widget = gtk_button_new();
-                GtkStyle *def = gtk_rc_get_style( widget );
-                if (!def)
-                    def = gtk_widget_get_default_style();
-                if (def)
+                int red, green, blue;
+                if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_NORMAL,
+                                             red, green, blue) )

                 {
                 {

-                    int red = def->bg[GTK_STATE_NORMAL].red;
-                    int green = def->bg[GTK_STATE_NORMAL].green;
-                    int blue = def->bg[GTK_STATE_NORMAL].blue;
-                    g_systemBtnFaceColour = 
-                           new wxColour( red    >> SHIFT,
-                                         green  >> SHIFT,
-                                                 blue   >> SHIFT );
+                    red =
+                    green = 0;
+                    blue = 0x9c40;

                 }
                 }

-                else
-                {
-                    g_systemBtnFaceColour = 
-                           new wxColour( 0      >> SHIFT,
-                                         0      >> SHIFT,
-                                                 0x9c40 >> SHIFT );
-                }
-                gtk_widget_destroy( widget );

 
 

+                g_systemBtnFaceColour = new wxColour( red   >> SHIFT,
+                                                      green >> SHIFT,
+                                                      blue  >> SHIFT );

             }
             return *g_systemBtnFaceColour;
             }
             return *g_systemBtnFaceColour;

-           /*
-            if (!g_systemBtnFaceColour)
-            {
-                g_systemBtnFaceColour = 
-                       new wxColour( 0xd6d6 >> SHIFT,
-                                     0xd6d6 >> SHIFT,
-                                             0xd6d6 >> SHIFT );
-            }
-            return *g_systemBtnFaceColour;
-           */
-        }
+

         case wxSYS_COLOUR_WINDOW:
         case wxSYS_COLOUR_WINDOW:

-        {

             return *wxWHITE;
             return *wxWHITE;

-        }
+

         case wxSYS_COLOUR_3DDKSHADOW:
         case wxSYS_COLOUR_3DDKSHADOW:

-        {

             return *wxBLACK;
             return *wxBLACK;

-        }
+

         case wxSYS_COLOUR_GRAYTEXT:
         case wxSYS_COLOUR_BTNSHADOW:
         //case wxSYS_COLOUR_3DSHADOW:
         case wxSYS_COLOUR_GRAYTEXT:
         case wxSYS_COLOUR_BTNSHADOW:
         //case wxSYS_COLOUR_3DSHADOW:

-        {

             if (!g_systemBtnShadowColour)
             {
                 wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
             if (!g_systemBtnShadowColour)
             {
                 wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));


@@ -158,94 +169,68 @@ wxColour wxSystemSettings::GetSystemColour( int index )
                    new wxColour((unsigned char) (faceColour.Red() * 0.666),
                                 (unsigned char) (faceColour.Green() * 0.666),
                                 (unsigned char) (faceColour.Blue() * 0.666));
                    new wxColour((unsigned char) (faceColour.Red() * 0.666),
                                 (unsigned char) (faceColour.Green() * 0.666),
                                 (unsigned char) (faceColour.Blue() * 0.666));

-           }
-  /*
-            if (!g_systemBtnShadowColour)
-            {
-                g_systemBtnShadowColour = 
-                       new wxColour( 0x7530 >> SHIFT,
-                                     0x7530 >> SHIFT,
-                                             0x7530 >> SHIFT );

             }
             }

-  */
+

             return *g_systemBtnShadowColour;
             return *g_systemBtnShadowColour;

-        }
+

         case wxSYS_COLOUR_3DHIGHLIGHT:
         //case wxSYS_COLOUR_BTNHIGHLIGHT:
         case wxSYS_COLOUR_3DHIGHLIGHT:
         //case wxSYS_COLOUR_BTNHIGHLIGHT:

-        {

             return * wxWHITE;
 /* I think this should normally be white (JACS 8/2000)
             return * wxWHITE;
 /* I think this should normally be white (JACS 8/2000)

+
+   Hmm, I'm quite sure it shouldn't ... (VZ 20.08.01)

             if (!g_systemBtnHighlightColour)
             {
             if (!g_systemBtnHighlightColour)
             {

-                g_systemBtnHighlightColour = 
-                       new wxColour( 0xea60 >> SHIFT,
-                                     0xea60 >> SHIFT,
-                                             0xea60 >> SHIFT );
+                g_systemBtnHighlightColour =
+                    new wxColour( 0xea60 >> SHIFT,
+                                  0xea60 >> SHIFT,
+                                  0xea60 >> SHIFT );

             }
             return *g_systemBtnHighlightColour;
 */
             }
             return *g_systemBtnHighlightColour;
 */

-        }
+

         case wxSYS_COLOUR_HIGHLIGHT:
         case wxSYS_COLOUR_HIGHLIGHT:

-        {

             if (!g_systemHighlightColour)
             {
             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, green, blue;
+                if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_SELECTED,
+                                             red, green, blue) )

                 {
                 {

-                    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 );
+                    red =
+                    green = 0;
+                    blue = 0x9c40;

                 }
                 }

-                else
-                {
-                    g_systemHighlightColour = 
-                           new wxColour( 0      >> SHIFT,
-                                         0      >> SHIFT,
-                                                 0x9c40 >> SHIFT );
-                }
-                gtk_widget_destroy( widget );

 
 

+                g_systemHighlightColour = new wxColour( red   >> SHIFT,
+                                                        green >> SHIFT,
+                                                        blue  >> SHIFT );

             }
             return *g_systemHighlightColour;
             }
             return *g_systemHighlightColour;

-        }
+

         case wxSYS_COLOUR_LISTBOX:
         case wxSYS_COLOUR_LISTBOX:

-        {

             if (!g_systemListBoxColour)
             {
             if (!g_systemListBoxColour)
             {

-                GtkWidget *widget = gtk_list_new();
-                GtkStyle *def = gtk_rc_get_style( widget );
-                if (!def) 
-                    def = gtk_widget_get_default_style();
-                if (def)
+                int red, green, blue;
+                if ( GetColourFromGTKWidget(GTK_LIST, GTK_STATE_NORMAL,
+                                            red, green, blue) )

                 {
                 {

-                    int red = def->base[GTK_STATE_NORMAL].red;
-                    int green = def->base[GTK_STATE_NORMAL].green;
-                    int blue = def->base[GTK_STATE_NORMAL].blue;
-                    g_systemListBoxColour = 
-                           new wxColour( red    >> SHIFT,
-                                         green  >> SHIFT,
-                                                 blue   >> SHIFT );
+                    g_systemListBoxColour = new wxColour( red   >> SHIFT,
+                                                          green >> SHIFT,
+                                                          blue  >> SHIFT );

                 }
                 else
                 }
                 else

+                {

                     g_systemListBoxColour = new wxColour(*wxWHITE);
                     g_systemListBoxColour = new wxColour(*wxWHITE);

-                gtk_widget_destroy( widget );
+                }

             }
             return *g_systemListBoxColour;
             }
             return *g_systemListBoxColour;

-        }
-    case wxSYS_COLOUR_MENUTEXT:
-    case wxSYS_COLOUR_WINDOWTEXT:
-    case wxSYS_COLOUR_CAPTIONTEXT:
-    case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
-    case wxSYS_COLOUR_BTNTEXT:
-    case wxSYS_COLOUR_INFOTEXT:
-    {
+
+        case wxSYS_COLOUR_MENUTEXT:
+        case wxSYS_COLOUR_WINDOWTEXT:
+        case wxSYS_COLOUR_CAPTIONTEXT:
+        case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
+        case wxSYS_COLOUR_BTNTEXT:
+        case wxSYS_COLOUR_INFOTEXT:

             if (!g_systemBtnTextColour)
             {
                 GtkWidget *widget = gtk_button_new();
             if (!g_systemBtnTextColour)
             {
                 GtkWidget *widget = gtk_button_new();


@@ -257,42 +242,40 @@ wxColour wxSystemSettings::GetSystemColour( int index )
                     int red = def->fg[GTK_STATE_NORMAL].red;
                     int green = def->fg[GTK_STATE_NORMAL].green;
                     int blue = def->fg[GTK_STATE_NORMAL].blue;
                     int red = def->fg[GTK_STATE_NORMAL].red;
                     int green = def->fg[GTK_STATE_NORMAL].green;
                     int blue = def->fg[GTK_STATE_NORMAL].blue;

-                    g_systemBtnTextColour = 
-                           new wxColour( red    >> SHIFT,
-                                         green  >> SHIFT,
-                                                 blue   >> SHIFT );
+                    g_systemBtnTextColour =
+                        new wxColour( red    >> SHIFT,
+                                green  >> SHIFT,
+                                blue   >> SHIFT );

                 }
                 else
                 {
                 }
                 else
                 {

-                    g_systemBtnTextColour = 
-                     new wxColour(0, 0, 0);
+                    g_systemBtnTextColour =
+                        new wxColour(0, 0, 0);

                 }
                 gtk_widget_destroy( widget );
             }
             return *g_systemBtnTextColour;
                 }
                 gtk_widget_destroy( widget );
             }
             return *g_systemBtnTextColour;

-    }
-    case wxSYS_COLOUR_HIGHLIGHTTEXT:
-    {
-        if (!g_systemHighlightTextColour)
-               {
-                   wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
-                       if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
-                           g_systemHighlightTextColour = new wxColour(*wxBLACK);
-                       else
-                           g_systemHighlightTextColour = new wxColour(*wxWHITE);
-        }
-        return *g_systemHighlightTextColour;
-    }
-    case wxSYS_COLOUR_INFOBK:
-    case wxSYS_COLOUR_APPWORKSPACE:
-    {
-      return *wxWHITE;    // ?
-    }
+
+        case wxSYS_COLOUR_HIGHLIGHTTEXT:
+            if (!g_systemHighlightTextColour)
+            {
+                wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
+                if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
+                    g_systemHighlightTextColour = new wxColour(*wxBLACK);
+                else
+                    g_systemHighlightTextColour = new wxColour(*wxWHITE);
+            }
+            return *g_systemHighlightTextColour;
+
+        case wxSYS_COLOUR_INFOBK:
+        case wxSYS_COLOUR_APPWORKSPACE:
+            return *wxWHITE;    // ?

   }
   }

+

   return *wxWHITE;
 }
 
   return *wxWHITE;
 }
 

-wxFont wxSystemSettings::GetSystemFont( int index ) 
+wxFont wxSystemSettings::GetSystemFont( int index )

 {
     switch (index)
     {
 {
     switch (index)
     {


@@ -323,7 +306,7 @@ wxFont wxSystemSettings::GetSystemFont( int index )
 #endif
 
                 g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
 #endif
 
                 g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );

-                
+

             }
             return *g_systemFont;
         }
             }
             return *g_systemFont;
         }


@@ -341,8 +324,8 @@ int wxSystemSettings::GetSystemMetric( int index )
         case wxSYS_HSCROLL_Y:  return 15;
         case wxSYS_VSCROLL_X:  return 15;
     }
         case wxSYS_HSCROLL_Y:  return 15;
         case wxSYS_VSCROLL_X:  return 15;
     }

-    
+

     wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented") );
     wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented") );

-    
+

     return 0;
 }
     return 0;
 }

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 4aae2448f713da73d841bff3c8d3d43a1cd1f737..ac4b1ef49475b72fb63b098122496d9560514c22 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -73,7 +73,7 @@ wxColour *g_systemBtnTextColour       = (wxColour *) NULL;
 
 wxFont *g_systemFont = (wxFont *) NULL;
 
 
 wxFont *g_systemFont = (wxFont *) NULL;
 

-void wxSystemSettings::Done() 
+void wxSystemSettings::Done()

 {
 //    delete g_systemWinColour;
     delete g_systemBtnFaceColour;
 {
 //    delete g_systemWinColour;
     delete g_systemBtnFaceColour;


@@ -86,6 +86,42 @@ void wxSystemSettings::Done()
     delete g_systemBtnTextColour;
 }
 
     delete g_systemBtnTextColour;
 }
 

+// kind of widget to use in GetColourFromGTKWidget
+enum GtkWidgetType
+{
+    GTK_BUTTON,
+    GTK_LIST
+};
+
+// wxSystemSettings::GetSystemColour() helper: get the colours from a GTK+
+// widget style, return true if we did get them, false to use defaults
+static bool GetColourFromGTKWidget(GtkWidgetType type, GtkStateType state,
+                                   int& red, int& green, int& blue)
+{
+    GtkWidget *widget = type == GTK_BUTTON ? gtk_button_new() : gtk_list_new();
+    GtkStyle *def = gtk_rc_get_style( widget );
+    if ( !def )
+        def = gtk_widget_get_default_style();
+
+    bool ok;
+    if ( def )
+    {
+        red = def->bg[state].red;
+        green = def->bg[state].green;
+        blue = def->bg[state].blue;
+
+        ok = TRUE;
+    }
+    else
+    {
+        ok = FALSE;
+    }
+
+    gtk_widget_destroy( widget );
+
+    return ok;
+}
+

 wxColour wxSystemSettings::GetSystemColour( int index )
 {
     switch (index)
 wxColour wxSystemSettings::GetSystemColour( int index )
 {
     switch (index)


@@ -100,57 +136,32 @@ wxColour wxSystemSettings::GetSystemColour( int index )
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_3DLIGHT:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_3DLIGHT:

-        {

             if (!g_systemBtnFaceColour)
             {
             if (!g_systemBtnFaceColour)
             {

-                GtkWidget *widget = gtk_button_new();
-                GtkStyle *def = gtk_rc_get_style( widget );
-                if (!def)
-                    def = gtk_widget_get_default_style();
-                if (def)
+                int red, green, blue;
+                if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_NORMAL,
+                                             red, green, blue) )

                 {
                 {

-                    int red = def->bg[GTK_STATE_NORMAL].red;
-                    int green = def->bg[GTK_STATE_NORMAL].green;
-                    int blue = def->bg[GTK_STATE_NORMAL].blue;
-                    g_systemBtnFaceColour = 
-                           new wxColour( red    >> SHIFT,
-                                         green  >> SHIFT,
-                                                 blue   >> SHIFT );
+                    red =
+                    green = 0;
+                    blue = 0x9c40;

                 }
                 }

-                else
-                {
-                    g_systemBtnFaceColour = 
-                           new wxColour( 0      >> SHIFT,
-                                         0      >> SHIFT,
-                                                 0x9c40 >> SHIFT );
-                }
-                gtk_widget_destroy( widget );

 
 

+                g_systemBtnFaceColour = new wxColour( red   >> SHIFT,
+                                                      green >> SHIFT,
+                                                      blue  >> SHIFT );

             }
             return *g_systemBtnFaceColour;
             }
             return *g_systemBtnFaceColour;

-           /*
-            if (!g_systemBtnFaceColour)
-            {
-                g_systemBtnFaceColour = 
-                       new wxColour( 0xd6d6 >> SHIFT,
-                                     0xd6d6 >> SHIFT,
-                                             0xd6d6 >> SHIFT );
-            }
-            return *g_systemBtnFaceColour;
-           */
-        }
+

         case wxSYS_COLOUR_WINDOW:
         case wxSYS_COLOUR_WINDOW:

-        {

             return *wxWHITE;
             return *wxWHITE;

-        }
+

         case wxSYS_COLOUR_3DDKSHADOW:
         case wxSYS_COLOUR_3DDKSHADOW:

-        {

             return *wxBLACK;
             return *wxBLACK;

-        }
+

         case wxSYS_COLOUR_GRAYTEXT:
         case wxSYS_COLOUR_BTNSHADOW:
         //case wxSYS_COLOUR_3DSHADOW:
         case wxSYS_COLOUR_GRAYTEXT:
         case wxSYS_COLOUR_BTNSHADOW:
         //case wxSYS_COLOUR_3DSHADOW:

-        {

             if (!g_systemBtnShadowColour)
             {
                 wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
             if (!g_systemBtnShadowColour)
             {
                 wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));


@@ -158,94 +169,68 @@ wxColour wxSystemSettings::GetSystemColour( int index )
                    new wxColour((unsigned char) (faceColour.Red() * 0.666),
                                 (unsigned char) (faceColour.Green() * 0.666),
                                 (unsigned char) (faceColour.Blue() * 0.666));
                    new wxColour((unsigned char) (faceColour.Red() * 0.666),
                                 (unsigned char) (faceColour.Green() * 0.666),
                                 (unsigned char) (faceColour.Blue() * 0.666));

-           }
-  /*
-            if (!g_systemBtnShadowColour)
-            {
-                g_systemBtnShadowColour = 
-                       new wxColour( 0x7530 >> SHIFT,
-                                     0x7530 >> SHIFT,
-                                             0x7530 >> SHIFT );

             }
             }

-  */
+

             return *g_systemBtnShadowColour;
             return *g_systemBtnShadowColour;

-        }
+

         case wxSYS_COLOUR_3DHIGHLIGHT:
         //case wxSYS_COLOUR_BTNHIGHLIGHT:
         case wxSYS_COLOUR_3DHIGHLIGHT:
         //case wxSYS_COLOUR_BTNHIGHLIGHT:

-        {

             return * wxWHITE;
 /* I think this should normally be white (JACS 8/2000)
             return * wxWHITE;
 /* I think this should normally be white (JACS 8/2000)

+
+   Hmm, I'm quite sure it shouldn't ... (VZ 20.08.01)

             if (!g_systemBtnHighlightColour)
             {
             if (!g_systemBtnHighlightColour)
             {

-                g_systemBtnHighlightColour = 
-                       new wxColour( 0xea60 >> SHIFT,
-                                     0xea60 >> SHIFT,
-                                             0xea60 >> SHIFT );
+                g_systemBtnHighlightColour =
+                    new wxColour( 0xea60 >> SHIFT,
+                                  0xea60 >> SHIFT,
+                                  0xea60 >> SHIFT );

             }
             return *g_systemBtnHighlightColour;
 */
             }
             return *g_systemBtnHighlightColour;
 */

-        }
+

         case wxSYS_COLOUR_HIGHLIGHT:
         case wxSYS_COLOUR_HIGHLIGHT:

-        {

             if (!g_systemHighlightColour)
             {
             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, green, blue;
+                if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_SELECTED,
+                                             red, green, blue) )

                 {
                 {

-                    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 );
+                    red =
+                    green = 0;
+                    blue = 0x9c40;

                 }
                 }

-                else
-                {
-                    g_systemHighlightColour = 
-                           new wxColour( 0      >> SHIFT,
-                                         0      >> SHIFT,
-                                                 0x9c40 >> SHIFT );
-                }
-                gtk_widget_destroy( widget );

 
 

+                g_systemHighlightColour = new wxColour( red   >> SHIFT,
+                                                        green >> SHIFT,
+                                                        blue  >> SHIFT );

             }
             return *g_systemHighlightColour;
             }
             return *g_systemHighlightColour;

-        }
+

         case wxSYS_COLOUR_LISTBOX:
         case wxSYS_COLOUR_LISTBOX:

-        {

             if (!g_systemListBoxColour)
             {
             if (!g_systemListBoxColour)
             {

-                GtkWidget *widget = gtk_list_new();
-                GtkStyle *def = gtk_rc_get_style( widget );
-                if (!def) 
-                    def = gtk_widget_get_default_style();
-                if (def)
+                int red, green, blue;
+                if ( GetColourFromGTKWidget(GTK_LIST, GTK_STATE_NORMAL,
+                                            red, green, blue) )

                 {
                 {

-                    int red = def->base[GTK_STATE_NORMAL].red;
-                    int green = def->base[GTK_STATE_NORMAL].green;
-                    int blue = def->base[GTK_STATE_NORMAL].blue;
-                    g_systemListBoxColour = 
-                           new wxColour( red    >> SHIFT,
-                                         green  >> SHIFT,
-                                                 blue   >> SHIFT );
+                    g_systemListBoxColour = new wxColour( red   >> SHIFT,
+                                                          green >> SHIFT,
+                                                          blue  >> SHIFT );

                 }
                 else
                 }
                 else

+                {

                     g_systemListBoxColour = new wxColour(*wxWHITE);
                     g_systemListBoxColour = new wxColour(*wxWHITE);

-                gtk_widget_destroy( widget );
+                }

             }
             return *g_systemListBoxColour;
             }
             return *g_systemListBoxColour;

-        }
-    case wxSYS_COLOUR_MENUTEXT:
-    case wxSYS_COLOUR_WINDOWTEXT:
-    case wxSYS_COLOUR_CAPTIONTEXT:
-    case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
-    case wxSYS_COLOUR_BTNTEXT:
-    case wxSYS_COLOUR_INFOTEXT:
-    {
+
+        case wxSYS_COLOUR_MENUTEXT:
+        case wxSYS_COLOUR_WINDOWTEXT:
+        case wxSYS_COLOUR_CAPTIONTEXT:
+        case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
+        case wxSYS_COLOUR_BTNTEXT:
+        case wxSYS_COLOUR_INFOTEXT:

             if (!g_systemBtnTextColour)
             {
                 GtkWidget *widget = gtk_button_new();
             if (!g_systemBtnTextColour)
             {
                 GtkWidget *widget = gtk_button_new();


@@ -257,42 +242,40 @@ wxColour wxSystemSettings::GetSystemColour( int index )
                     int red = def->fg[GTK_STATE_NORMAL].red;
                     int green = def->fg[GTK_STATE_NORMAL].green;
                     int blue = def->fg[GTK_STATE_NORMAL].blue;
                     int red = def->fg[GTK_STATE_NORMAL].red;
                     int green = def->fg[GTK_STATE_NORMAL].green;
                     int blue = def->fg[GTK_STATE_NORMAL].blue;

-                    g_systemBtnTextColour = 
-                           new wxColour( red    >> SHIFT,
-                                         green  >> SHIFT,
-                                                 blue   >> SHIFT );
+                    g_systemBtnTextColour =
+                        new wxColour( red    >> SHIFT,
+                                green  >> SHIFT,
+                                blue   >> SHIFT );

                 }
                 else
                 {
                 }
                 else
                 {

-                    g_systemBtnTextColour = 
-                     new wxColour(0, 0, 0);
+                    g_systemBtnTextColour =
+                        new wxColour(0, 0, 0);

                 }
                 gtk_widget_destroy( widget );
             }
             return *g_systemBtnTextColour;
                 }
                 gtk_widget_destroy( widget );
             }
             return *g_systemBtnTextColour;

-    }
-    case wxSYS_COLOUR_HIGHLIGHTTEXT:
-    {
-        if (!g_systemHighlightTextColour)
-               {
-                   wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
-                       if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
-                           g_systemHighlightTextColour = new wxColour(*wxBLACK);
-                       else
-                           g_systemHighlightTextColour = new wxColour(*wxWHITE);
-        }
-        return *g_systemHighlightTextColour;
-    }
-    case wxSYS_COLOUR_INFOBK:
-    case wxSYS_COLOUR_APPWORKSPACE:
-    {
-      return *wxWHITE;    // ?
-    }
+
+        case wxSYS_COLOUR_HIGHLIGHTTEXT:
+            if (!g_systemHighlightTextColour)
+            {
+                wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
+                if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
+                    g_systemHighlightTextColour = new wxColour(*wxBLACK);
+                else
+                    g_systemHighlightTextColour = new wxColour(*wxWHITE);
+            }
+            return *g_systemHighlightTextColour;
+
+        case wxSYS_COLOUR_INFOBK:
+        case wxSYS_COLOUR_APPWORKSPACE:
+            return *wxWHITE;    // ?

   }
   }

+

   return *wxWHITE;
 }
 
   return *wxWHITE;
 }
 

-wxFont wxSystemSettings::GetSystemFont( int index ) 
+wxFont wxSystemSettings::GetSystemFont( int index )

 {
     switch (index)
     {
 {
     switch (index)
     {


@@ -323,7 +306,7 @@ wxFont wxSystemSettings::GetSystemFont( int index )
 #endif
 
                 g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
 #endif
 
                 g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );

-                
+

             }
             return *g_systemFont;
         }
             }
             return *g_systemFont;
         }


@@ -341,8 +324,8 @@ int wxSystemSettings::GetSystemMetric( int index )
         case wxSYS_HSCROLL_Y:  return 15;
         case wxSYS_VSCROLL_X:  return 15;
     }
         case wxSYS_HSCROLL_Y:  return 15;
         case wxSYS_VSCROLL_X:  return 15;
     }

-    
+

     wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented") );
     wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented") );

-    
+

     return 0;
 }
     return 0;
 }