Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 45fd8ac9d798698b44591f14b9f663a0f4be2bef..97f72c61d4acc23997cada69572717871b464ae8 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Modified by: Mart Raudsepp (GetMetric)
 // Purpose:
 // Author:      Robert Roebling
 // Modified by: Mart Raudsepp (GetMetric)

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,169 +13,306 @@
 #include "wx/settings.h"
 
 #ifndef WX_PRECOMP
 #include "wx/settings.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/cmndata.h"

     #include "wx/toplevel.h"
 #endif
 
 #include "wx/fontutil.h"
     #include "wx/toplevel.h"
 #endif
 
 #include "wx/fontutil.h"

+#include "wx/fontenum.h"

 
 

-#include <gtk/gtkversion.h>
-#if GTK_CHECK_VERSION(2, 9, 0)
-    // gtk_object_sink
-    #undef GTK_DISABLE_DEPRECATED
-#endif

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

-#include <gdk/gdkx.h>
+#include "wx/gtk/private/win_gtk.h"
+#include "wx/gtk/private/gtk2-compat.h"

 
 

-#include <X11/Xatom.h>
+bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom);

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// wxSystemObjects
+// wxSystemSettings implementation

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-struct wxSystemObjects
+static wxFont gs_fontSystem;
+
+static GtkContainer* ContainerWidget()

 {
 {

-    wxColour m_colBtnFace,
-             m_colBtnShadow,
-             m_colBtnHighlight,
-             m_colHighlight,
-             m_colHighlightText,
-             m_colListBox,
-             m_colBtnText,
-             m_colMenuItemHighlight,
-             m_colTooltip,
-             m_colTooltipText;
-
-    wxFont m_fontSystem;
-};
-
-static wxSystemObjects gs_objects;
+    static GtkContainer* s_widget;
+    if (s_widget == NULL)
+    {
+        s_widget = GTK_CONTAINER(gtk_fixed_new());
+        GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(s_widget));
+    }
+    return s_widget;
+}

 
 

-// ----------------------------------------------------------------------------
-// wxSystemSettings implementation
-// ----------------------------------------------------------------------------
+extern "C" {
+#ifdef __WXGTK3__
+static void style_updated(GtkWidget*, void*)
+#else
+static void style_set(GtkWidget*, GtkStyle*, void*)
+#endif
+{
+    gs_fontSystem = wxNullFont;
+}
+}

 
 

-// kind of widget to use in GetColourFromGTKWidget
-enum wxGtkWidgetType
+static GtkWidget* ButtonWidget()

 {
 {

-    wxGTK_BUTTON,
-    wxGTK_LIST,
-    wxGTK_MENUITEM
-};
+    static GtkWidget* s_widget;
+    if (s_widget == NULL)
+    {
+        s_widget = gtk_button_new();
+        gtk_container_add(ContainerWidget(), s_widget);
+#ifdef __WXGTK3__
+        g_signal_connect(s_widget, "style_updated", G_CALLBACK(style_updated), NULL);
+#else
+        gtk_widget_ensure_style(s_widget);
+        g_signal_connect(s_widget, "style_set", G_CALLBACK(style_set), NULL);
+#endif
+    }
+    return s_widget;
+}

 
 

-// the colour we need
-enum wxGtkColourType
+static GtkWidget* ListWidget()

 {
 {

-    wxGTK_FG,
-    wxGTK_BG,
-    wxGTK_BASE
-};
-
-// wxSystemSettings::GetColour() helper: get the colours from a GTK+
-// widget style, return true if we did get them
-static bool GetColourFromGTKWidget(GdkColor& gdkColor,
-                                   wxGtkWidgetType type = wxGTK_BUTTON,
-                                   GtkStateType state = GTK_STATE_NORMAL,
-                                   wxGtkColourType colour = wxGTK_BG)
+    static GtkWidget* s_widget;
+    if (s_widget == NULL)
+    {
+        s_widget = gtk_tree_view_new_with_model(
+            GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_INT)));
+        gtk_container_add(ContainerWidget(), s_widget);
+#ifndef __WXGTK3__
+        gtk_widget_ensure_style(s_widget);
+#endif
+    }
+    return s_widget;
+}
+
+static GtkWidget* TextCtrlWidget()

 {
 {

-    GtkWidget *widget;
-    switch ( type )
+    static GtkWidget* s_widget;
+    if (s_widget == NULL)

     {
     {

-        default:
-            wxFAIL_MSG( _T("unexpected GTK widget type") );
-            // fall through
+        s_widget = gtk_text_view_new();
+        gtk_container_add(ContainerWidget(), s_widget);
+#ifndef __WXGTK3__
+        gtk_widget_ensure_style(s_widget);
+#endif
+    }
+    return s_widget;
+}

 
 

-        case wxGTK_BUTTON:
-            widget = gtk_button_new();
-            break;
+static GtkWidget* MenuItemWidget()
+{
+    static GtkWidget* s_widget;
+    if (s_widget == NULL)
+    {
+        s_widget = gtk_menu_item_new();
+        gtk_container_add(ContainerWidget(), s_widget);
+#ifndef __WXGTK3__
+        gtk_widget_ensure_style(s_widget);
+#endif
+    }
+    return s_widget;
+}

 
 

-        case wxGTK_LIST:
-            widget = gtk_tree_view_new_with_model(
-                (GtkTreeModel*)gtk_list_store_new(1, G_TYPE_INT));
-            break;
+static GtkWidget* MenuBarWidget()
+{
+    static GtkWidget* s_widget;
+    if (s_widget == NULL)
+    {
+        s_widget = gtk_menu_bar_new();
+        gtk_container_add(ContainerWidget(), s_widget);
+#ifndef __WXGTK3__
+        gtk_widget_ensure_style(s_widget);
+#endif
+    }
+    return s_widget;
+}

 
 

-        case wxGTK_MENUITEM:
-            widget = gtk_menu_item_new();
+static GtkWidget* ToolTipWidget()
+{
+    static GtkWidget* s_widget;
+    if (s_widget == NULL)
+    {
+        s_widget = gtk_window_new(GTK_WINDOW_POPUP);
+        const char* name = "gtk-tooltip";
+#ifndef __WXGTK3__
+        if (gtk_check_version(2, 11, 0))
+            name = "gtk-tooltips";
+#endif
+        gtk_widget_set_name(s_widget, name);
+#ifndef __WXGTK3__
+        gtk_widget_ensure_style(s_widget);
+#endif

     }
     }

+    return s_widget;
+}

 
 

-    GtkStyle *def = gtk_rc_get_style( widget );
-    if ( !def )
-        def = gtk_widget_get_default_style();
+#ifdef __WXGTK3__
+static void bg(GtkWidget* widget, GtkStateFlags state, GdkRGBA& gdkRGBA)
+{
+    GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+    gtk_style_context_get_background_color(sc, state, &gdkRGBA);
+}
+static void fg(GtkWidget* widget, GtkStateFlags state, GdkRGBA& gdkRGBA)
+{
+    GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+    gtk_style_context_get_color(sc, state, &gdkRGBA);
+}
+static void border(GtkWidget* widget, GtkStateFlags state, GdkRGBA& gdkRGBA)
+{
+    GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+    gtk_style_context_get_border_color(sc, state, &gdkRGBA);
+}

 
 

-    const bool ok = def != NULL;
-    if (ok)
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
+{
+    GdkRGBA gdkRGBA = { 0, 0, 0, 1 };
+    switch (index)

     {
     {

-        switch ( colour )
+    case wxSYS_COLOUR_3DLIGHT:
+    case wxSYS_COLOUR_ACTIVEBORDER:
+    case wxSYS_COLOUR_BTNFACE:
+    case wxSYS_COLOUR_DESKTOP:
+    case wxSYS_COLOUR_INACTIVEBORDER:
+    case wxSYS_COLOUR_INACTIVECAPTION:
+    case wxSYS_COLOUR_SCROLLBAR:
+    case wxSYS_COLOUR_WINDOWFRAME:
+        bg(ButtonWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_BTNHIGHLIGHT:
+    case wxSYS_COLOUR_HIGHLIGHT:
+        bg(ButtonWidget(), GTK_STATE_FLAG_SELECTED, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_BTNSHADOW:
+        border(ButtonWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_BTNTEXT:
+    case wxSYS_COLOUR_WINDOWTEXT:
+        fg(ButtonWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_GRAYTEXT:
+    case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
+        fg(ButtonWidget(), GTK_STATE_FLAG_INSENSITIVE, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_HIGHLIGHTTEXT:
+        fg(ButtonWidget(), GTK_STATE_FLAG_SELECTED, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_HOTLIGHT:

         {
         {

-            default:
-                wxFAIL_MSG( _T("unexpected GTK colour type") );
-                // fall through
-
-            case wxGTK_FG:
-                gdkColor = def->fg[state];
-                break;
-
-            case wxGTK_BG:
-                gdkColor = def->bg[state];
-                break;
-
-            case wxGTK_BASE:
-                gdkColor = def->base[state];
-                break;
+            static GtkWidget* s_widget;
+            if (s_widget == NULL)
+            {
+                s_widget = gtk_link_button_new("");
+                gtk_container_add(ContainerWidget(), s_widget);
+            }
+            fg(s_widget, GTK_STATE_FLAG_NORMAL, gdkRGBA);

         }
         }

+        break;
+    case wxSYS_COLOUR_INFOBK:
+        bg(ToolTipWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_INFOTEXT:
+        fg(ToolTipWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_LISTBOX:
+        bg(ListWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT:
+        fg(ListWidget(), GTK_STATE_FLAG_SELECTED, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_LISTBOXTEXT:
+        fg(ListWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_MENU:
+        bg(MenuItemWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_MENUBAR:
+        bg(MenuBarWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_ACTIVECAPTION:
+    case wxSYS_COLOUR_MENUHILIGHT:
+        bg(MenuItemWidget(), GTK_STATE_FLAG_SELECTED, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_MENUTEXT:
+        fg(MenuItemWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_APPWORKSPACE:
+    case wxSYS_COLOUR_WINDOW:
+        bg(TextCtrlWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_CAPTIONTEXT:
+        {
+            GdkRGBA c = { 1, 1, 1, 1 };
+            gdkRGBA = c;
+        }
+        break;
+    default:
+        wxFAIL_MSG("unknown system colour index");
+        // fallthrough
+    case wxSYS_COLOUR_3DDKSHADOW:
+    case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
+    case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
+        // black
+        break;

     }
     }

+    return wxColour(gdkRGBA);
+}
+#else
+static const GtkStyle* ButtonStyle()
+{
+    return gtk_widget_get_style(ButtonWidget());
+}

 
 

-    gtk_object_sink((GtkObject*)widget);
+static const GtkStyle* ListStyle()
+{
+    return gtk_widget_get_style(ListWidget());
+}
+
+static const GtkStyle* TextCtrlStyle()
+{
+    return gtk_widget_get_style(TextCtrlWidget());
+}
+
+static const GtkStyle* MenuItemStyle()
+{
+    return gtk_widget_get_style(MenuItemWidget());
+}

 
 

-    return ok;
+static const GtkStyle* MenuBarStyle()
+{
+    return gtk_widget_get_style(MenuBarWidget());

 }
 
 }
 

-static void GetTooltipColors()
+static const GtkStyle* ToolTipStyle()

 {
 {

-    GtkWidget* widget = gtk_window_new(GTK_WINDOW_POPUP);
-    const char* name = "gtk-tooltip";
-    if (gtk_check_version(2, 11, 0))
-        name = "gtk-tooltips";
-    gtk_widget_set_name(widget, name);
-    gtk_widget_ensure_style(widget);
-
-    GdkColor c = widget->style->bg[GTK_STATE_NORMAL];
-    gs_objects.m_colTooltip = wxColor(c);
-    c = widget->style->fg[GTK_STATE_NORMAL];
-    gs_objects.m_colTooltipText = wxColor(c);
-
-    gtk_widget_destroy(widget);
+    return gtk_widget_get_style(ToolTipWidget());

 }
 
 wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 {
     wxColor color;
 }
 
 wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 {
     wxColor color;

-    GdkColor gdkColor;

     switch (index)
     {
         case wxSYS_COLOUR_SCROLLBAR:
         case wxSYS_COLOUR_BACKGROUND:
     switch (index)
     {
         case wxSYS_COLOUR_SCROLLBAR:
         case wxSYS_COLOUR_BACKGROUND:

+        //case wxSYS_COLOUR_DESKTOP:

         case wxSYS_COLOUR_INACTIVECAPTION:
         case wxSYS_COLOUR_MENU:
         case wxSYS_COLOUR_WINDOWFRAME:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_INACTIVECAPTION:
         case wxSYS_COLOUR_MENU:
         case wxSYS_COLOUR_WINDOWFRAME:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:

-        case wxSYS_COLOUR_MENUBAR:
+        //case wxSYS_COLOUR_3DFACE:

         case wxSYS_COLOUR_3DLIGHT:
         case wxSYS_COLOUR_3DLIGHT:

-            if (!gs_objects.m_colBtnFace.Ok())
-            {
-                gdkColor.red =
-                gdkColor.green = 0;
-                gdkColor.blue = 0x9c40;
-                GetColourFromGTKWidget(gdkColor);
-                gs_objects.m_colBtnFace = wxColor(gdkColor);
-            }
-            color = gs_objects.m_colBtnFace;
+            color = wxColor(ButtonStyle()->bg[GTK_STATE_NORMAL]);

             break;
 
         case wxSYS_COLOUR_WINDOW:
             break;
 
         case wxSYS_COLOUR_WINDOW:

-            color = *wxWHITE;
+            color = wxColor(TextCtrlStyle()->base[GTK_STATE_NORMAL]);
+            break;
+
+        case wxSYS_COLOUR_MENUBAR:
+            color = wxColor(MenuBarStyle()->bg[GTK_STATE_NORMAL]);

             break;
 
         case wxSYS_COLOUR_3DDKSHADOW:
             break;
 
         case wxSYS_COLOUR_3DDKSHADOW:


@@ -186,51 +322,38 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         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 (!gs_objects.m_colBtnShadow.Ok())

             {
                 wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));
             {
                 wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));

-                gs_objects.m_colBtnShadow =
+                color =

                    wxColour((unsigned char) (faceColour.Red() * 2 / 3),
                             (unsigned char) (faceColour.Green() * 2 / 3),
                             (unsigned char) (faceColour.Blue() * 2 / 3));
             }
                    wxColour((unsigned char) (faceColour.Red() * 2 / 3),
                             (unsigned char) (faceColour.Green() * 2 / 3),
                             (unsigned char) (faceColour.Blue() * 2 / 3));
             }

-            color = gs_objects.m_colBtnShadow;

             break;
 
             break;
 

-        case wxSYS_COLOUR_3DHIGHLIGHT:
-        //case wxSYS_COLOUR_BTNHIGHLIGHT:
+        case wxSYS_COLOUR_BTNHIGHLIGHT:
+        //case wxSYS_COLOUR_BTNHILIGHT:
+        //case wxSYS_COLOUR_3DHIGHLIGHT:
+        //case wxSYS_COLOUR_3DHILIGHT:

             color = *wxWHITE;
             break;
 
         case wxSYS_COLOUR_HIGHLIGHT:
             color = *wxWHITE;
             break;
 
         case wxSYS_COLOUR_HIGHLIGHT:

-            if (!gs_objects.m_colHighlight.Ok())
-            {
-                gdkColor.red =
-                gdkColor.green = 0;
-                gdkColor.blue = 0x9c40;
-                GetColourFromGTKWidget(
-                    gdkColor, wxGTK_BUTTON, GTK_STATE_SELECTED);
-                gs_objects.m_colHighlight = wxColour(gdkColor);
-            }
-            color = gs_objects.m_colHighlight;
+            color = wxColor(ButtonStyle()->bg[GTK_STATE_SELECTED]);

             break;
 
         case wxSYS_COLOUR_LISTBOX:
             break;
 
         case wxSYS_COLOUR_LISTBOX:

-            if (!gs_objects.m_colListBox.Ok())
-            {
-                if ( GetColourFromGTKWidget(gdkColor,
-                                            wxGTK_LIST,
-                                            GTK_STATE_NORMAL,
-                                            wxGTK_BASE) )
-                {
-                    gs_objects.m_colListBox = wxColour(gdkColor);
-                }
-                else
-                {
-                    gs_objects.m_colListBox = *wxWHITE;
-                }
-            }
-            color = gs_objects.m_colListBox;
+            color = wxColor(ListStyle()->base[GTK_STATE_NORMAL]);
+            break;
+
+        case wxSYS_COLOUR_LISTBOXTEXT:
+            color = wxColor(ListStyle()->text[GTK_STATE_NORMAL]);
+            break;
+
+        case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT:
+            // This is for the text in a list control (or tree) when the
+            // item is selected, but not focused
+            color = wxColor(ListStyle()->text[GTK_STATE_ACTIVE]);

             break;
 
         case wxSYS_COLOUR_MENUTEXT:
             break;
 
         case wxSYS_COLOUR_MENUTEXT:


@@ -238,42 +361,19 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         case wxSYS_COLOUR_CAPTIONTEXT:
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
         case wxSYS_COLOUR_BTNTEXT:
         case wxSYS_COLOUR_CAPTIONTEXT:
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
         case wxSYS_COLOUR_BTNTEXT:

-            if (!gs_objects.m_colBtnText.Ok())
-            {
-                gdkColor.red =
-                gdkColor.green =
-                gdkColor.blue = 0;
-                GetColourFromGTKWidget(
-                    gdkColor, wxGTK_BUTTON, GTK_STATE_NORMAL, wxGTK_FG);
-                gs_objects.m_colBtnText = wxColour(gdkColor);
-            }
-            color = gs_objects.m_colBtnText;
+            color = wxColor(ButtonStyle()->fg[GTK_STATE_NORMAL]);

             break;
 
         case wxSYS_COLOUR_INFOBK:
             break;
 
         case wxSYS_COLOUR_INFOBK:

-            if (!gs_objects.m_colTooltip.Ok()) {
-                GetTooltipColors();
-            }
-            color = gs_objects.m_colTooltip;
+            color = wxColor(ToolTipStyle()->bg[GTK_STATE_NORMAL]);

             break;
 
         case wxSYS_COLOUR_INFOTEXT:
             break;
 
         case wxSYS_COLOUR_INFOTEXT:

-            if (!gs_objects.m_colTooltipText.Ok()) {
-                GetTooltipColors();
-            }
-            color = gs_objects.m_colTooltipText;
+            color = wxColor(ToolTipStyle()->fg[GTK_STATE_NORMAL]);

             break;
 
         case wxSYS_COLOUR_HIGHLIGHTTEXT:
             break;
 
         case wxSYS_COLOUR_HIGHLIGHTTEXT:

-            if (!gs_objects.m_colHighlightText.Ok())
-            {
-                wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT);
-                if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
-                    gs_objects.m_colHighlightText = *wxBLACK;
-                else
-                    gs_objects.m_colHighlightText = *wxWHITE;
-            }
-            color = gs_objects.m_colHighlightText;
+            color = wxColor(ButtonStyle()->fg[GTK_STATE_SELECTED]);

             break;
 
         case wxSYS_COLOUR_APPWORKSPACE:
             break;
 
         case wxSYS_COLOUR_APPWORKSPACE:


@@ -282,16 +382,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 
         case wxSYS_COLOUR_ACTIVECAPTION:
         case wxSYS_COLOUR_MENUHILIGHT:
 
         case wxSYS_COLOUR_ACTIVECAPTION:
         case wxSYS_COLOUR_MENUHILIGHT:

-            if (!gs_objects.m_colMenuItemHighlight.Ok())
-            {
-                gdkColor.red =
-                gdkColor.green =
-                gdkColor.blue = 0;
-                GetColourFromGTKWidget(
-                    gdkColor, wxGTK_MENUITEM, GTK_STATE_SELECTED, wxGTK_BG);
-                gs_objects.m_colMenuItemHighlight = wxColour(gdkColor);
-            }
-            color = gs_objects.m_colMenuItemHighlight;
+            color = wxColor(MenuItemStyle()->bg[GTK_STATE_SELECTED]);

             break;
 
         case wxSYS_COLOUR_HOTLIGHT:
             break;
 
         case wxSYS_COLOUR_HOTLIGHT:


@@ -303,13 +394,15 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 
         case wxSYS_COLOUR_MAX:
         default:
 
         case wxSYS_COLOUR_MAX:
         default:

-            wxFAIL_MSG( _T("unknown system colour index") );
+            wxFAIL_MSG( wxT("unknown system colour index") );

             color = *wxWHITE;
             break;
     }
 
             color = *wxWHITE;
             break;
     }
 

+    wxASSERT(color.IsOk());

     return color;
 }
     return color;
 }

+#endif

 
 wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
 {
 
 wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
 {


@@ -326,107 +419,73 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
         case wxSYS_SYSTEM_FONT:
         case wxSYS_DEVICE_DEFAULT_FONT:
         case wxSYS_DEFAULT_GUI_FONT:
         case wxSYS_SYSTEM_FONT:
         case wxSYS_DEVICE_DEFAULT_FONT:
         case wxSYS_DEFAULT_GUI_FONT:

-            if (!gs_objects.m_fontSystem.Ok())
+            if (!gs_fontSystem.IsOk())

             {
             {

-                GtkWidget *widget = gtk_button_new();
-                GtkStyle *def = gtk_rc_get_style( widget );
-                if ( !def || !def->font_desc )
-                    def = gtk_widget_get_default_style();
-                if ( def && def->font_desc )
-                {
-                    wxNativeFontInfo info;
-                    info.description =
-                        pango_font_description_copy(def->font_desc);
-                    gs_objects.m_fontSystem = wxFont(info);
-                }
-                else
-                {
-                    GtkSettings *settings = gtk_settings_get_default();
-                    gchar *font_name = NULL;
-                    g_object_get ( settings,
-                                   "gtk-font-name",
-                                   &font_name,
-                                   NULL);
-                    if (!font_name)
-                        gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-                    else
-                        gs_objects.m_fontSystem = wxFont(wxString::FromAscii(font_name));
-                    g_free (font_name);
-                }
-                gtk_object_sink((GtkObject*)widget);
+                wxNativeFontInfo info;
+#ifdef __WXGTK3__
+                GtkStyleContext* sc = gtk_widget_get_style_context(ButtonWidget());
+                info.description = const_cast<PangoFontDescription*>(
+                    gtk_style_context_get_font(sc, GTK_STATE_FLAG_NORMAL));
+#else
+                info.description = ButtonStyle()->font_desc;
+#endif
+                gs_fontSystem = wxFont(info);
+
+#if wxUSE_FONTENUM
+                // (try to) heal the default font (on some common systems e.g. Ubuntu
+                // it's "Sans Serif" but the real font is called "Sans"):
+                if (!wxFontEnumerator::IsValidFacename(gs_fontSystem.GetFaceName()) &&
+                    gs_fontSystem.GetFaceName() == "Sans Serif")
+                    gs_fontSystem.SetFaceName("Sans");
+#endif // wxUSE_FONTENUM
+
+                info.description = NULL;

             }
             }

-            font = gs_objects.m_fontSystem;
+            font = gs_fontSystem;

             break;
 
         default:
             break;
     }
             break;
 
         default:
             break;
     }

+
+    wxASSERT( font.IsOk() );
+

     return font;
 }
 
     return font;
 }
 

-static bool GetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)
+// helper: return the GtkSettings either for the screen the current window is
+// on or for the default screen if window is NULL
+static GtkSettings *GetSettingsForWindowScreen(GdkWindow *window)

 {
 {

-    bool success = false;
-    Atom property = 0;
-#if GTK_CHECK_VERSION(2, 2, 0)
-    if (gtk_check_version(2, 2, 0) == NULL)
-    {
-        if (gdk_x11_screen_supports_net_wm_hint(
-                gdk_drawable_get_screen(window),
-                gdk_atom_intern("_NET_FRAME_EXTENTS", false)))
-        {
-            success = true;
-            property = gdk_x11_get_xatom_by_name_for_display(
-                gdk_drawable_get_display(window),
-                "_NET_FRAME_EXTENTS");
-        }
-    }
-    else
-#endif
-    {
-        if (gdk_net_wm_supports(gdk_atom_intern("_NET_FRAME_EXTENTS", false)))
-        {
-            success = true;
-            property = gdk_x11_get_xatom_by_name("_NET_FRAME_EXTENTS");
-        }
-    }
-    if (success)
+    return window ? gtk_settings_get_for_screen(gdk_window_get_screen(window))
+                  : gtk_settings_get_default();
+}
+
+static int GetBorderWidth(wxSystemMetric index, wxWindow* win)
+{
+    if (win->m_wxwindow)

     {
     {

-        Atom type;
-        int format;
-        gulong nitems, bytes_after;
-        long* data = NULL;
-        success = XGetWindowProperty(
-            gdk_x11_drawable_get_xdisplay(window),
-            gdk_x11_drawable_get_xid(window),
-            property,
-            0, 4,
-            false,
-            XA_CARDINAL,
-            &type, &format, &nitems, &bytes_after, (guchar**)&data
-            ) == Success;
-        if (success)
+        wxPizza* pizza = WX_PIZZA(win->m_wxwindow);
+        GtkBorder border;
+        pizza->get_border(border);
+        switch (index)

         {
         {

-            success = data && nitems == 4;
-            if (success)
-            {
-                if (left)   *left   = int(data[0]);
-                if (right)  *right  = int(data[1]);
-                if (top)    *top    = int(data[2]);
-                if (bottom) *bottom = int(data[3]);
-            }
-            if (data)
-                XFree(data);
+            case wxSYS_BORDER_X:
+            case wxSYS_EDGE_X:
+            case wxSYS_FRAMESIZE_X:
+                return border.left;
+            default:
+                return border.top;

         }
     }
         }
     }

-    return success;
+    return -1;

 }
 
 int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 {
     GdkWindow *window = NULL;
 }
 
 int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 {
     GdkWindow *window = NULL;

-    if(win && GTK_WIDGET_REALIZED(win->GetHandle()))
-        window = win->GetHandle()->window;
+    if (win)
+        window = gtk_widget_get_window(win->GetHandle());

 
     switch (index)
     {
 
     switch (index)
     {


@@ -436,20 +495,18 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
         case wxSYS_EDGE_Y:
         case wxSYS_FRAMESIZE_X:
         case wxSYS_FRAMESIZE_Y:
         case wxSYS_EDGE_Y:
         case wxSYS_FRAMESIZE_X:
         case wxSYS_FRAMESIZE_Y:

-            // If a window is specified/realized, and it is a toplevel window, we can query from wm.
-            // The returned border thickness is outside the client area in that case.
-            if (window)
+            if (win)

             {
                 wxTopLevelWindow *tlw = wxDynamicCast(win, wxTopLevelWindow);
                 if (!tlw)
             {
                 wxTopLevelWindow *tlw = wxDynamicCast(win, wxTopLevelWindow);
                 if (!tlw)

-                    return -1; // not a tlw, not sure how to approach
-                else
+                    return GetBorderWidth(index, win);
+                else if (window)

                 {
                     // Get the frame extents from the windowmanager.
                     // In most cases the top extent is the titlebar, so we use the bottom extent
                     // for the heights.
                     int right, bottom;
                 {
                     // Get the frame extents from the windowmanager.
                     // In most cases the top extent is the titlebar, so we use the bottom extent
                     // for the heights.
                     int right, bottom;

-                    if (GetFrameExtents(window, NULL, &right, NULL, &bottom))
+                    if (wxGetFrameExtents(window, NULL, &right, NULL, &bottom))

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


@@ -468,55 +525,29 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 
         case wxSYS_CURSOR_X:
         case wxSYS_CURSOR_Y:
 
         case wxSYS_CURSOR_X:
         case wxSYS_CURSOR_Y:

-#ifdef __WXGTK24__
-            if (!gtk_check_version(2,4,0))
-            {
-                if (window)
-                    return gdk_display_get_default_cursor_size(gdk_drawable_get_display(window));
-                else
-                    return gdk_display_get_default_cursor_size(gdk_display_get_default());
-            }
-            else
-#endif
-                return 16;
+                return gdk_display_get_default_cursor_size(
+                            window ? gdk_window_get_display(window)
+                                   : gdk_display_get_default());

 
         case wxSYS_DCLICK_X:
         case wxSYS_DCLICK_Y:
             gint dclick_distance;
 
         case wxSYS_DCLICK_X:
         case wxSYS_DCLICK_Y:
             gint dclick_distance;

-#if GTK_CHECK_VERSION(2,2,0)
-            if (window && !gtk_check_version(2,2,0))
-                g_object_get(gtk_settings_get_for_screen(gdk_drawable_get_screen(window)),
-                                "gtk-double-click-distance", &dclick_distance, NULL);
-            else
-#endif
-                g_object_get(gtk_settings_get_default(),
-                                "gtk-double-click-distance", &dclick_distance, NULL);
+            g_object_get(GetSettingsForWindowScreen(window),
+                            "gtk-double-click-distance", &dclick_distance, NULL);

 
             return dclick_distance * 2;
 
         case wxSYS_DCLICK_MSEC:
             gint dclick;
 
             return dclick_distance * 2;
 
         case wxSYS_DCLICK_MSEC:
             gint dclick;

-            g_object_get(gtk_settings_get_default(),
+            g_object_get(GetSettingsForWindowScreen(window),

                             "gtk-double-click-time", &dclick, NULL);
             return dclick;
 
         case wxSYS_DRAG_X:
         case wxSYS_DRAG_Y:
             gint drag_threshold;
                             "gtk-double-click-time", &dclick, NULL);
             return dclick;
 
         case wxSYS_DRAG_X:
         case wxSYS_DRAG_Y:
             gint drag_threshold;

-#if GTK_CHECK_VERSION(2,2,0)
-            if (window && !gtk_check_version(2,2,0))
-            {
-                g_object_get(
-                        gtk_settings_get_for_screen(gdk_drawable_get_screen(window)),
-                        "gtk-dnd-drag-threshold",
-                        &drag_threshold, NULL);
-            }
-            else
-#endif
-            {
-                g_object_get(gtk_settings_get_default(),
-                             "gtk-dnd-drag-threshold", &drag_threshold, NULL);
-            }
+            g_object_get(GetSettingsForWindowScreen(window),
+                            "gtk-dnd-drag-threshold", &drag_threshold, NULL);

 
             // The correct thing here would be to double the value
             // since that is what the API wants. But the values
 
             // The correct thing here would be to double the value
             // since that is what the API wants. But the values


@@ -526,28 +557,25 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 
             return drag_threshold;
 
 
             return drag_threshold;
 

-        // MBN: ditto for icons
-        case wxSYS_ICON_X:     return 32;
-        case wxSYS_ICON_Y:     return 32;
+        case wxSYS_ICON_X:
+        case wxSYS_ICON_Y:
+            return 32;

 
         case wxSYS_SCREEN_X:
 
         case wxSYS_SCREEN_X:

-#if GTK_CHECK_VERSION(2,2,0)
-            if (window && !gtk_check_version(2,2,0))
-                return gdk_screen_get_width(gdk_drawable_get_screen(window));
+            if (window)
+                return gdk_screen_get_width(gdk_window_get_screen(window));

             else
             else

-#endif

                 return gdk_screen_width();
 
         case wxSYS_SCREEN_Y:
                 return gdk_screen_width();
 
         case wxSYS_SCREEN_Y:

-#if GTK_CHECK_VERSION(2,2,0)
-            if (window && !gtk_check_version(2,2,0))
-                return gdk_screen_get_height(gdk_drawable_get_screen(window));
+            if (window)
+                return gdk_screen_get_height(gdk_window_get_screen(window));

             else
             else

-#endif

                 return gdk_screen_height();
 
                 return gdk_screen_height();
 

-        case wxSYS_HSCROLL_Y:  return 15;
-        case wxSYS_VSCROLL_X:  return 15;
+        case wxSYS_HSCROLL_Y:
+        case wxSYS_VSCROLL_X:
+            return 15;

 
         case wxSYS_CAPTION_Y:
             if (!window)
 
         case wxSYS_CAPTION_Y:
             if (!window)


@@ -564,7 +592,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
             // Reconsider when we have a way to report to the user on which side it is.
             {
                 int top;
             // Reconsider when we have a way to report to the user on which side it is.
             {
                 int top;

-                if (GetFrameExtents(window, NULL, NULL, &top, NULL))
+                if (wxGetFrameExtents(window, NULL, NULL, &top, NULL))

                 {
                     return top; // top frame extent
                 }
                 {
                     return top; // top frame extent
                 }