X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/428f4657b6c1747e28abeb3b9c2069512b2997d7..593354ca47abaae8a434f99642acc57f7834f77b:/src/gtk/renderer.cpp diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index f1cd95c856..de54e0aea2 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -30,10 +30,12 @@ #include "wx/window.h" #include "wx/dcclient.h" #include "wx/settings.h" + #include "wx/module.h" #endif +#include "wx/gtk/dc.h" + #include -#include "wx/gtk/win_gtk.h" // ---------------------------------------------------------------------------- // wxRendererGTK: our wxRendererNative implementation @@ -43,10 +45,12 @@ class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererNative { public: // draw the header control button (used by wxListCtrl) - virtual void DrawHeaderButton(wxWindow *win, + virtual int DrawHeaderButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0, + wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, + wxHeaderButtonParams* params = NULL); // draw the expanded/collapsed icon for a tree control item virtual void DrawTreeItemButton(wxWindow *win, @@ -90,12 +94,15 @@ public: const wxRect& rect, int flags = 0); + 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? + class Module; + friend class Module; - // used by DrawHeaderButton and DrawPushButton +private: + // used by DrawPushButton and DrawDropArrow static GtkWidget *GetButtonWidget(); // used by DrawTreeItemButton() @@ -103,12 +110,44 @@ private: // used by DrawCheckBox() static GtkWidget *GetCheckButtonWidget(); + + // Used by DrawHeaderButton + static GtkWidget *GetHeaderButtonWidget(); + + static GtkWidget* GetSplitterWidget(); + + // container for created widgets + static GtkContainer* GetContainer(); + static GtkWidget* ms_container; }; +// Module for destroying created widgets +class wxRendererGTK::Module: public wxModule +{ +public: + virtual bool OnInit() + { + return true; + } + virtual void OnExit() + { + if (wxRendererGTK::ms_container) + { + GtkWidget* parent = + gtk_widget_get_parent(wxRendererGTK::ms_container); + gtk_widget_destroy(parent); + } + } + DECLARE_DYNAMIC_CLASS(wxRendererGTK::Module) +}; +IMPLEMENT_DYNAMIC_CLASS(wxRendererGTK::Module, wxModule) + // ============================================================================ // implementation // ============================================================================ +GtkWidget* wxRendererGTK::ms_container; + /* static */ wxRendererNative& wxRendererNative::GetDefault() { @@ -121,18 +160,26 @@ wxRendererNative& wxRendererNative::GetDefault() // helper functions // ---------------------------------------------------------------------------- +GtkContainer* wxRendererGTK::GetContainer() +{ + if (ms_container == NULL) + { + GtkWidget* window = gtk_window_new(GTK_WINDOW_POPUP); + ms_container = gtk_fixed_new(); + gtk_container_add(GTK_CONTAINER(window), ms_container); + } + return GTK_CONTAINER(ms_container); +} + 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_container_add(GetContainer(), s_button); gtk_widget_realize( s_button ); } @@ -143,14 +190,11 @@ 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_container_add(GetContainer(), s_button); gtk_widget_realize( s_button ); } @@ -161,46 +205,121 @@ 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_container_add(GetContainer(), s_tree); gtk_widget_realize( s_tree ); } return s_tree; } +// used elsewhere +GtkWidget *GetEntryWidget() +{ + static GtkWidget *s_entry = NULL; + static GtkWidget *s_window = NULL; + + if ( !s_entry ) + { + s_window = gtk_window_new( GTK_WINDOW_POPUP ); + gtk_widget_realize( s_window ); + s_entry = gtk_entry_new(); + gtk_container_add( GTK_CONTAINER(s_window), s_entry ); + gtk_widget_realize( s_entry ); + } + + return s_entry; +} + +// 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; +} + +GtkWidget* wxRendererGTK::GetSplitterWidget() +{ + static GtkWidget* widget; + if (widget == NULL) + { + widget = gtk_vpaned_new(); + gtk_container_add(GetContainer(), widget); + gtk_widget_realize(widget); + } + return widget; +} + // ---------------------------------------------------------------------------- // list/tree controls drawing // ---------------------------------------------------------------------------- -void +int wxRendererGTK::DrawHeaderButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags) + int flags, + wxHeaderSortIconType sortArrow, + wxHeaderButtonParams* params) { - GtkWidget *button = GetButtonWidget(); + GtkWidget *button = GetHeaderButtonWidget(); + + GdkWindow* gdk_window = NULL; +#if wxUSE_NEW_DC + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); + if (gtk_impl) + gdk_window = gtk_impl->GetGDKWindow(); +#else + gdk_window = dc.GetGDKWindow(); +#endif + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + + int x_diff = 0; + if (win->GetLayoutDirection() == wxLayout_RightToLeft) + x_diff = rect.width; + + GtkStateType state = GTK_STATE_NORMAL; + if (flags & wxCONTROL_DISABLED) + state = GTK_STATE_INSENSITIVE; + else + { + if (flags & wxCONTROL_CURRENT) + state = GTK_STATE_PRELIGHT; + } gtk_paint_box ( button->style, - // FIXME: I suppose GTK_PIZZA(win->m_wxwindow)->bin_window doesn't work with wxMemoryDC. - // Maybe use code similar as in DrawPushButton below? - GTK_PIZZA(win->m_wxwindow)->bin_window, - flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL, + gdk_window, + state, GTK_SHADOW_OUT, NULL, button, "button", - dc.LogicalToDeviceX(rect.x), rect.y, rect.width, rect.height + dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height ); + + return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); } // draw a ">" or "v" button @@ -210,6 +329,18 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, { GtkWidget *tree = GetTreeWidget(); + GdkWindow* gdk_window = NULL; +#if wxUSE_NEW_DC + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); + if (gtk_impl) + gdk_window = gtk_impl->GetGDKWindow(); +#else + gdk_window = dc.GetGDKWindow(); +#endif + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + GtkStateType state; if ( flags & wxCONTROL_CURRENT ) state = GTK_STATE_PRELIGHT; @@ -219,18 +350,18 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, int x_diff = 0; if (win->GetLayoutDirection() == wxLayout_RightToLeft) x_diff = rect.width; - + // VZ: I don't know how to get the size of the expander so as to centre it // in the given rectangle, +2/3 below is just what looks good here... gtk_paint_expander ( tree->style, - GTK_PIZZA(win->m_wxwindow)->bin_window, + gdk_window, state, NULL, tree, "treeview", - dc.LogicalToDeviceX(rect.x) + 2 - x_diff, + dc.LogicalToDeviceX(rect.x) + 6 - x_diff, dc.LogicalToDeviceY(rect.y) + 3, flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED @@ -242,14 +373,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; } @@ -260,7 +387,7 @@ wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win)) // we don't draw any border, hence 0 for the second field return wxSplitterRenderParams ( - GetGtkSplitterFullSize(), + GetGtkSplitterFullSize(GetSplitterWidget()), 0, true // hot sensitive ); @@ -289,7 +416,19 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, return; } - wxCoord full_size = GetGtkSplitterFullSize(); + GdkWindow* gdk_window = NULL; +#if wxUSE_NEW_DC + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); + if (gtk_impl) + gdk_window = gtk_impl->GetGDKWindow(); +#else + gdk_window = dc.GetGDKWindow(); +#endif + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + + wxCoord full_size = GetGtkSplitterFullSize(GetSplitterWidget()); // are we drawing vertical or horizontal splitter? const bool isVert = orient == wxVERTICAL; @@ -298,23 +437,19 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, if ( isVert ) { - int h = win->GetClientSize().GetHeight(); - rect.x = position; rect.y = 0; rect.width = full_size; - rect.height = h; + rect.height = size.y; } else // horz { - int w = win->GetClientSize().GetWidth(); - rect.x = 0; rect.y = position; rect.height = full_size; - rect.width = w; + rect.width = size.x; } - + int x_diff = 0; if (win->GetLayoutDirection() == wxLayout_RightToLeft) x_diff = rect.width; @@ -322,7 +457,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, gtk_paint_handle ( win->m_wxwindow->style, - GTK_PIZZA(win->m_wxwindow)->bin_window, + gdk_window, flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL /* no clipping */, @@ -337,7 +472,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, } void -wxRendererGTK::DrawDropArrow(wxWindow *win, +wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win), wxDC& dc, const wxRect& rect, int flags) @@ -349,11 +484,17 @@ wxRendererGTK::DrawDropArrow(wxWindow *win, // work for wxMemoryDC. So that is why we assume wxDC // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC // are derived from it) and use its m_window. - wxWindowDC& wdc = (wxWindowDC&)dc; - - // only doing debug-time checking here (it should - // probably be enough) - wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); + GdkWindow* gdk_window = NULL; +#if wxUSE_NEW_DC + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); + if (gtk_impl) + gdk_window = gtk_impl->GetGDKWindow(); +#else + gdk_window = dc.GetGDKWindow(); +#endif + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); // draw arrow so that there is even space horizontally // on both sides @@ -380,7 +521,7 @@ wxRendererGTK::DrawDropArrow(wxWindow *win, gtk_paint_arrow ( button->style, - wdc.m_window, + gdk_window, state, flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, NULL, @@ -406,16 +547,24 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, } void -wxRendererGTK::DrawCheckBox(wxWindow *win, +wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win), wxDC& dc, const wxRect& rect, int flags ) { GtkWidget *button = GetCheckButtonWidget(); - // for reason why we do this, see DrawDropArrow - wxWindowDC& wdc = (wxWindowDC&)dc; - wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); + GdkWindow* gdk_window = NULL; +#if wxUSE_NEW_DC + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); + if (gtk_impl) + gdk_window = gtk_impl->GetGDKWindow(); +#else + gdk_window = dc.GetGDKWindow(); +#endif + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); GtkStateType state; @@ -431,7 +580,7 @@ wxRendererGTK::DrawCheckBox(wxWindow *win, gtk_paint_check ( button->style, - wdc.m_window, + gdk_window, state, flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, NULL, @@ -444,16 +593,24 @@ wxRendererGTK::DrawCheckBox(wxWindow *win, } void -wxRendererGTK::DrawPushButton(wxWindow *win, +wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win), wxDC& dc, const wxRect& rect, int flags) { GtkWidget *button = GetButtonWidget(); - // for reason why we do this, see DrawDropArrow - wxWindowDC& wdc = (wxWindowDC&)dc; - wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); + GdkWindow* gdk_window = NULL; +#if wxUSE_NEW_DC + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); + if (gtk_impl) + gdk_window = gtk_impl->GetGDKWindow(); +#else + gdk_window = dc.GetGDKWindow(); +#endif + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); // draw button GtkStateType state; @@ -470,7 +627,7 @@ wxRendererGTK::DrawPushButton(wxWindow *win, gtk_paint_box ( button->style, - wdc.m_window, + gdk_window, state, flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, NULL, @@ -486,31 +643,89 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win, const wxRect& rect, int flags ) { + GdkWindow* gdk_window = NULL; +#if wxUSE_NEW_DC + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); + if (gtk_impl) + gdk_window = gtk_impl->GetGDKWindow(); +#else + gdk_window = dc.GetGDKWindow(); +#endif + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + + int x_diff = 0; + if (win->GetLayoutDirection() == wxLayout_RightToLeft) + x_diff = rect.width; + GtkStateType state; if (flags & wxCONTROL_SELECTED) { - if (flags & wxCONTROL_FOCUSED) - state = GTK_STATE_SELECTED; - else - state = GTK_STATE_INSENSITIVE; + // the wxCONTROL_FOCUSED state is deduced + // directly from the m_wxwindow by GTK+ + state = GTK_STATE_SELECTED; - gtk_paint_flat_box( win->m_wxwindow->style, - GTK_PIZZA(win->m_wxwindow)->bin_window, + gtk_paint_flat_box( win->m_widget->style, + gdk_window, state, GTK_SHADOW_NONE, NULL, win->m_wxwindow, - "treeview", - dc.LogicalToDeviceX(rect.x), + "cell_even", + dc.LogicalToDeviceX(rect.x) - x_diff, dc.LogicalToDeviceY(rect.y), rect.width, rect.height ); } + else // !wxCONTROL_SELECTED + { + state = GTK_STATE_NORMAL; + } - if (flags & wxCONTROL_CURRENT) + if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED)) { - dc.SetPen( *wxBLACK_PEN ); - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc.DrawRectangle( rect ); + gtk_paint_focus( win->m_widget->style, + gdk_window, + state, + NULL, + win->m_wxwindow, + "treeview", + dc.LogicalToDeviceX(rect.x), + dc.LogicalToDeviceY(rect.y), + rect.width, + rect.height ); } } + +void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) +{ + GdkWindow* gdk_window = NULL; +#if wxUSE_NEW_DC + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); + if (gtk_impl) + gdk_window = gtk_impl->GetGDKWindow(); +#else + gdk_window = dc.GetGDKWindow(); +#endif + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + + GtkStateType state; + if (flags & wxCONTROL_SELECTED) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_NORMAL; + + gtk_paint_focus( win->m_widget->style, + gdk_window, + state, + NULL, + win->m_wxwindow, + NULL, + dc.LogicalToDeviceX(rect.x), + dc.LogicalToDeviceY(rect.y), + rect.width, + rect.height ); +}