X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbcbe229628c7667da2b6257198467d4f09ab28d..7e126a0784c24166888759bbc96d65a59c062fa8:/src/gtk1/settings.cpp diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp index 36662eb0a5..99a09be81e 100644 --- a/src/gtk1/settings.cpp +++ b/src/gtk1/settings.cpp @@ -8,83 +8,46 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "settings.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/settings.h" #include "wx/debug.h" - #include "wx/cmndata.h" +#include "wx/fontutil.h" #include #include #include -extern GdkFont *GtkGetDefaultGuiFont(); - - -/* -#define wxSYS_COLOUR_SCROLLBAR 0 -#define wxSYS_COLOUR_BACKGROUND 1 -#define wxSYS_COLOUR_ACTIVECAPTION 2 -#define wxSYS_COLOUR_INACTIVECAPTION 3 -#define wxSYS_COLOUR_MENU 4 -#define wxSYS_COLOUR_WINDOW 5 -#define wxSYS_COLOUR_WINDOWFRAME 6 -#define wxSYS_COLOUR_MENUTEXT 7 -#define wxSYS_COLOUR_WINDOWTEXT 8 -#define wxSYS_COLOUR_CAPTIONTEXT 9 -#define wxSYS_COLOUR_ACTIVEBORDER 10 -#define wxSYS_COLOUR_INACTIVEBORDER 11 -#define wxSYS_COLOUR_APPWORKSPACE 12 -#define wxSYS_COLOUR_HIGHLIGHT 13 -#define wxSYS_COLOUR_HIGHLIGHTTEXT 14 -#define wxSYS_COLOUR_BTNFACE 15 -#define wxSYS_COLOUR_BTNSHADOW 16 -#define wxSYS_COLOUR_GRAYTEXT 17 -#define wxSYS_COLOUR_BTNTEXT 18 -#define wxSYS_COLOUR_INACTIVECAPTIONTEXT 19 -#define wxSYS_COLOUR_BTNHIGHLIGHT 20 - -#define wxSYS_COLOUR_3DDKSHADOW 21 -#define wxSYS_COLOUR_3DLIGHT 22 -#define wxSYS_COLOUR_INFOTEXT 23 -#define wxSYS_COLOUR_INFOBK 24 - -#define wxSYS_COLOUR_DESKTOP wxSYS_COLOUR_BACKGROUND -#define wxSYS_COLOUR_3DFACE wxSYS_COLOUR_BTNFACE -#define wxSYS_COLOUR_3DSHADOW wxSYS_COLOUR_BTNSHADOW -#define wxSYS_COLOUR_3DHIGHLIGHT wxSYS_COLOUR_BTNHIGHLIGHT -#define wxSYS_COLOUR_3DHILIGHT wxSYS_COLOUR_BTNHIGHLIGHT -#define wxSYS_COLOUR_BTNHILIGHT wxSYS_COLOUR_BTNHIGHLIGHT -*/ - #define SHIFT (8*(sizeof(short int)-sizeof(char))) -//wxColour *g_systemWinColour = (wxColour *) NULL; -wxColour *g_systemBtnFaceColour = (wxColour *) NULL; -wxColour *g_systemBtnShadowColour = (wxColour *) NULL; -wxColour *g_systemBtnHighlightColour = (wxColour *) NULL; -wxColour *g_systemHighlightColour = (wxColour *) NULL; -wxColour *g_systemHighlightTextColour = (wxColour *) NULL; -wxColour *g_systemListBoxColour = (wxColour *) NULL; -wxColour *g_systemBtnTextColour = (wxColour *) NULL; +// ---------------------------------------------------------------------------- +// wxSystemObjects +// ---------------------------------------------------------------------------- -wxFont *g_systemFont = (wxFont *) NULL; - -void wxSystemSettings::Done() +struct wxSystemObjects { -// delete g_systemWinColour; - delete g_systemBtnFaceColour; - delete g_systemBtnShadowColour; - delete g_systemBtnHighlightColour; - delete g_systemHighlightColour; - delete g_systemHighlightTextColour; - delete g_systemListBoxColour; - delete g_systemFont; - delete g_systemBtnTextColour; -} + wxColour m_colBtnFace, + m_colBtnShadow, + m_colBtnHighlight, + m_colHighlight, + m_colHighlightText, + m_colListBox, + m_colBtnText; + + wxFont m_fontSystem; +}; + +static wxSystemObjects gs_objects; + +// ---------------------------------------------------------------------------- +// wxSystemSettings implementation +// ---------------------------------------------------------------------------- // kind of widget to use in GetColourFromGTKWidget enum wxGtkWidgetType @@ -101,7 +64,7 @@ enum wxGtkColourType wxGTK_BASE }; -// wxSystemSettings::GetSystemColour() helper: get the colours from a GTK+ +// 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, @@ -166,7 +129,7 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue, return ok; } -wxColour wxSystemSettings::GetSystemColour( int index ) +wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) { switch (index) { @@ -179,8 +142,9 @@ wxColour wxSystemSettings::GetSystemColour( int index ) case wxSYS_COLOUR_ACTIVEBORDER: case wxSYS_COLOUR_INACTIVEBORDER: case wxSYS_COLOUR_BTNFACE: + case wxSYS_COLOUR_MENUBAR: case wxSYS_COLOUR_3DLIGHT: - if (!g_systemBtnFaceColour) + if (!gs_objects.m_colBtnFace.Ok()) { int red, green, blue; if ( !GetColourFromGTKWidget(red, green, blue) ) @@ -190,11 +154,11 @@ wxColour wxSystemSettings::GetSystemColour( int index ) blue = 0x9c40; } - g_systemBtnFaceColour = new wxColour( red >> SHIFT, - green >> SHIFT, - blue >> SHIFT ); + gs_objects.m_colBtnFace = wxColour( red >> SHIFT, + green >> SHIFT, + blue >> SHIFT ); } - return *g_systemBtnFaceColour; + return gs_objects.m_colBtnFace; case wxSYS_COLOUR_WINDOW: return *wxWHITE; @@ -205,35 +169,23 @@ wxColour wxSystemSettings::GetSystemColour( int index ) case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_BTNSHADOW: //case wxSYS_COLOUR_3DSHADOW: - if (!g_systemBtnShadowColour) + if (!gs_objects.m_colBtnShadow.Ok()) { - wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE)); - g_systemBtnShadowColour = - new wxColour((unsigned char) (faceColour.Red() * 0.666), - (unsigned char) (faceColour.Green() * 0.666), - (unsigned char) (faceColour.Blue() * 0.666)); + 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)); } - return *g_systemBtnShadowColour; + return gs_objects.m_colBtnShadow; case wxSYS_COLOUR_3DHIGHLIGHT: //case wxSYS_COLOUR_BTNHIGHLIGHT: return * wxWHITE; -/* I think this should normally be white (JACS 8/2000) - - Hmm, I'm quite sure it shouldn't ... (VZ 20.08.01) - if (!g_systemBtnHighlightColour) - { - g_systemBtnHighlightColour = - new wxColour( 0xea60 >> SHIFT, - 0xea60 >> SHIFT, - 0xea60 >> SHIFT ); - } - return *g_systemBtnHighlightColour; -*/ case wxSYS_COLOUR_HIGHLIGHT: - if (!g_systemHighlightColour) + if (!gs_objects.m_colHighlight.Ok()) { int red, green, blue; if ( !GetColourFromGTKWidget(red, green, blue, @@ -245,14 +197,14 @@ wxColour wxSystemSettings::GetSystemColour( int index ) blue = 0x9c40; } - g_systemHighlightColour = new wxColour( red >> SHIFT, + gs_objects.m_colHighlight = wxColour( red >> SHIFT, green >> SHIFT, blue >> SHIFT ); } - return *g_systemHighlightColour; + return gs_objects.m_colHighlight; case wxSYS_COLOUR_LISTBOX: - if (!g_systemListBoxColour) + if (!gs_objects.m_colListBox.Ok()) { int red, green, blue; if ( GetColourFromGTKWidget(red, green, blue, @@ -260,16 +212,16 @@ wxColour wxSystemSettings::GetSystemColour( int index ) GTK_STATE_NORMAL, wxGTK_BASE) ) { - g_systemListBoxColour = new wxColour( red >> SHIFT, + gs_objects.m_colListBox = wxColour( red >> SHIFT, green >> SHIFT, blue >> SHIFT ); } else { - g_systemListBoxColour = new wxColour(*wxWHITE); + gs_objects.m_colListBox = wxColour(*wxWHITE); } } - return *g_systemListBoxColour; + return gs_objects.m_colListBox; case wxSYS_COLOUR_MENUTEXT: case wxSYS_COLOUR_WINDOWTEXT: @@ -277,7 +229,7 @@ wxColour wxSystemSettings::GetSystemColour( int index ) case wxSYS_COLOUR_INACTIVECAPTIONTEXT: case wxSYS_COLOUR_BTNTEXT: case wxSYS_COLOUR_INFOTEXT: - if (!g_systemBtnTextColour) + if (!gs_objects.m_colBtnText.Ok()) { int red, green, blue; if ( !GetColourFromGTKWidget(red, green, blue, @@ -290,32 +242,48 @@ wxColour wxSystemSettings::GetSystemColour( int index ) blue = 0; } - g_systemBtnTextColour = new wxColour( red >> SHIFT, + gs_objects.m_colBtnText = wxColour( red >> SHIFT, green >> SHIFT, blue >> SHIFT ); } - return *g_systemBtnTextColour; + return gs_objects.m_colBtnText; + + // this (as well as wxSYS_COLOUR_INFOTEXT above) is used for + // tooltip windows - Robert, please change this code to use the + // real GTK tooltips when/if you can (TODO) + case wxSYS_COLOUR_INFOBK: + return wxColour(255, 255, 225); case wxSYS_COLOUR_HIGHLIGHTTEXT: - if (!g_systemHighlightTextColour) + if (!gs_objects.m_colHighlightText.Ok()) { - wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); + wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT); if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200) - g_systemHighlightTextColour = new wxColour(*wxBLACK); + gs_objects.m_colHighlightText = wxColour(*wxBLACK); else - g_systemHighlightTextColour = new wxColour(*wxWHITE); + gs_objects.m_colHighlightText = wxColour(*wxWHITE); } - return *g_systemHighlightTextColour; + return gs_objects.m_colHighlightText; - case wxSYS_COLOUR_INFOBK: case wxSYS_COLOUR_APPWORKSPACE: return *wxWHITE; // ? + + case wxSYS_COLOUR_HOTLIGHT: + case wxSYS_COLOUR_GRADIENTACTIVECAPTION: + case wxSYS_COLOUR_GRADIENTINACTIVECAPTION: + case wxSYS_COLOUR_MENUHILIGHT: + // TODO + return *wxBLACK; + + case wxSYS_COLOUR_MAX: + default: + wxFAIL_MSG( _T("unknown system colour index") ); } return *wxWHITE; } -wxFont wxSystemSettings::GetSystemFont( int index ) +wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) { switch (index) { @@ -330,32 +298,48 @@ wxFont wxSystemSettings::GetSystemFont( int index ) case wxSYS_DEVICE_DEFAULT_FONT: case wxSYS_DEFAULT_GUI_FONT: { - if (!g_systemFont) + if (!gs_objects.m_fontSystem.Ok()) { -#if 0 - GdkFont *gdk_font = GtkGetDefaultGuiFont(); - if (gdk_font) - { - GSList *font_list = ((GdkFontPrivate*)gdk_font)->names; - char *name = (char*)font_list->data; - wxString font_string( name ); - wxFontData font_data; - g_systemFont = new wxFont( font_string, font_data ); - } +#ifdef __WXGTK20__ + 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 ); +#else + gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); #endif - - g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); - } - return *g_systemFont; + return gs_objects.m_fontSystem; } - } - return wxNullFont; + default: + return wxNullFont; + } } -int wxSystemSettings::GetSystemMetric( int index ) +int wxSystemSettingsNative::GetMetric( wxSystemMetric index ) { switch (index) { @@ -363,9 +347,53 @@ int wxSystemSettings::GetSystemMetric( int index ) case wxSYS_SCREEN_Y: return gdk_screen_height(); case wxSYS_HSCROLL_Y: return 15; case wxSYS_VSCROLL_X: return 15; - } - wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented") ); +#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 - return 0; +#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; + } +} + +bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) +{ + switch (index) + { + case wxSYS_CAN_ICONIZE_FRAME: + return FALSE; + break; + case wxSYS_CAN_DRAW_FRAME_DECORATIONS: + return TRUE; + break; + default: + return FALSE; + } }