wxSplitterWindow mouse capture improvements and cleanup.

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

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index fded8203fda805705f4134aa4a0c06156e4cdb1f..00222f1de680027ac5c1e8713aaa5101da173ad5 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -1,64 +1,55 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#ifdef __GNUG__
-#pragma implementation "settings.h"
+#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/cmndata.h"
+    #include "wx/toplevel.h"

 #endif
 
 #endif
 

-#include "wx/settings.h"
-#include "wx/debug.h"
-#include "wx/module.h"
-#include "wx/cmndata.h"

 #include "wx/fontutil.h"
 
 #include <gdk/gdk.h>
 #include "wx/fontutil.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>
 

-#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;
+#include <X11/Xatom.h>

 
 

-wxFont *g_systemFont = (wxFont *) NULL;
+#define SHIFT (8*(sizeof(short int)-sizeof(char)))

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

-// wxSystemSettingsModule
+// wxSystemObjects

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

-class wxSystemSettingsModule : public wxModule
+struct wxSystemObjects

 {
 {

-public:
-    bool OnInit() { return TRUE; }
-    void OnExit()
-    {
-        //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;
-    }
-    DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule)
+    wxColour m_colBtnFace,
+             m_colBtnShadow,
+             m_colBtnHighlight,
+             m_colHighlight,
+             m_colHighlightText,
+             m_colListBox,
+             m_colBtnText,
+             m_colMenuItemHighlight,
+             m_colTooltip,
+             m_colTooltipText;
+
+    wxFont m_fontSystem;

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
+static wxSystemObjects gs_objects;

 
 // ----------------------------------------------------------------------------
 // wxSystemSettings implementation
 
 // ----------------------------------------------------------------------------
 // wxSystemSettings implementation


@@ -68,7 +59,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
 enum wxGtkWidgetType
 {
     wxGTK_BUTTON,
 enum wxGtkWidgetType
 {
     wxGTK_BUTTON,

-    wxGTK_LIST
+    wxGTK_LIST,
+    wxGTK_MENUITEM

 };
 
 // the colour we need
 };
 
 // the colour we need


@@ -90,7 +82,7 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
     switch ( type )
     {
         default:
     switch ( type )
     {
         default:

-            wxFAIL_MSG( _T("unexpected GTK widget type") );
+            wxFAIL_MSG( wxT("unexpected GTK widget type") );

             // fall through
 
         case wxGTK_BUTTON:
             // fall through
 
         case wxGTK_BUTTON:


@@ -99,6 +91,10 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
 
         case wxGTK_LIST:
             widget = gtk_list_new();
 
         case wxGTK_LIST:
             widget = gtk_list_new();

+            break;
+
+        case wxGTK_MENUITEM:
+            widget = gtk_menu_item_new();

     }
 
     GtkStyle *def = gtk_rc_get_style( widget );
     }
 
     GtkStyle *def = gtk_rc_get_style( widget );


@@ -112,7 +108,7 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
         switch ( colour )
         {
             default:
         switch ( colour )
         {
             default:

-                wxFAIL_MSG( _T("unexpected GTK colour type") );
+                wxFAIL_MSG( wxT("unexpected GTK colour type") );

                 // fall through
 
             case wxGTK_FG:
                 // fall through
 
             case wxGTK_FG:


@@ -132,11 +128,11 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
         green = col[state].green;
         blue = col[state].blue;
 
         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 );


@@ -144,13 +140,24 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
     return ok;
 }
 
     return ok;
 }
 

+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(reinterpret_cast<GtkObject*>(tooltips));
+}
+

 wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 {
     switch (index)
     {
         case wxSYS_COLOUR_SCROLLBAR:
         case wxSYS_COLOUR_BACKGROUND:
 wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 {
     switch (index)
     {
         case wxSYS_COLOUR_SCROLLBAR:
         case wxSYS_COLOUR_BACKGROUND:

-        case wxSYS_COLOUR_ACTIVECAPTION:

         case wxSYS_COLOUR_INACTIVECAPTION:
         case wxSYS_COLOUR_MENU:
         case wxSYS_COLOUR_WINDOWFRAME:
         case wxSYS_COLOUR_INACTIVECAPTION:
         case wxSYS_COLOUR_MENU:
         case wxSYS_COLOUR_WINDOWFRAME:


@@ -159,7 +166,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_MENUBAR:
         case wxSYS_COLOUR_3DLIGHT:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_MENUBAR:
         case wxSYS_COLOUR_3DLIGHT:

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

             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue) )
             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue) )


@@ -169,11 +176,11 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
                     blue = 0x9c40;
                 }
 
                     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;


@@ -184,35 +191,23 @@ 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 (!g_systemBtnShadowColour)
+            if (!gs_objects.m_colBtnShadow.Ok())

             {
                 wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));
             {
                 wxColour faceColour(GetColour(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));
+                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;
                 if ( !GetColourFromGTKWidget(red, green, blue,
             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue,


@@ -224,14 +219,14 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
                     blue = 0x9c40;
                 }
 
                     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;
                 if ( GetColourFromGTKWidget(red, green, blue,
             {
                 int red, green, blue;
                 if ( GetColourFromGTKWidget(red, green, blue,


@@ -239,24 +234,24 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
                                             GTK_STATE_NORMAL,
                                             wxGTK_BASE) )
                 {
                                             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)
+        case wxSYS_COLOUR_LISTBOXTEXT:
+            if (!gs_objects.m_colBtnText.Ok())

             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue,
             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue,


@@ -269,45 +264,71 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
                     blue = 0;
                 }
 
                     blue = 0;
                 }
 

-                g_systemBtnTextColour = new wxColour( red   >> SHIFT,
+                gs_objects.m_colBtnText = wxColour( red   >> SHIFT,

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

-            return *g_systemBtnTextColour;
+            return gs_objects.m_colBtnText;

 
 

-            // this (as well as wxSYS_COLOUR_INFOTEXT above) is used for
-            // tooltip windows - Robert, please change this code to use the
-            // real GTK tooltips when/if you can (TODO)

         case wxSYS_COLOUR_INFOBK:
         case wxSYS_COLOUR_INFOBK:

-            return wxColour(255, 255, 225);
+            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 = GetColour(wxSYS_COLOUR_HIGHLIGHT);
                 if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
             {
                 wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT);
                 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_APPWORKSPACE:
             return *wxWHITE;    // ?
 
 
         case wxSYS_COLOUR_APPWORKSPACE:
             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:
         case wxSYS_COLOUR_HOTLIGHT:
         case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
         case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:

-        case wxSYS_COLOUR_MENUHILIGHT:

             // TODO
             return *wxBLACK;
 
         case wxSYS_COLOUR_MAX:
         default:
             // TODO
             return *wxBLACK;
 
         case wxSYS_COLOUR_MAX:
         default:

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

 
 

-  return *wxWHITE;
+    return *wxWHITE;

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


@@ -325,31 +346,11 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont 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())

             {
             {

-#ifdef __WXGTK20__
-                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 = def->font_desc;  
-                    g_systemFont = new wxFont(info);  
-                }  
-                else  
-                {  
-                    const gchar *font_name =
-                        _gtk_rc_context_get_default_font_name(gtk_settings_get_default());
-                    g_systemFont = new wxFont(wxString::FromAscii(font_name));
-                }  
-                gtk_widget_destroy( widget );
-#else
-                g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-#endif
+                gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );

             }
             }

-            return *g_systemFont;
+            return gs_objects.m_fontSystem;

         }
 
         default:
         }
 
         default:


@@ -357,24 +358,110 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
     }
 }
 
     }
 }
 

-int wxSystemSettingsNative::GetMetric( wxSystemMetric index )
+int
+wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))

 {
     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_CURSOR_X:
+        case wxSYS_CURSOR_Y:
+            return 16;

 
 

-        // VZ: is there any way to get the cursor size with GDK?
-        case wxSYS_CURSOR_X:   return 16;
-        case wxSYS_CURSOR_Y:   return 16;

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

-        default:               
-            wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") );
+
+        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
+        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))
+                {
+                    long *borders;
+                    borders = (long*)data;
+                    caption_height = borders[2]; // top frame extent
+                }
+
+                if (data)
+                    XFree(data);
+
+                return caption_height;
+            }
+
+            // 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;
             return 0;

+
+        default:
+            return -1;   // metric is unknown

     }
 }
 
     }
 }
 


@@ -382,13 +469,13 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
 {
     switch (index)
     {
 {
     switch (index)
     {

-        case wxSYS_CAN_ICONIZE_FRAME: 
-            return FALSE; 
-            break;
+        case wxSYS_CAN_ICONIZE_FRAME:
+            return false;
+

         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return TRUE; 
-            break;
+            return true;
+

         default:
         default:

-            return FALSE;
+            return false;

     }
 }
     }
 }