#include "wx/settings.h"
#ifndef WX_PRECOMP
- #include "wx/cmndata.h"
+ #include "wx/toplevel.h"
#endif
#include "wx/fontutil.h"
-#include "wx/toplevel.h"
+#include "wx/fontenum.h"
-// Using gtk_list_new, which is deprecated since GTK2
-// Using gtk_object_sink, which is deprecated since GTK+-2.9.0
-#ifdef GTK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-#endif
-
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
#include <gtk/gtk.h>
+#include "wx/gtk/private/win_gtk.h"
+#include "wx/gtk/private/gtk2-compat.h"
-#include <X11/Xatom.h>
-
-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
-
-// ----------------------------------------------------------------------------
-// wxSystemObjects
-// ----------------------------------------------------------------------------
-
-struct wxSystemObjects
-{
- 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;
+bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom);
// ----------------------------------------------------------------------------
// wxSystemSettings implementation
// ----------------------------------------------------------------------------
-// kind of widget to use in GetColourFromGTKWidget
-enum wxGtkWidgetType
-{
- wxGTK_BUTTON,
- wxGTK_LIST,
- wxGTK_MENUITEM
-};
+static wxFont gs_fontSystem;
-// the colour we need
-enum wxGtkColourType
+static GtkContainer* ContainerWidget()
{
- wxGTK_FG,
- wxGTK_BG,
- wxGTK_BASE
-};
-
-// wxSystemSettings::GetColour() helper: get the colours from a GTK+
-// widget style, return true if we did get them, false to use defaults
-static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
- wxGtkWidgetType type = wxGTK_BUTTON,
- GtkStateType state = GTK_STATE_NORMAL,
- wxGtkColourType colour = wxGTK_BG)
-{
- GtkWidget *widget;
- switch ( type )
+ static GtkContainer* s_widget;
+ if (s_widget == NULL)
{
- 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();
+ 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;
+}
- GtkStyle *def = gtk_rc_get_style( widget );
- if ( !def )
- def = gtk_widget_get_default_style();
+extern "C" {
+static void style_set(GtkWidget*, GtkStyle*, void*)
+{
+ gs_fontSystem = wxNullFont;
+}
+}
- bool ok;
- if ( def )
+static const GtkStyle* ButtonStyle()
+{
+ static GtkWidget* s_widget;
+ if (s_widget == NULL)
{
- 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;
+ s_widget = gtk_button_new();
+ gtk_container_add(ContainerWidget(), s_widget);
+ gtk_widget_ensure_style(s_widget);
+ g_signal_connect(s_widget, "style_set", G_CALLBACK(style_set), NULL);
+ }
+ return gtk_widget_get_style(s_widget);
+}
- ok = true;
+static const GtkStyle* ListStyle()
+{
+ 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);
+ gtk_widget_ensure_style(s_widget);
}
- else
+ return gtk_widget_get_style(s_widget);
+}
+
+static const GtkStyle* TextCtrlStyle()
+{
+ static GtkWidget* s_widget;
+ if (s_widget == NULL)
{
- ok = false;
+ s_widget = gtk_text_view_new();
+ gtk_container_add(ContainerWidget(), s_widget);
+ gtk_widget_ensure_style(s_widget);
}
+ return gtk_widget_get_style(s_widget);
+}
- gtk_widget_destroy( widget );
+static const GtkStyle* MenuItemStyle()
+{
+ static GtkWidget* s_widget;
+ if (s_widget == NULL)
+ {
+ s_widget = gtk_menu_item_new();
+ gtk_container_add(ContainerWidget(), s_widget);
+ gtk_widget_ensure_style(s_widget);
+ }
+ return gtk_widget_get_style(s_widget);
+}
- return ok;
+static const GtkStyle* MenuBarStyle()
+{
+ static GtkWidget* s_widget;
+ if (s_widget == NULL)
+ {
+ s_widget = gtk_menu_bar_new();
+ gtk_container_add(ContainerWidget(), s_widget);
+ gtk_widget_ensure_style(s_widget);
+ }
+ return gtk_widget_get_style(s_widget);
}
-static void GetTooltipColors()
+static const GtkStyle* ToolTipStyle()
{
- 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));
+ static GtkWidget* s_widget;
+ if (s_widget == NULL)
+ {
+ s_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(s_widget, name);
+ gtk_widget_ensure_style(s_widget);
+ }
+ return gtk_widget_get_style(s_widget);
}
wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
{
+ wxColor color;
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_MENUBAR:
+ //case wxSYS_COLOUR_3DFACE:
case wxSYS_COLOUR_3DLIGHT:
- if (!gs_objects.m_colBtnFace.Ok())
- {
- int red, green, blue;
- if ( !GetColourFromGTKWidget(red, green, blue) )
- {
- red =
- green = 0;
- blue = 0x9c40;
- }
-
- gs_objects.m_colBtnFace = wxColour( red >> SHIFT,
- green >> SHIFT,
- blue >> SHIFT );
- }
- return gs_objects.m_colBtnFace;
+ color = wxColor(ButtonStyle()->bg[GTK_STATE_NORMAL]);
+ break;
case wxSYS_COLOUR_WINDOW:
- return *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:
- return *wxBLACK;
+ color = *wxBLACK;
+ break;
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 =
- wxColour((unsigned char) (faceColour.Red() * 0.666),
- (unsigned char) (faceColour.Green() * 0.666),
- (unsigned char) (faceColour.Blue() * 0.666));
+ color =
+ wxColour((unsigned char) (faceColour.Red() * 2 / 3),
+ (unsigned char) (faceColour.Green() * 2 / 3),
+ (unsigned char) (faceColour.Blue() * 2 / 3));
}
+ break;
- return gs_objects.m_colBtnShadow;
-
- case wxSYS_COLOUR_3DHIGHLIGHT:
- //case wxSYS_COLOUR_BTNHIGHLIGHT:
- return * wxWHITE;
+ 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())
- {
- int red, green, blue;
- if ( !GetColourFromGTKWidget(red, green, blue,
- wxGTK_BUTTON,
- GTK_STATE_SELECTED) )
- {
- red =
- green = 0;
- blue = 0x9c40;
- }
-
- gs_objects.m_colHighlight = wxColour( red >> SHIFT,
- green >> SHIFT,
- blue >> SHIFT );
- }
- return gs_objects.m_colHighlight;
+ color = wxColor(ButtonStyle()->bg[GTK_STATE_SELECTED]);
+ break;
case wxSYS_COLOUR_LISTBOX:
- if (!gs_objects.m_colListBox.Ok())
- {
- int red, green, blue;
- if ( GetColourFromGTKWidget(red, green, blue,
- wxGTK_LIST,
- GTK_STATE_NORMAL,
- wxGTK_BASE) )
- {
- gs_objects.m_colListBox = wxColour( red >> SHIFT,
- green >> SHIFT,
- blue >> SHIFT );
- }
- else
- {
- gs_objects.m_colListBox = wxColour(*wxWHITE);
- }
- }
- return 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:
case wxSYS_COLOUR_WINDOWTEXT:
case wxSYS_COLOUR_CAPTIONTEXT:
case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
case wxSYS_COLOUR_BTNTEXT:
- if (!gs_objects.m_colBtnText.Ok())
- {
- int red, green, blue;
- if ( !GetColourFromGTKWidget(red, green, blue,
- wxGTK_BUTTON,
- GTK_STATE_NORMAL,
- wxGTK_FG) )
- {
- red =
- green =
- blue = 0;
- }
-
- gs_objects.m_colBtnText = wxColour( red >> SHIFT,
- green >> SHIFT,
- blue >> SHIFT );
- }
- return gs_objects.m_colBtnText;
+ color = wxColor(ButtonStyle()->fg[GTK_STATE_NORMAL]);
+ break;
case wxSYS_COLOUR_INFOBK:
- if (!gs_objects.m_colTooltip.Ok()) {
- GetTooltipColors();
- }
- return gs_objects.m_colTooltip;
+ color = wxColor(ToolTipStyle()->bg[GTK_STATE_NORMAL]);
+ break;
case wxSYS_COLOUR_INFOTEXT:
- if (!gs_objects.m_colTooltipText.Ok()) {
- GetTooltipColors();
- }
- return gs_objects.m_colTooltipText;
+ color = wxColor(ToolTipStyle()->fg[GTK_STATE_NORMAL]);
+ 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 = wxColour(*wxBLACK);
- else
- gs_objects.m_colHighlightText = wxColour(*wxWHITE);
- }
- return gs_objects.m_colHighlightText;
+ color = wxColor(ButtonStyle()->fg[GTK_STATE_SELECTED]);
+ break;
case wxSYS_COLOUR_APPWORKSPACE:
- return *wxWHITE; // ?
+ color = *wxWHITE; // ?
+ break;
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;
+ color = wxColor(MenuItemStyle()->bg[GTK_STATE_SELECTED]);
+ break;
case wxSYS_COLOUR_HOTLIGHT:
case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
// TODO
- return *wxBLACK;
+ color = *wxBLACK;
+ break;
case wxSYS_COLOUR_MAX:
default:
- wxFAIL_MSG( _T("unknown system colour index") );
+ wxFAIL_MSG( wxT("unknown system colour index") );
+ color = *wxWHITE;
+ break;
}
- return *wxWHITE;
+ wxASSERT(color.IsOk());
+ return color;
}
wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
{
+ wxFont font;
switch (index)
{
case wxSYS_OEM_FIXED_FONT:
case wxSYS_ANSI_FIXED_FONT:
case wxSYS_SYSTEM_FIXED_FONT:
- {
- return *wxNORMAL_FONT;
- }
+ font = *wxNORMAL_FONT;
+ break;
+
case wxSYS_ANSI_VAR_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_widget_destroy( widget );
+ wxNativeFontInfo info;
+ info.description = ButtonStyle()->font_desc;
+ 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;
}
- return gs_objects.m_fontSystem;
- }
+ font = gs_fontSystem;
+ break;
default:
- return wxNullFont;
+ break;
}
+
+ wxASSERT( font.IsOk() );
+
+ return font;
}
-int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
+// 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;
+ return window ? gtk_settings_get_for_screen(gdk_drawable_get_screen(window))
+ : gtk_settings_get_default();
+}
- guchar *data = NULL;
+static int GetBorderWidth(wxSystemMetric index, wxWindow* win)
+{
+ if (win->m_wxwindow)
+ {
+ wxPizza* pizza = WX_PIZZA(win->m_wxwindow);
+ int x, y;
+ pizza->get_border_widths(x, y);
+ switch (index)
+ {
+ case wxSYS_BORDER_X:
+ case wxSYS_EDGE_X:
+ case wxSYS_FRAMESIZE_X:
+ return x;
+ default:
+ return y;
+ }
+ }
+ 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)
{
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)
{
- // Check if wm supports frame extents - we can't know
- // the border widths 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;
- }
-
// 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.
-
- Atom type;
- gint format;
- gulong nitems;
-
-#if GTK_CHECK_VERSION(2,2,0)
- if (!gtk_check_version(2,2,0))
+ int right, bottom;
+ if (wxGetFrameExtents(window, NULL, &right, NULL, &bottom))
{
- 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 border_return = -1;
-
- if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 4) && (data))
+ switch (index)
{
- long *borders;
- borders = (long*)data;
- switch(index)
- {
- case wxSYS_BORDER_X:
- case wxSYS_EDGE_X:
- case wxSYS_FRAMESIZE_X:
- border_return = borders[1]; // width of right extent
- break;
- default:
- border_return = borders[3]; // height of bottom extent
- break;
- }
+ case wxSYS_BORDER_X:
+ case wxSYS_EDGE_X:
+ case wxSYS_FRAMESIZE_X:
+ return right; // width of right extent
+ default:
+ return bottom; // height of bottom extent
}
-
- if (data)
- XFree(data);
-
- return border_return;
}
}
}
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_drawable_get_display(window)
+ : gdk_display_get_default());
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;
+ g_object_get(GetSettingsForWindowScreen(window),
+ "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
+ // are much bigger under GNOME than under Windows and
+ // just seem to much in many cases to be useful.
+ // drag_threshold *= 2;
- return drag_threshold * 2;
+ 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:
-#if GTK_CHECK_VERSION(2,2,0)
- if (window && !gtk_check_version(2,2,0))
+ if (window)
return gdk_screen_get_width(gdk_drawable_get_screen(window));
else
-#endif
return gdk_screen_width();
case wxSYS_SCREEN_Y:
-#if GTK_CHECK_VERSION(2,2,0)
- if (window && !gtk_check_version(2,2,0))
+ if (window)
return gdk_screen_get_height(gdk_drawable_get_screen(window));
else
-#endif
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)
// 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") );
// 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))
+ int top;
+ if (wxGetFrameExtents(window, NULL, NULL, &top, NULL))
{
- long *borders;
- borders = (long*)data;
- caption_height = borders[2]; // top frame extent
+ return top; // top frame extent
}
-
- if (data)
- XFree(data);
-
- return caption_height;
}
// Try a default approach without a window pointer, if possible
projects / wxWidgets.git / blobdiff