X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..53e8c532c641ea8285b436990ff6e29ddd8d0443:/src/gtk/settings.cpp diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index a525955a9a..dede98aa35 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,7 +38,8 @@ struct wxSystemObjects m_colHighlight, m_colHighlightText, m_colListBox, - m_colBtnText; + m_colBtnText, + m_colMenuItemHighlight; wxFont m_fontSystem; }; @@ -53,7 +54,8 @@ static wxSystemObjects gs_objects; enum wxGtkWidgetType { wxGTK_BUTTON, - wxGTK_LIST + wxGTK_LIST, + wxGTK_MENUITEM }; // the colour we need @@ -84,6 +86,9 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue, case wxGTK_LIST: widget = gtk_list_new(); + + case wxGTK_MENUITEM: + widget = gtk_menu_item_new(); } GtkStyle *def = gtk_rc_get_style( widget ); @@ -135,7 +140,6 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) { case wxSYS_COLOUR_SCROLLBAR: case wxSYS_COLOUR_BACKGROUND: - case wxSYS_COLOUR_ACTIVECAPTION: case wxSYS_COLOUR_INACTIVECAPTION: case wxSYS_COLOUR_MENU: case wxSYS_COLOUR_WINDOWFRAME: @@ -268,10 +272,30 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_APPWORKSPACE: return *wxWHITE; // ? + 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; + case wxSYS_COLOUR_HOTLIGHT: case wxSYS_COLOUR_GRADIENTACTIVECAPTION: case wxSYS_COLOUR_GRADIENTINACTIVECAPTION: - case wxSYS_COLOUR_MENUHILIGHT: // TODO return *wxBLACK; @@ -308,7 +332,8 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) if ( def && def->font_desc ) { wxNativeFontInfo info; - info.description = def->font_desc; + info.description = + pango_font_description_copy(def->font_desc); gs_objects.m_fontSystem = wxFont(info); } else @@ -347,15 +372,37 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index ) case wxSYS_HSCROLL_Y: return 15; case wxSYS_VSCROLL_X: return 15; +#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 4, 0) + case wxSYS_DCLICK_X: + case wxSYS_DCLICK_Y: + gint dclick_distance; + g_object_get(gtk_settings_get_default(), "gtk-double-click-distance", &dclick_distance, NULL); + return dclick_distance * 2; +#endif + +#if defined(__WXGTK20__) + case wxSYS_DRAG_X: + case wxSYS_DRAG_Y: + gint drag_threshold; + g_object_get(gtk_settings_get_default(), "gtk-dnd-drag-threshold", &drag_threshold, NULL); + return drag_threshold * 2; +#endif + // VZ: is there any way to get the cursor size with GDK? + // Mart Raudsepp: Yes, there is a way to get the default cursor size for a display ever since GDK 2.4 +#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 4, 0) + case wxSYS_CURSOR_X: + case wxSYS_CURSOR_Y: + return gdk_display_get_default_cursor_size(gdk_display_get_default()); +#else case wxSYS_CURSOR_X: return 16; case wxSYS_CURSOR_Y: return 16; +#endif // MBN: ditto for icons case wxSYS_ICON_X: return 32; case wxSYS_ICON_Y: return 32; default: - wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") ); - return 0; + return -1; // metric is unknown } }