X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/241c8d223ee3c2c2ffbc3a8ae5f6309167fbe1de..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/gtk/settings.cpp?ds=sidebyside diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index c7f240d747..d555cd086f 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -14,219 +14,306 @@ #include "wx/settings.h" #ifndef WX_PRECOMP - #include "wx/cmndata.h" #include "wx/toplevel.h" #endif #include "wx/fontutil.h" +#include "wx/fontenum.h" -#include -#if GTK_CHECK_VERSION(2, 9, 0) - // gtk_object_sink - #undef GTK_DISABLE_DEPRECATED -#endif #include +#include "wx/gtk/private/win_gtk.h" +#include "wx/gtk/private/gtk2-compat.h" bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom); // ---------------------------------------------------------------------------- -// wxSystemObjects +// wxSystemSettings implementation // ---------------------------------------------------------------------------- -struct wxSystemObjects -{ - wxColour m_colBtnFace, - m_colBtnShadow, - m_colBtnHighlight, - m_colHighlight, - m_colHighlightText, - m_colListBox, - m_colWindow, - m_colWindowText, - m_colBtnText, - m_colMenuItemHighlight, - m_colTooltip, - m_colTooltipText, - m_colMenubarBg; - - wxFont m_fontSystem; -}; - -static wxSystemObjects gs_objects; - -void wxClearGtkSystemObjects() +static wxFont gs_fontSystem; + +static GtkContainer* ContainerWidget() { - gs_objects.m_colBtnFace = wxColour(); - gs_objects.m_colBtnShadow = wxColour(); - gs_objects.m_colBtnHighlight = wxColour(); - gs_objects.m_colHighlightText = wxColour(); - gs_objects.m_colListBox = wxColour(); - gs_objects.m_colWindow = wxColour(); - gs_objects.m_colWindowText = wxColour(); - gs_objects.m_colBtnText = wxColour(); - gs_objects.m_colMenuItemHighlight = wxColour(); - gs_objects.m_colTooltip = wxColour(); - gs_objects.m_colTooltipText = wxColour(); - gs_objects.m_colMenubarBg = wxColour(); - gs_objects.m_fontSystem = wxNullFont; + 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 -// ---------------------------------------------------------------------------- - -// kind of widget to use in GetColourFromGTKWidget -enum wxGtkWidgetType -{ - wxGTK_BUTTON, - wxGTK_LIST, - wxGTK_MENUITEM, - wxGTK_TEXTCTRL, - wxGTK_MENUBAR, -}; - -// the colour we need -enum wxGtkColourType +extern "C" { +#ifdef __WXGTK3__ +static void style_updated(GtkWidget*, void*) +#else +static void style_set(GtkWidget*, GtkStyle*, void*) +#endif { - 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) + gs_fontSystem = wxNullFont; +} +} + +static GtkWidget* ButtonWidget() { - 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_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; +} - case wxGTK_BUTTON: - widget = gtk_button_new(); - break; +static GtkWidget* ListWidget() +{ + 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; +} - case wxGTK_TEXTCTRL: - widget = gtk_text_view_new(); - break; +static GtkWidget* TextCtrlWidget() +{ + static GtkWidget* s_widget; + if (s_widget == NULL) + { + 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_LIST: - widget = gtk_tree_view_new_with_model( - (GtkTreeModel*)gtk_list_store_new(1, G_TYPE_INT)); - 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_MENUITEM: - widget = gtk_menu_item_new(); - 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_MENUBAR: - widget = gtk_menu_bar_new(); - break; +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()); +} + +static const GtkStyle* ListStyle() +{ + return gtk_widget_get_style(ListWidget()); +} + +static const GtkStyle* TextCtrlStyle() +{ + return gtk_widget_get_style(TextCtrlWidget()); +} - gtk_object_sink((GtkObject*)widget); +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; - GdkColor gdkColor; 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_3DFACE: 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: - if (!gs_objects.m_colWindow.Ok()) - { - gdkColor.red = - gdkColor.green = - gdkColor.blue = 0xFFFF; - GetColourFromGTKWidget(gdkColor, wxGTK_TEXTCTRL, GTK_STATE_NORMAL, wxGTK_BASE); - gs_objects.m_colWindow = wxColor(gdkColor); - } - color = gs_objects.m_colWindow; + color = wxColor(TextCtrlStyle()->base[GTK_STATE_NORMAL]); break; - case wxSYS_COLOUR_MENUBAR: - if (!gs_objects.m_colMenubarBg.Ok()) - { - gdkColor.red = - gdkColor.green = 0; - gdkColor.blue = 0x9c40; - GetColourFromGTKWidget(gdkColor,wxGTK_MENUBAR); - gs_objects.m_colMenubarBg = wxColor(gdkColor); - } - color = gs_objects.m_colMenubarBg; + color = wxColor(MenuBarStyle()->bg[GTK_STATE_NORMAL]); break; case wxSYS_COLOUR_3DDKSHADOW: @@ -236,51 +323,38 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_BTNSHADOW: //case wxSYS_COLOUR_3DSHADOW: - if (!gs_objects.m_colBtnShadow.Ok()) { 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)); } - color = gs_objects.m_colBtnShadow; 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: - 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: - 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: @@ -288,43 +362,19 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) 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: - if (!gs_objects.m_colTooltip.Ok()) { - GetTooltipColors(); - } - color = gs_objects.m_colTooltip; + color = wxColor(ToolTipStyle()->bg[GTK_STATE_NORMAL]); 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: - if (!gs_objects.m_colHighlightText.Ok()) - { - gdkColor.red = - gdkColor.green = - gdkColor.blue = 0; - GetColourFromGTKWidget( - gdkColor, wxGTK_BUTTON, GTK_STATE_SELECTED, wxGTK_FG); - gs_objects.m_colHighlightText = wxColour(gdkColor); - } - color = gs_objects.m_colHighlightText; + color = wxColor(ButtonStyle()->fg[GTK_STATE_SELECTED]); break; case wxSYS_COLOUR_APPWORKSPACE: @@ -333,16 +383,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) 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: @@ -354,13 +395,15 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_MAX: default: - wxFAIL_MSG( _T("unknown system colour index") ); + wxFAIL_MSG( wxT("unknown system colour index") ); color = *wxWHITE; break; } + wxASSERT(color.IsOk()); return color; } +#endif wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) { @@ -377,41 +420,37 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) 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( + 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; } + + wxASSERT( font.IsOk() ); + return font; } @@ -419,15 +458,35 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) // on or for the default screen if window is NULL static GtkSettings *GetSettingsForWindowScreen(GdkWindow *window) { - return window ? gtk_settings_get_for_screen(gdk_drawable_get_screen(window)) + 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) + { + wxPizza* pizza = WX_PIZZA(win->m_wxwindow); + GtkBorder border; + pizza->get_border(border); + switch (index) + { + case wxSYS_BORDER_X: + case wxSYS_EDGE_X: + case wxSYS_FRAMESIZE_X: + return border.left; + default: + return border.top; + } + } + return -1; +} + 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) { @@ -437,14 +496,12 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) 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) - 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 @@ -470,7 +527,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) case wxSYS_CURSOR_X: case wxSYS_CURSOR_Y: return gdk_display_get_default_cursor_size( - window ? gdk_drawable_get_display(window) + window ? gdk_window_get_display(window) : gdk_display_get_default()); case wxSYS_DCLICK_X: @@ -507,13 +564,13 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) case wxSYS_SCREEN_X: if (window) - return gdk_screen_get_width(gdk_drawable_get_screen(window)); + return gdk_screen_get_width(gdk_window_get_screen(window)); else return gdk_screen_width(); case wxSYS_SCREEN_Y: if (window) - return gdk_screen_get_height(gdk_drawable_get_screen(window)); + return gdk_screen_get_height(gdk_window_get_screen(window)); else return gdk_screen_height();