Removed outdated initialization.

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

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 73ad0b87b3fcebe9d5a70f567927b4518f48fc83..b7b1283e83e33cd9bfa51091978b43b1f8b7437b 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -1,104 +1,102 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/settings.cpp
+// Name:        src/gtk1/settings.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

+// Modified by: Mart Raudsepp (GetMetric)

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

-
-#ifdef __GNUG__
-#pragma implementation "settings.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/settings.h"
 
 #include "wx/settings.h"

-#include "wx/debug.h"

 
 

-#include "wx/cmndata.h"
+#ifndef WX_PRECOMP
+    #include "wx/cmndata.h"
+    #include "wx/toplevel.h"
+#endif
+
+#include "wx/fontutil.h"

 
 #include <gdk/gdk.h>
 
 #include <gdk/gdk.h>

+#include <gdk/gdkx.h>

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

-extern GdkFont *GtkGetDefaultGuiFont();
-
-
-/*
-#define wxSYS_COLOUR_SCROLLBAR         0
-#define wxSYS_COLOUR_BACKGROUND        1
-#define wxSYS_COLOUR_ACTIVECAPTION     2
-#define wxSYS_COLOUR_INACTIVECAPTION   3
-#define wxSYS_COLOUR_MENU              4
-#define wxSYS_COLOUR_WINDOW            5
-#define wxSYS_COLOUR_WINDOWFRAME       6
-#define wxSYS_COLOUR_MENUTEXT          7
-#define wxSYS_COLOUR_WINDOWTEXT        8
-#define wxSYS_COLOUR_CAPTIONTEXT       9
-#define wxSYS_COLOUR_ACTIVEBORDER      10
-#define wxSYS_COLOUR_INACTIVEBORDER    11
-#define wxSYS_COLOUR_APPWORKSPACE      12
-#define wxSYS_COLOUR_HIGHLIGHT         13
-#define wxSYS_COLOUR_HIGHLIGHTTEXT     14
-#define wxSYS_COLOUR_BTNFACE           15
-#define wxSYS_COLOUR_BTNSHADOW         16
-#define wxSYS_COLOUR_GRAYTEXT          17
-#define wxSYS_COLOUR_BTNTEXT           18
-#define wxSYS_COLOUR_INACTIVECAPTIONTEXT 19
-#define wxSYS_COLOUR_BTNHIGHLIGHT      20
-
-#define wxSYS_COLOUR_3DDKSHADOW        21
-#define wxSYS_COLOUR_3DLIGHT           22
-#define wxSYS_COLOUR_INFOTEXT          23
-#define wxSYS_COLOUR_INFOBK            24
-
-#define wxSYS_COLOUR_DESKTOP           wxSYS_COLOUR_BACKGROUND
-#define wxSYS_COLOUR_3DFACE            wxSYS_COLOUR_BTNFACE
-#define wxSYS_COLOUR_3DSHADOW          wxSYS_COLOUR_BTNSHADOW
-#define wxSYS_COLOUR_3DHIGHLIGHT       wxSYS_COLOUR_BTNHIGHLIGHT
-#define wxSYS_COLOUR_3DHILIGHT         wxSYS_COLOUR_BTNHIGHLIGHT
-#define wxSYS_COLOUR_BTNHILIGHT        wxSYS_COLOUR_BTNHIGHLIGHT
-*/
+#include <X11/Xatom.h>

 
 #define SHIFT (8*(sizeof(short int)-sizeof(char)))
 
 
 #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;
-wxColour *g_systemHighlightColour     = (wxColour *) NULL;
-wxColour *g_systemHighlightTextColour = (wxColour *) NULL;
-wxColour *g_systemListBoxColour       = (wxColour *) NULL;
-wxColour *g_systemBtnTextColour       = (wxColour *) NULL;
+// ----------------------------------------------------------------------------
+// wxSystemObjects
+// ----------------------------------------------------------------------------

 
 

-wxFont *g_systemFont = (wxFont *) NULL;
-
-void wxSystemSettings::Done()
+struct wxSystemObjects

 {
 {

-//    delete g_systemWinColour;
-    delete g_systemBtnFaceColour;
-    delete g_systemBtnShadowColour;
-    delete g_systemBtnHighlightColour;
-    delete g_systemHighlightColour;
-    delete g_systemHighlightTextColour;
-    delete g_systemListBoxColour;
-    delete g_systemFont;
-    delete g_systemBtnTextColour;
-}
+    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;
+
+// ----------------------------------------------------------------------------
+// wxSystemSettings implementation
+// ----------------------------------------------------------------------------

 
 // kind of widget to use in GetColourFromGTKWidget
 
 // kind of widget to use in GetColourFromGTKWidget

-enum GtkWidgetType
+enum wxGtkWidgetType
+{
+    wxGTK_BUTTON,
+    wxGTK_LIST,
+    wxGTK_MENUITEM
+};
+
+// the colour we need
+enum wxGtkColourType

 {
 {

-    GTK_BUTTON,
-    GTK_LIST
+    wxGTK_FG,
+    wxGTK_BG,
+    wxGTK_BASE

 };
 
 };
 

-// wxSystemSettings::GetSystemColour() helper: get the colours from a GTK+
+// wxSystemSettings::GetColour() helper: get the colours from a GTK+

 // widget style, return true if we did get them, false to use defaults
 // 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)
+static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
+                                   wxGtkWidgetType type = wxGTK_BUTTON,
+                                   GtkStateType state = GTK_STATE_NORMAL,
+                                   wxGtkColourType colour = wxGTK_BG)

 {
 {

-    GtkWidget *widget = type == GTK_BUTTON ? gtk_button_new() : gtk_list_new();
+    GtkWidget *widget;
+    switch ( type )
+    {
+        default:
+            wxFAIL_MSG( _T("unexpected GTK widget type") );
+            // fall through
+
+        case wxGTK_BUTTON:
+            widget = gtk_button_new();
+            break;
+
+        case wxGTK_LIST:
+            widget = gtk_list_new();
+            break;
+
+        case wxGTK_MENUITEM:
+            widget = gtk_menu_item_new();
+    }
+

     GtkStyle *def = gtk_rc_get_style( widget );
     if ( !def )
         def = gtk_widget_get_default_style();
     GtkStyle *def = gtk_rc_get_style( widget );
     if ( !def )
         def = gtk_widget_get_default_style();


@@ -106,19 +104,35 @@ static bool GetColourFromGTKWidget(GtkWidgetType type, GtkStateType state,
     bool ok;
     if ( def )
     {
     bool ok;
     if ( def )
     {

-        // ok, it's a hack: we really should have different functions to
-        // access GtkStyle::bg and ::base but as we only use base for listbox
-        // for now, this code works too
-        GdkColor *col = type == GTK_BUTTON ? def->bg : def->base;
+        GdkColor *col;
+        switch ( colour )
+        {
+            default:
+                wxFAIL_MSG( _T("unexpected GTK colour type") );
+                // fall through
+
+            case wxGTK_FG:
+                col = def->fg;
+                break;
+
+            case wxGTK_BG:
+                col = def->bg;
+                break;
+
+            case wxGTK_BASE:
+                col = def->base;
+                break;
+        }
+

         red = col[state].red;
         green = col[state].green;
         blue = col[state].blue;
 
         red = col[state].red;
         green = col[state].green;
         blue = col[state].blue;
 

-        ok = TRUE;
+        ok = true;

     }
     else
     {
     }
     else
     {

-        ok = FALSE;
+        ok = false;

     }
 
     gtk_widget_destroy( widget );
     }
 
     gtk_widget_destroy( widget );


@@ -126,36 +140,47 @@ static bool GetColourFromGTKWidget(GtkWidgetType type, GtkStateType state,
     return ok;
 }
 
     return ok;
 }
 

-wxColour wxSystemSettings::GetSystemColour( int index )
+static void GetTooltipColors()
+{
+    GtkTooltips* tooltips = gtk_tooltips_new();
+    gtk_tooltips_force_window(tooltips);
+    gtk_widget_ensure_style(tooltips->tip_window);
+    GdkColor c = tooltips->tip_window->style->bg[GTK_STATE_NORMAL];
+    gs_objects.m_colTooltip = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);
+    c = tooltips->tip_window->style->fg[GTK_STATE_NORMAL];
+    gs_objects.m_colTooltipText = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);
+    gtk_object_sink(wx_reinterpret_cast(GtkObject*, tooltips));
+}
+
+wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )

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

-            if (!g_systemBtnFaceColour)
+            if (!gs_objects.m_colBtnFace.Ok())

             {
                 int red, green, blue;
             {
                 int red, green, blue;

-                if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_NORMAL,
-                                             red, green, blue) )
+                if ( !GetColourFromGTKWidget(red, green, blue) )

                 {
                     red =
                     green = 0;
                     blue = 0x9c40;
                 }
 
                 {
                     red =
                     green = 0;
                     blue = 0x9c40;
                 }
 

-                g_systemBtnFaceColour = new wxColour( red   >> SHIFT,
-                                                      green >> SHIFT,
-                                                      blue  >> SHIFT );
+                gs_objects.m_colBtnFace = wxColour( red   >> SHIFT,
+                                                   green >> SHIFT,
+                                                   blue  >> SHIFT );

             }
             }

-            return *g_systemBtnFaceColour;
+            return gs_objects.m_colBtnFace;

 
         case wxSYS_COLOUR_WINDOW:
             return *wxWHITE;
 
         case wxSYS_COLOUR_WINDOW:
             return *wxWHITE;


@@ -166,120 +191,146 @@ wxColour wxSystemSettings::GetSystemColour( int 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 (!g_systemBtnShadowColour)
+            if (!gs_objects.m_colBtnShadow.Ok())

             {
             {

-                wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
-                g_systemBtnShadowColour =
-                   new wxColour((unsigned char) (faceColour.Red() * 0.666),
-                                (unsigned char) (faceColour.Green() * 0.666),
-                                (unsigned char) (faceColour.Blue() * 0.666));
+                wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));
+                gs_objects.m_colBtnShadow =
+                   wxColour((unsigned char) (faceColour.Red() * 0.666),
+                            (unsigned char) (faceColour.Green() * 0.666),
+                            (unsigned char) (faceColour.Blue() * 0.666));

             }
 
             }
 

-            return *g_systemBtnShadowColour;
+            return gs_objects.m_colBtnShadow;

 
         case wxSYS_COLOUR_3DHIGHLIGHT:
         //case wxSYS_COLOUR_BTNHIGHLIGHT:
             return * wxWHITE;
 
         case wxSYS_COLOUR_3DHIGHLIGHT:
         //case wxSYS_COLOUR_BTNHIGHLIGHT:
             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)
-            {
-                g_systemBtnHighlightColour =
-                    new wxColour( 0xea60 >> SHIFT,
-                                  0xea60 >> SHIFT,
-                                  0xea60 >> SHIFT );
-            }
-            return *g_systemBtnHighlightColour;
-*/

 
         case wxSYS_COLOUR_HIGHLIGHT:
 
         case wxSYS_COLOUR_HIGHLIGHT:

-            if (!g_systemHighlightColour)
+            if (!gs_objects.m_colHighlight.Ok())

             {
                 int red, green, blue;
             {
                 int red, green, blue;

-                if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_SELECTED,
-                                             red, green, blue) )
+                if ( !GetColourFromGTKWidget(red, green, blue,
+                                             wxGTK_BUTTON,
+                                             GTK_STATE_SELECTED) )

                 {
                     red =
                     green = 0;
                     blue = 0x9c40;
                 }
 
                 {
                     red =
                     green = 0;
                     blue = 0x9c40;
                 }
 

-                g_systemHighlightColour = new wxColour( red   >> SHIFT,
+                gs_objects.m_colHighlight = wxColour( red   >> SHIFT,

                                                         green >> SHIFT,
                                                         blue  >> SHIFT );
             }
                                                         green >> SHIFT,
                                                         blue  >> SHIFT );
             }

-            return *g_systemHighlightColour;
+            return gs_objects.m_colHighlight;

 
         case wxSYS_COLOUR_LISTBOX:
 
         case wxSYS_COLOUR_LISTBOX:

-            if (!g_systemListBoxColour)
+            if (!gs_objects.m_colListBox.Ok())

             {
                 int red, green, blue;
             {
                 int red, green, blue;

-                if ( GetColourFromGTKWidget(GTK_LIST, GTK_STATE_NORMAL,
-                                            red, green, blue) )
+                if ( GetColourFromGTKWidget(red, green, blue,
+                                            wxGTK_LIST,
+                                            GTK_STATE_NORMAL,
+                                            wxGTK_BASE) )

                 {
                 {

-                    g_systemListBoxColour = new wxColour( red   >> SHIFT,
+                    gs_objects.m_colListBox = wxColour( red   >> SHIFT,

                                                           green >> SHIFT,
                                                           blue  >> SHIFT );
                 }
                 else
                 {
                                                           green >> SHIFT,
                                                           blue  >> SHIFT );
                 }
                 else
                 {

-                    g_systemListBoxColour = new wxColour(*wxWHITE);
+                    gs_objects.m_colListBox = wxColour(*wxWHITE);

                 }
             }
                 }
             }

-            return *g_systemListBoxColour;
+            return gs_objects.m_colListBox;

 
         case wxSYS_COLOUR_MENUTEXT:
         case wxSYS_COLOUR_WINDOWTEXT:
         case wxSYS_COLOUR_CAPTIONTEXT:
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
         case wxSYS_COLOUR_BTNTEXT:
 
         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)
+            if (!gs_objects.m_colBtnText.Ok())

             {
             {

-                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->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 );
-                }
-                else
+                int red, green, blue;
+                if ( !GetColourFromGTKWidget(red, green, blue,
+                                             wxGTK_BUTTON,
+                                             GTK_STATE_NORMAL,
+                                             wxGTK_FG) )

                 {
                 {

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

                 }
                 }

-                gtk_widget_destroy( widget );
+
+                gs_objects.m_colBtnText = wxColour( red   >> SHIFT,
+                                                      green >> SHIFT,
+                                                      blue  >> SHIFT );

             }
             }

-            return *g_systemBtnTextColour;
+            return gs_objects.m_colBtnText;
+
+        case wxSYS_COLOUR_INFOBK:
+            if (!gs_objects.m_colTooltip.Ok()) {
+                GetTooltipColors();
+            }
+            return gs_objects.m_colTooltip;
+
+        case wxSYS_COLOUR_INFOTEXT:
+            if (!gs_objects.m_colTooltipText.Ok()) {
+                GetTooltipColors();
+            }
+            return gs_objects.m_colTooltipText;

 
         case wxSYS_COLOUR_HIGHLIGHTTEXT:
 
         case wxSYS_COLOUR_HIGHLIGHTTEXT:

-            if (!g_systemHighlightTextColour)
+            if (!gs_objects.m_colHighlightText.Ok())

             {
             {

-                wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
+                wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT);

                 if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
                 if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)

-                    g_systemHighlightTextColour = new wxColour(*wxBLACK);
+                    gs_objects.m_colHighlightText = wxColour(*wxBLACK);

                 else
                 else

-                    g_systemHighlightTextColour = new wxColour(*wxWHITE);
+                    gs_objects.m_colHighlightText = wxColour(*wxWHITE);

             }
             }

-            return *g_systemHighlightTextColour;
+            return gs_objects.m_colHighlightText;

 
 

-        case wxSYS_COLOUR_INFOBK:

         case wxSYS_COLOUR_APPWORKSPACE:
             return *wxWHITE;    // ?
         case wxSYS_COLOUR_APPWORKSPACE:
             return *wxWHITE;    // ?

-  }

 
 

-  return *wxWHITE;
+        case wxSYS_COLOUR_ACTIVECAPTION:
+        case wxSYS_COLOUR_MENUHILIGHT:
+            if (!gs_objects.m_colMenuItemHighlight.Ok())
+            {
+                int red, green, blue;
+                if ( !GetColourFromGTKWidget(red, green, blue,
+                                             wxGTK_MENUITEM,
+                                             GTK_STATE_SELECTED,
+                                             wxGTK_BG) )
+                {
+                    red =
+                    green =
+                    blue = 0;
+                }
+
+                gs_objects.m_colMenuItemHighlight = wxColour( red  >> SHIFT,
+                                                              green >> SHIFT,
+                                                              blue  >> SHIFT );
+            }
+            return gs_objects.m_colMenuItemHighlight;
+
+        case wxSYS_COLOUR_HOTLIGHT:
+        case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
+        case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
+            // TODO
+            return *wxBLACK;
+
+        case wxSYS_COLOUR_MAX:
+        default:
+            wxFAIL_MSG( _T("unknown system colour index") );
+    }
+
+    return *wxWHITE;

 }
 
 }
 

-wxFont wxSystemSettings::GetSystemFont( int index )
+wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )

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


@@ -294,42 +345,135 @@ wxFont wxSystemSettings::GetSystemFont( int index )
         case wxSYS_DEVICE_DEFAULT_FONT:
         case wxSYS_DEFAULT_GUI_FONT:
         {
         case wxSYS_DEVICE_DEFAULT_FONT:
         case wxSYS_DEFAULT_GUI_FONT:
         {

-            if (!g_systemFont)
+            if (!gs_objects.m_fontSystem.Ok())

             {
             {

+                gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+            }
+            return gs_objects.m_fontSystem;
+        }
+
+        default:
+            return wxNullFont;
+    }
+}
+
+int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
+{
+    switch (index)
+    {
+        case wxSYS_CURSOR_X:
+        case wxSYS_CURSOR_Y:
+            return 16;
+
+        // MBN: ditto for icons
+        case wxSYS_ICON_X:     return 32;
+        case wxSYS_ICON_Y:     return 32;
+
+        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;
+
+// a gtk1 implementation should be possible too if gtk2 efficiency/convenience functions aren't used

 #if 0
 #if 0

-                GdkFont *gdk_font = GtkGetDefaultGuiFont();
-                if (gdk_font)
+        case wxSYS_CAPTION_Y:
+            if (!window)
+                // No realized window specified, and no implementation for that case yet.
+                return -1;
+
+            // Check if wm supports frame extents - we can't know the caption height if it does not.
+#if GTK_CHECK_VERSION(2,2,0)
+            if (!gtk_check_version(2,2,0))
+            {
+                if (!gdk_x11_screen_supports_net_wm_hint(
+                        gdk_drawable_get_screen(window),
+                        gdk_atom_intern("_NET_FRAME_EXTENTS", false) ) )
+                    return -1;
+            }
+            else
+#endif
+            {
+                if (!gdk_net_wm_supports(gdk_atom_intern("_NET_FRAME_EXTENTS", false)))
+                    return -1;
+            }
+
+            wxASSERT_MSG( wxDynamicCast(win, wxTopLevelWindow),
+                          wxT("Asking for caption height of a non toplevel window") );
+
+            // Get the height of the top windowmanager border.
+            // This is the titlebar in most cases. The titlebar might be elsewhere, and
+            // we could check which is the thickest wm border to decide on which side the
+            // titlebar is, but this might lead to interesting behaviours in used code.
+            // Reconsider when we have a way to report to the user on which side it is.
+
+            Atom type;
+            gint format;
+            gulong nitems;
+
+#if GTK_CHECK_VERSION(2,2,0)
+            if (!gtk_check_version(2,2,0))
+            {
+                gulong bytes_after;
+                success = (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)),
+                                    GDK_WINDOW_XWINDOW(window),
+                                    gdk_x11_get_xatom_by_name_for_display (
+                                            gdk_drawable_get_display(window),
+                                            "_NET_FRAME_EXTENTS" ),
+                                    0, // left, right, top, bottom, CARDINAL[4]/32
+                                    G_MAXLONG, // size of long
+                                    false, // do not delete property
+                                    XA_CARDINAL, // 32 bit
+                                    &type, &format, &nitems, &bytes_after, &data
+                                   ) == Success);
+            }
+#endif
+            if (success)
+            {
+                int caption_height = -1;
+
+                if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 3) && (data))

                 {
                 {

-                    GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;
-                    char *name = (char*)font_list->data;
-                    wxString font_string( name );
-                    wxFontData font_data;
-                    g_systemFont = new wxFont( font_string, font_data );
+                    long *borders;
+                    borders = (long*)data;
+                    caption_height = borders[2]; // top frame extent

                 }
                 }

-                gtk_widget_destroy( widget );
-#endif

 
 

-                g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+                if (data)
+                    XFree(data);

 
 

+                return caption_height;

             }
             }

-            return *g_systemFont;
-        }
-    }

 
 

-    return wxNullFont;
+            // Try a default approach without a window pointer, if possible
+            // ...
+
+            return -1;
+#endif // gtk2
+
+        case wxSYS_PENWINDOWS_PRESENT:
+            // No MS Windows for Pen computing extension available in X11 based gtk+.
+            return 0;
+
+        default:
+            return -1;   // metric is unknown
+    }

 }
 
 }
 

-int wxSystemSettings::GetSystemMetric( int index )
+bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)

 {
     switch (index)
     {
 {
     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;
-    }
+        case wxSYS_CAN_ICONIZE_FRAME:
+            return false;

 
 

-    wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented") );
+        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+            return true;

 
 

-    return 0;
+        default:
+            return false;
+    }

 }
 }