X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3523b9cf8d3f6fac1f264e57a42d5858d3ac1d04..28978e0c5af8ec9a6ee0ab82456567cbfca221f7:/src/gtk/settings.cpp?ds=inline diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 73ad0b87b3..eab86263f5 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -14,7 +14,7 @@ #include "wx/settings.h" #include "wx/debug.h" - +#include "wx/module.h" #include "wx/cmndata.h" #include @@ -73,32 +73,72 @@ wxColour *g_systemBtnTextColour = (wxColour *) NULL; wxFont *g_systemFont = (wxFont *) NULL; -void wxSystemSettings::Done() +// ---------------------------------------------------------------------------- +// wxSystemSettingsModule +// ---------------------------------------------------------------------------- + +class wxSystemSettingsModule : public wxModule { -// 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; -} +public: + bool OnInit() { return TRUE; } + void OnExit() + { + //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; + } + DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule) + +// ---------------------------------------------------------------------------- +// wxSystemSettings implementation +// ---------------------------------------------------------------------------- // kind of widget to use in GetColourFromGTKWidget -enum GtkWidgetType +enum wxGtkWidgetType +{ + wxGTK_BUTTON, + wxGTK_LIST +}; + +// the colour we need +enum wxGtkColourType { - GTK_BUTTON, - GTK_LIST + wxGTK_FG, + wxGTK_BG, + 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(GtkWidgetType type, GtkStateType state, - int& red, int& green, int& blue) +static bool GetColourFromGTKWidget(int& red, int& green, int& blue, + wxGtkWidgetType type = wxGTK_BUTTON, + GtkStateType state = GTK_STATE_NORMAL, + wxGtkColourType colour = wxGTK_BG) { - GtkWidget *widget = type == GTK_BUTTON ? gtk_button_new() : gtk_list_new(); + 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(); @@ -106,10 +146,26 @@ static bool GetColourFromGTKWidget(GtkWidgetType type, GtkStateType state, bool ok; if ( def ) { - // ok, it's a hack: we really should have different functions to - // access GtkStyle::bg and ::base but as we only use base for listbox - // for now, this code works too - GdkColor *col = type == GTK_BUTTON ? def->bg : def->base; + 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; @@ -126,7 +182,7 @@ static bool GetColourFromGTKWidget(GtkWidgetType type, GtkStateType state, return ok; } -wxColour wxSystemSettings::GetSystemColour( int index ) +wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) { switch (index) { @@ -143,8 +199,7 @@ wxColour wxSystemSettings::GetSystemColour( int index ) if (!g_systemBtnFaceColour) { int red, green, blue; - if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_NORMAL, - red, green, blue) ) + if ( !GetColourFromGTKWidget(red, green, blue) ) { red = green = 0; @@ -168,7 +223,7 @@ wxColour wxSystemSettings::GetSystemColour( int index ) //case wxSYS_COLOUR_3DSHADOW: if (!g_systemBtnShadowColour) { - wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE)); + wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE)); g_systemBtnShadowColour = new wxColour((unsigned char) (faceColour.Red() * 0.666), (unsigned char) (faceColour.Green() * 0.666), @@ -197,8 +252,9 @@ wxColour wxSystemSettings::GetSystemColour( int index ) if (!g_systemHighlightColour) { int red, green, blue; - if ( !GetColourFromGTKWidget(GTK_BUTTON, GTK_STATE_SELECTED, - red, green, blue) ) + if ( !GetColourFromGTKWidget(red, green, blue, + wxGTK_BUTTON, + GTK_STATE_SELECTED) ) { red = green = 0; @@ -215,8 +271,10 @@ wxColour wxSystemSettings::GetSystemColour( int index ) if (!g_systemListBoxColour) { int red, green, blue; - if ( GetColourFromGTKWidget(GTK_LIST, GTK_STATE_NORMAL, - red, green, blue) ) + if ( GetColourFromGTKWidget(red, green, blue, + wxGTK_LIST, + GTK_STATE_NORMAL, + wxGTK_BASE) ) { g_systemListBoxColour = new wxColour( red >> SHIFT, green >> SHIFT, @@ -237,33 +295,27 @@ wxColour wxSystemSettings::GetSystemColour( int index ) case wxSYS_COLOUR_INFOTEXT: if (!g_systemBtnTextColour) { - 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->fg[GTK_STATE_NORMAL].red; - int green = def->fg[GTK_STATE_NORMAL].green; - int blue = def->fg[GTK_STATE_NORMAL].blue; - g_systemBtnTextColour = - new wxColour( red >> SHIFT, - green >> SHIFT, - blue >> SHIFT ); - } - else + int red, green, blue; + if ( !GetColourFromGTKWidget(red, green, blue, + wxGTK_BUTTON, + GTK_STATE_NORMAL, + wxGTK_FG) ) { - g_systemBtnTextColour = - new wxColour(0, 0, 0); + red = + green = + blue = 0; } - gtk_widget_destroy( widget ); + + 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); + wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT); if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200) g_systemHighlightTextColour = new wxColour(*wxBLACK); else @@ -279,7 +331,7 @@ wxColour wxSystemSettings::GetSystemColour( int index ) return *wxWHITE; } -wxFont wxSystemSettings::GetSystemFont( int index ) +wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) { switch (index) { @@ -314,12 +366,13 @@ wxFont wxSystemSettings::GetSystemFont( int index ) } return *g_systemFont; } - } - return wxNullFont; + default: + return wxNullFont; + } } -int wxSystemSettings::GetSystemMetric( int index ) +int wxSystemSettingsNative::GetMetric( wxSystemMetric index ) { switch (index) { @@ -327,9 +380,23 @@ 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; + default: + wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") ); + return 0; } +} - wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric 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; + } }