#undef GTK_DISABLE_DEPRECATED
#endif
#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <X11/Xatom.h>
+bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom);
// ----------------------------------------------------------------------------
// wxSystemObjects
m_colBtnText,
m_colMenuItemHighlight,
m_colTooltip,
- m_colTooltipText;
+ m_colTooltipText,
+ m_colMenubarBg;
wxFont m_fontSystem;
};
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;
}
wxGTK_BUTTON,
wxGTK_LIST,
wxGTK_MENUITEM,
- wxGTK_TEXTCTRL
+ wxGTK_TEXTCTRL,
+ wxGTK_MENUBAR,
};
// the colour we need
case wxGTK_MENUITEM:
widget = gtk_menu_item_new();
+ break;
+
+ case wxGTK_MENUBAR:
+ widget = gtk_menu_bar_new();
+ break;
}
GtkStyle *def = gtk_rc_get_style( widget );
case wxSYS_COLOUR_ACTIVEBORDER:
case wxSYS_COLOUR_INACTIVEBORDER:
case wxSYS_COLOUR_BTNFACE:
- case wxSYS_COLOUR_MENUBAR:
case wxSYS_COLOUR_3DLIGHT:
if (!gs_objects.m_colBtnFace.Ok())
{
color = gs_objects.m_colWindow;
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;
+ break;
+
case wxSYS_COLOUR_3DDKSHADOW:
color = *wxBLACK;
break;
return font;
}
-static bool GetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)
+// helper: return the GtkSettings either for the screen the current window is
+// on or for the default screen if window is NULL
+static GtkSettings *GetSettingsForWindowScreen(GdkWindow *window)
{
- bool success = false;
- Atom property = 0;
-#if GTK_CHECK_VERSION(2, 2, 0)
- if (gtk_check_version(2, 2, 0) == NULL)
- {
- if (gdk_x11_screen_supports_net_wm_hint(
- gdk_drawable_get_screen(window),
- gdk_atom_intern("_NET_FRAME_EXTENTS", false)))
- {
- success = true;
- property = gdk_x11_get_xatom_by_name_for_display(
- gdk_drawable_get_display(window),
- "_NET_FRAME_EXTENTS");
- }
- }
- else
-#endif
- {
- if (gdk_net_wm_supports(gdk_atom_intern("_NET_FRAME_EXTENTS", false)))
- {
- success = true;
- property = gdk_x11_get_xatom_by_name("_NET_FRAME_EXTENTS");
- }
- }
- if (success)
- {
- Atom type;
- int format;
- gulong nitems, bytes_after;
- long* data = NULL;
- success = XGetWindowProperty(
- gdk_x11_drawable_get_xdisplay(window),
- gdk_x11_drawable_get_xid(window),
- property,
- 0, 4,
- false,
- XA_CARDINAL,
- &type, &format, &nitems, &bytes_after, (guchar**)&data
- ) == Success;
- if (success)
- {
- success = data && nitems == 4;
- if (success)
- {
- if (left) *left = int(data[0]);
- if (right) *right = int(data[1]);
- if (top) *top = int(data[2]);
- if (bottom) *bottom = int(data[3]);
- }
- if (data)
- XFree(data);
- }
- }
- return success;
+ return window ? gtk_settings_get_for_screen(gdk_drawable_get_screen(window))
+ : gtk_settings_get_default();
}
int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
// In most cases the top extent is the titlebar, so we use the bottom extent
// for the heights.
int right, bottom;
- if (GetFrameExtents(window, NULL, &right, NULL, &bottom))
+ if (wxGetFrameExtents(window, NULL, &right, NULL, &bottom))
{
switch (index)
{
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(gtk_settings_get_default(),
+ g_object_get(GetSettingsForWindowScreen(window),
"gtk-double-click-time", &dclick, NULL);
return dclick;
case wxSYS_DRAG_X:
case wxSYS_DRAG_Y:
gint drag_threshold;
-#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
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)
// Reconsider when we have a way to report to the user on which side it is.
{
int top;
- if (GetFrameExtents(window, NULL, NULL, &top, NULL))
+ if (wxGetFrameExtents(window, NULL, NULL, &top, NULL))
{
return top; // top frame extent
}
projects / wxWidgets.git / blobdiff