X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4161a2a08e622ba55f66610e26892f5fda37e6f..af237ae405f7598c7893d6f46caaf72e64ff8fcf:/src/gtk/renderer.cpp?ds=sidebyside diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index d4c273d979..a3490229d3 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -30,10 +30,13 @@ #include "wx/window.h" #include "wx/dcclient.h" #include "wx/settings.h" + #include "wx/module.h" #endif +#include "wx/gtk/dc.h" +#include "wx/gtk/private.h" + #include -#include "wx/gtk/win_gtk.h" // ---------------------------------------------------------------------------- // wxRendererGTK: our wxRendererNative implementation @@ -94,22 +97,9 @@ public: virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0); - virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); - -private: - // FIXME: shouldn't we destroy these windows somewhere? - - // used by DrawPushButton and DrawDropArrow - static GtkWidget *GetButtonWidget(); - - // used by DrawTreeItemButton() - static GtkWidget *GetTreeWidget(); - - // used by DrawCheckBox() - static GtkWidget *GetCheckButtonWidget(); + virtual wxSize GetCheckBoxSize(wxWindow *win); - // Used by DrawHeaderButton - static GtkWidget *GetHeaderButtonWidget(); + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); }; // ============================================================================ @@ -124,86 +114,6 @@ wxRendererNative& wxRendererNative::GetDefault() return s_rendererGTK; } -// ---------------------------------------------------------------------------- -// helper functions -// ---------------------------------------------------------------------------- - -GtkWidget * -wxRendererGTK::GetButtonWidget() -{ - static GtkWidget *s_button = NULL; - static GtkWidget *s_window = NULL; - - if ( !s_button ) - { - s_window = gtk_window_new( GTK_WINDOW_POPUP ); - gtk_widget_realize( s_window ); - s_button = gtk_button_new(); - gtk_container_add( GTK_CONTAINER(s_window), s_button ); - gtk_widget_realize( s_button ); - } - - return s_button; -} - -GtkWidget * -wxRendererGTK::GetCheckButtonWidget() -{ - static GtkWidget *s_button = NULL; - static GtkWidget *s_window = NULL; - - if ( !s_button ) - { - s_window = gtk_window_new( GTK_WINDOW_POPUP ); - gtk_widget_realize( s_window ); - s_button = gtk_check_button_new(); - gtk_container_add( GTK_CONTAINER(s_window), s_button ); - gtk_widget_realize( s_button ); - } - - return s_button; -} - -GtkWidget * -wxRendererGTK::GetTreeWidget() -{ - static GtkWidget *s_tree = NULL; - static GtkWidget *s_window = NULL; - - if ( !s_tree ) - { - s_tree = gtk_tree_view_new(); - s_window = gtk_window_new( GTK_WINDOW_POPUP ); - gtk_widget_realize( s_window ); - gtk_container_add( GTK_CONTAINER(s_window), s_tree ); - gtk_widget_realize( s_tree ); - } - - return s_tree; -} - - -// This one just gets the button used by the column header. Although it's -// still a gtk_button the themes will typically differentiate and draw them -// differently if the button is in a treeview. -GtkWidget * -wxRendererGTK::GetHeaderButtonWidget() -{ - static GtkWidget *s_button = NULL; - - if ( !s_button ) - { - // Get the dummy tree widget, give it a column, and then use the - // widget in the column header for the rendering code. - GtkWidget* treewidget = GetTreeWidget(); - GtkTreeViewColumn* column = gtk_tree_view_column_new(); - gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column); - s_button = column->button; - } - - return s_button; -} - // ---------------------------------------------------------------------------- // list/tree controls drawing // ---------------------------------------------------------------------------- @@ -217,12 +127,12 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, wxHeaderButtonParams* params) { - GtkWidget *button = GetHeaderButtonWidget(); - + GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget(); + GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -264,12 +174,12 @@ void wxRendererGTK::DrawTreeItemButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { - GtkWidget *tree = GetTreeWidget(); + GtkWidget *tree = wxGTKPrivate::GetTreeWidget(); GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -310,14 +220,10 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, // splitter sash drawing // ---------------------------------------------------------------------------- -static int GetGtkSplitterFullSize() +static int GetGtkSplitterFullSize(GtkWidget* widget) { - static GtkWidget *s_paned = NULL; - if (s_paned == NULL) - s_paned = gtk_vpaned_new(); - gint handle_size; - gtk_widget_style_get (s_paned, "handle_size", &handle_size, NULL); + gtk_widget_style_get(widget, "handle_size", &handle_size, NULL); return handle_size; } @@ -328,7 +234,7 @@ wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win)) // we don't draw any border, hence 0 for the second field return wxSplitterRenderParams ( - GetGtkSplitterFullSize(), + GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget()), 0, true // hot sensitive ); @@ -359,8 +265,8 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -369,7 +275,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, wxASSERT_MSG( gdk_window, wxT("cannot use wxRendererNative on wxDC of this type") ); - wxCoord full_size = GetGtkSplitterFullSize(); + wxCoord full_size = GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget()); // are we drawing vertical or horizontal splitter? const bool isVert = orient == wxVERTICAL; @@ -418,7 +324,7 @@ wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win), const wxRect& rect, int flags) { - GtkWidget *button = GetButtonWidget(); + GtkWidget *button = wxGTKPrivate::GetButtonWidget(); // If we give GTK_PIZZA(win->m_wxwindow)->bin_window as // a window for gtk_paint_xxx function, then it won't @@ -427,8 +333,8 @@ wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win), // are derived from it) and use its m_window. GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -487,18 +393,31 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, DrawDropArrow(win,dc,rect); } +wxSize +wxRendererGTK::GetCheckBoxSize(wxWindow *WXUNUSED(win)) +{ + gint indicator_size, indicator_spacing; + gtk_widget_style_get(wxGTKPrivate::GetCheckButtonWidget(), + "indicator_size", &indicator_size, + "indicator_spacing", &indicator_spacing, + NULL); + + int size = indicator_size + indicator_spacing * 2; + return wxSize(size, size); +} + void wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win), wxDC& dc, const wxRect& rect, int flags ) { - GtkWidget *button = GetCheckButtonWidget(); - + GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget(); + GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -507,6 +426,12 @@ wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win), wxASSERT_MSG( gdk_window, wxT("cannot use wxRendererNative on wxDC of this type") ); + gint indicator_size, indicator_spacing; + gtk_widget_style_get(button, + "indicator_size", &indicator_size, + "indicator_spacing", &indicator_spacing, + NULL); + GtkStateType state; if ( flags & wxCONTROL_PRESSED ) @@ -527,9 +452,9 @@ wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win), NULL, button, "cellcheck", - dc.LogicalToDeviceX(rect.x)+2, - dc.LogicalToDeviceY(rect.y)+3, - 13, 13 + dc.LogicalToDeviceX(rect.x) + indicator_spacing, + dc.LogicalToDeviceY(rect.y) + indicator_spacing, + indicator_size, indicator_size ); } @@ -539,12 +464,12 @@ wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win), const wxRect& rect, int flags) { - GtkWidget *button = GetButtonWidget(); + GtkWidget *button = wxGTKPrivate::GetButtonWidget(); GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -586,8 +511,8 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win, { GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -631,7 +556,12 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win, state, NULL, win->m_wxwindow, - "treeview", + // Detail "treeview" causes warning with GTK+ 2.12 Clearlooks theme: + // "... no property named `row-ending-details'" + // Using "treeview-middle" would fix the warning, but the right + // edge of the focus rect is not getting erased properly either. + // Better to not specify this detail unless the drawing is fixed. + NULL, dc.LogicalToDeviceX(rect.x), dc.LogicalToDeviceY(rect.y), rect.width, @@ -643,8 +573,8 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i { GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else