#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_colHighlight,
m_colHighlightText,
m_colListBox,
+ m_colWindow,
+ m_colWindowText,
m_colBtnText,
m_colMenuItemHighlight,
m_colTooltip,
- m_colTooltipText;
+ m_colTooltipText,
+ m_colMenubarBg;
wxFont m_fontSystem;
};
static wxSystemObjects gs_objects;
+void wxClearGtkSystemObjects()
+{
+ 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;
+}
+
// ----------------------------------------------------------------------------
// wxSystemSettings implementation
// ----------------------------------------------------------------------------
{
wxGTK_BUTTON,
wxGTK_LIST,
- wxGTK_MENUITEM
+ wxGTK_MENUITEM,
+ wxGTK_TEXTCTRL,
+ wxGTK_MENUBAR,
};
// the colour we need
widget = gtk_button_new();
break;
+ case wxGTK_TEXTCTRL:
+ widget = gtk_text_view_new();
+ break;
+
case wxGTK_LIST:
widget = gtk_tree_view_new_with_model(
(GtkTreeModel*)gtk_list_store_new(1, G_TYPE_INT));
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 );
}
}
- gtk_widget_destroy( widget );
+ gtk_object_sink((GtkObject*)widget);
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];
+ 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 = tooltips->tip_window->style->fg[GTK_STATE_NORMAL];
+ c = widget->style->fg[GTK_STATE_NORMAL];
gs_objects.m_colTooltipText = wxColor(c);
-#if GTK_CHECK_VERSION(2, 9, 0)
- if (gtk_check_version(2, 9, 0) == NULL)
- g_object_ref_sink(tooltips);
- else
-#endif
- {
- gtk_object_sink((GtkObject*)tooltips);
- }
+
+ gtk_widget_destroy(widget);
}
wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
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())
{
break;
case wxSYS_COLOUR_WINDOW:
- color = *wxWHITE;
+ 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;
+ 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:
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 = *wxBLACK;
- else
- gs_objects.m_colHighlightText = *wxWHITE;
+ 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;
break;
gs_objects.m_fontSystem = wxFont(wxString::FromAscii(font_name));
g_free (font_name);
}
- gtk_widget_destroy( widget );
+ gtk_object_sink((GtkObject*)widget);
}
font = gs_objects.m_fontSystem;
break;
return font;
}
-static bool wxXGetWindowProperty(GdkWindow* window, Atom& type, int& format, gulong& nitems, guchar*& data)
+// 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;
-#if GTK_CHECK_VERSION(2, 2, 0)
- if (gtk_check_version(2, 2, 0) == NULL)
- {
- 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
- 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 )
{
- guchar *data = NULL;
- Atom type;
- int format;
- gulong nitems;
GdkWindow *window = NULL;
if(win && GTK_WIDGET_REALIZED(win->GetHandle()))
window = win->GetHandle()->window;
return -1; // not a tlw, not sure how to approach
else
{
- // 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.
- if (wxXGetWindowProperty(window, type, format, nitems, data))
+ int right, bottom;
+ if (wxGetFrameExtents(window, NULL, &right, NULL, &bottom))
{
- int border_return = -1;
-
- if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 4) && (data))
+ switch (index)
{
- switch(index)
- {
- case wxSYS_BORDER_X:
- case wxSYS_EDGE_X:
- case wxSYS_FRAMESIZE_X:
- border_return = int(data[1]); // width of right extent
- break;
- default:
- border_return = int(data[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;
+ // 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.
- if (wxXGetWindowProperty(window, type, format, nitems, data))
{
- int caption_height = -1;
-
- if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 3) && (data))
+ int top;
+ if (wxGetFrameExtents(window, NULL, NULL, &top, NULL))
{
- caption_height = int(data[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