X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5595181f48d45d2c277c7d40a4d24bea42d6847b..5e5a020c0d20c58630ad7d7683301f9d3c314728:/src/gtk/settings.cpp?ds=inline diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 45fd8ac9d7..7b1596ed2d 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -26,9 +26,8 @@ #undef GTK_DISABLE_DEPRECATED #endif #include -#include -#include +bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom); // ---------------------------------------------------------------------------- // wxSystemObjects @@ -42,16 +41,36 @@ struct 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 // ---------------------------------------------------------------------------- @@ -61,7 +80,9 @@ enum wxGtkWidgetType { wxGTK_BUTTON, wxGTK_LIST, - wxGTK_MENUITEM + wxGTK_MENUITEM, + wxGTK_TEXTCTRL, + wxGTK_MENUBAR, }; // the colour we need @@ -90,6 +111,10 @@ static bool GetColourFromGTKWidget(GdkColor& gdkColor, 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)); @@ -97,6 +122,11 @@ static bool GetColourFromGTKWidget(GdkColor& gdkColor, 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 ); @@ -162,7 +192,6 @@ 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()) { @@ -176,7 +205,28 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) 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: @@ -364,62 +414,12 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) 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 ) @@ -449,7 +449,7 @@ 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) { @@ -468,55 +468,29 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) 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 @@ -526,28 +500,25 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) 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) @@ -564,7 +535,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) // 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 }