X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d06b34a73eb466126513bf8b0ed586a8ababc141..268766dd1f2a2d4d593d1d65893f62b5753ff20b:/src/gtk/settings.cpp?ds=sidebyside diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 4a491823fa..36662eb0a5 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: settings.cpp +// Name: gtk/settings.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,6 +21,8 @@ #include #include +extern GdkFont *GtkGetDefaultGuiFont(); + /* #define wxSYS_COLOUR_SCROLLBAR 0 @@ -67,10 +69,11 @@ 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; wxFont *g_systemFont = (wxFont *) NULL; -void wxSystemSettings::Done() +void wxSystemSettings::Done() { // delete g_systemWinColour; delete g_systemBtnFaceColour; @@ -80,6 +83,87 @@ void wxSystemSettings::Done() delete g_systemHighlightTextColour; delete g_systemListBoxColour; delete g_systemFont; + delete g_systemBtnTextColour; +} + +// kind of widget to use in GetColourFromGTKWidget +enum wxGtkWidgetType +{ + wxGTK_BUTTON, + wxGTK_LIST +}; + +// the colour we need +enum wxGtkColourType +{ + wxGTK_FG, + wxGTK_BG, + wxGTK_BASE +}; + +// wxSystemSettings::GetSystemColour() 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, + GtkStateType state = GTK_STATE_NORMAL, + wxGtkColourType colour = wxGTK_BG) +{ + GtkWidget *widget; + switch ( type ) + { + default: + wxFAIL_MSG( _T("unexpected GTK widget type") ); + // fall through + + case wxGTK_BUTTON: + widget = gtk_button_new(); + break; + + case wxGTK_LIST: + widget = gtk_list_new(); + } + + GtkStyle *def = gtk_rc_get_style( widget ); + if ( !def ) + def = gtk_widget_get_default_style(); + + bool ok; + if ( def ) + { + GdkColor *col; + switch ( colour ) + { + default: + wxFAIL_MSG( _T("unexpected GTK colour type") ); + // fall through + + case wxGTK_FG: + col = def->fg; + break; + + case wxGTK_BG: + col = def->bg; + break; + + case wxGTK_BASE: + col = def->base; + break; + } + + red = col[state].red; + green = col[state].green; + blue = col[state].blue; + + ok = TRUE; + } + else + { + ok = FALSE; + } + + gtk_widget_destroy( widget ); + + return ok; } wxColour wxSystemSettings::GetSystemColour( int index ) @@ -95,128 +179,143 @@ wxColour wxSystemSettings::GetSystemColour( int index ) case wxSYS_COLOUR_ACTIVEBORDER: case wxSYS_COLOUR_INACTIVEBORDER: case wxSYS_COLOUR_BTNFACE: - { + case wxSYS_COLOUR_3DLIGHT: if (!g_systemBtnFaceColour) { - g_systemBtnFaceColour = - new wxColour( 0xd6d6 >> SHIFT, - 0xd6d6 >> SHIFT, - 0xd6d6 >> SHIFT ); + int red, green, blue; + if ( !GetColourFromGTKWidget(red, green, blue) ) + { + red = + green = 0; + blue = 0x9c40; + } + + g_systemBtnFaceColour = new wxColour( red >> SHIFT, + green >> SHIFT, + blue >> SHIFT ); } return *g_systemBtnFaceColour; - } + case wxSYS_COLOUR_WINDOW: - { return *wxWHITE; - } + + case wxSYS_COLOUR_3DDKSHADOW: + return *wxBLACK; + case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_BTNSHADOW: - { + //case wxSYS_COLOUR_3DSHADOW: if (!g_systemBtnShadowColour) { - g_systemBtnShadowColour = - new wxColour( 0x7530 >> SHIFT, - 0x7530 >> SHIFT, - 0x7530 >> SHIFT ); + 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)); } + return *g_systemBtnShadowColour; - } - case wxSYS_COLOUR_BTNHIGHLIGHT: - { + + 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 ); + g_systemBtnHighlightColour = + new wxColour( 0xea60 >> SHIFT, + 0xea60 >> SHIFT, + 0xea60 >> SHIFT ); } return *g_systemBtnHighlightColour; - } +*/ + case wxSYS_COLOUR_HIGHLIGHT: - { if (!g_systemHighlightColour) { - GtkWidget *widget = gtk_button_new(); - GtkStyle *def = gtk_rc_get_style( widget ); - if (!def) - def = gtk_widget_get_default_style(); - if (def) - { - int red = def->bg[GTK_STATE_SELECTED].red; - int green = def->bg[GTK_STATE_SELECTED].green; - int blue = def->bg[GTK_STATE_SELECTED].blue; - g_systemHighlightColour = - new wxColour( red >> SHIFT, - green >> SHIFT, - blue >> SHIFT ); - } - else + int red, green, blue; + if ( !GetColourFromGTKWidget(red, green, blue, + wxGTK_BUTTON, + GTK_STATE_SELECTED) ) { - g_systemHighlightColour = - new wxColour( 0 >> SHIFT, - 0 >> SHIFT, - 0x9c40 >> SHIFT ); + red = + green = 0; + blue = 0x9c40; } - gtk_widget_destroy( widget ); + g_systemHighlightColour = new wxColour( red >> SHIFT, + green >> SHIFT, + blue >> SHIFT ); } return *g_systemHighlightColour; - } + case wxSYS_COLOUR_LISTBOX: - { if (!g_systemListBoxColour) { - GtkWidget *widget = gtk_list_new(); - GtkStyle *def = gtk_rc_get_style( widget ); - if (!def) - def = gtk_widget_get_default_style(); - if (def) + int red, green, blue; + if ( GetColourFromGTKWidget(red, green, blue, + wxGTK_LIST, + GTK_STATE_NORMAL, + wxGTK_BASE) ) { - int red = def->base[GTK_STATE_NORMAL].red; - int green = def->base[GTK_STATE_NORMAL].green; - int blue = def->base[GTK_STATE_NORMAL].blue; - g_systemListBoxColour = - new wxColour( red >> SHIFT, - green >> SHIFT, - blue >> SHIFT ); + g_systemListBoxColour = new wxColour( red >> SHIFT, + green >> SHIFT, + blue >> SHIFT ); } else + { g_systemListBoxColour = new wxColour(*wxWHITE); - gtk_widget_destroy( widget ); + } } return *g_systemListBoxColour; - } - case wxSYS_COLOUR_MENUTEXT: - case wxSYS_COLOUR_WINDOWTEXT: - case wxSYS_COLOUR_CAPTIONTEXT: - case wxSYS_COLOUR_INACTIVECAPTIONTEXT: - case wxSYS_COLOUR_BTNTEXT: - case wxSYS_COLOUR_INFOTEXT: - { - return *wxBLACK; - } - case wxSYS_COLOUR_HIGHLIGHTTEXT: - { - if (!g_systemHighlightTextColour) - { - wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); - if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200) - g_systemHighlightTextColour = new wxColour(*wxBLACK); - else - g_systemHighlightTextColour = new wxColour(*wxWHITE); - } - return *g_systemHighlightTextColour; - } - case wxSYS_COLOUR_INFOBK: - case wxSYS_COLOUR_APPWORKSPACE: - { - return *wxWHITE; // ? - } + + case wxSYS_COLOUR_MENUTEXT: + case wxSYS_COLOUR_WINDOWTEXT: + case wxSYS_COLOUR_CAPTIONTEXT: + case wxSYS_COLOUR_INACTIVECAPTIONTEXT: + case wxSYS_COLOUR_BTNTEXT: + case wxSYS_COLOUR_INFOTEXT: + if (!g_systemBtnTextColour) + { + int red, green, blue; + if ( !GetColourFromGTKWidget(red, green, blue, + wxGTK_BUTTON, + GTK_STATE_NORMAL, + wxGTK_FG) ) + { + red = + green = + blue = 0; + } + + g_systemBtnTextColour = new wxColour( red >> SHIFT, + green >> SHIFT, + blue >> SHIFT ); + } + return *g_systemBtnTextColour; + + case wxSYS_COLOUR_HIGHLIGHTTEXT: + if (!g_systemHighlightTextColour) + { + wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); + if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200) + g_systemHighlightTextColour = new wxColour(*wxBLACK); + else + g_systemHighlightTextColour = new wxColour(*wxWHITE); + } + return *g_systemHighlightTextColour; + + case wxSYS_COLOUR_INFOBK: + case wxSYS_COLOUR_APPWORKSPACE: + return *wxWHITE; // ? } + return *wxWHITE; } -wxFont wxSystemSettings::GetSystemFont( int index ) +wxFont wxSystemSettings::GetSystemFont( int index ) { switch (index) { @@ -233,19 +332,8 @@ wxFont wxSystemSettings::GetSystemFont( int index ) { if (!g_systemFont) { - GdkFont *gdk_font = (GdkFont*) NULL; - GtkWidget *widget = gtk_button_new(); #if 0 - GtkStyle *def = gtk_rc_get_style( widget ); - if (def) - gdk_font = def->font; - else - { - def = gtk_widget_get_default_style(); - if (def) - gdk_font = def->font; - } -#endif + GdkFont *gdk_font = GtkGetDefaultGuiFont(); if (gdk_font) { GSList *font_list = ((GdkFontPrivate*)gdk_font)->names; @@ -254,12 +342,11 @@ wxFont wxSystemSettings::GetSystemFont( int index ) wxFontData font_data; g_systemFont = new wxFont( font_string, font_data ); } - else - { - g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); - } - gtk_widget_destroy( widget ); +#endif + + g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); + } return *g_systemFont; } @@ -277,8 +364,8 @@ int wxSystemSettings::GetSystemMetric( int index ) case wxSYS_HSCROLL_Y: return 15; case wxSYS_VSCROLL_X: return 15; } - + wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented") ); - + return 0; }