X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/345c78ca5fa57ea6c7dc7e6a05496a8e82aa2b50..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/gtk/renderer.cpp diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index 5f74edc88b..b65721598c 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -34,10 +34,13 @@ #endif #include "wx/dcgraph.h" +#ifndef __WXGTK3__ #include "wx/gtk/dc.h" -#include "wx/gtk/private.h" +#endif #include +#include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" // ---------------------------------------------------------------------------- // wxRendererGTK: our wxRendererNative implementation @@ -140,7 +143,28 @@ wxRendererNative& wxRendererNative::GetDefault() return s_rendererGTK; } -static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc) +#ifdef __WXGTK3__ +#define NULL_RECT +typedef cairo_t wxGTKDrawable; + +static cairo_t* wxGetGTKDrawable(wxWindow*, const wxDC& dc) +{ + wxGraphicsContext* gc = dc.GetGraphicsContext(); + wxCHECK_MSG(gc, NULL, "cannot use wxRendererNative on wxDC of this type"); + return static_cast(gc->GetNativeContext()); +} + +static const GtkStateFlags stateTypeToFlags[] = { + GTK_STATE_FLAG_NORMAL, GTK_STATE_FLAG_ACTIVE, GTK_STATE_FLAG_PRELIGHT, + GTK_STATE_FLAG_SELECTED, GTK_STATE_FLAG_INSENSITIVE, GTK_STATE_FLAG_INCONSISTENT, + GTK_STATE_FLAG_FOCUSED +}; + +#else +#define NULL_RECT NULL, +typedef GdkWindow wxGTKDrawable; + +static GdkWindow* wxGetGTKDrawable(wxWindow* win, wxDC& dc) { GdkWindow* gdk_window = NULL; @@ -150,14 +174,12 @@ static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc) else #endif { -#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 + else + wxFAIL_MSG("cannot use wxRendererNative on wxDC of this type"); } #if !wxUSE_GRAPHICS_CONTEXT @@ -166,6 +188,7 @@ static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc) return gdk_window; } +#endif // ---------------------------------------------------------------------------- // list/tree controls drawing @@ -179,17 +202,12 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, wxHeaderSortIconType sortArrow, wxHeaderButtonParams* params) { - GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget(); if (flags & wxCONTROL_SPECIAL) button = wxGTKPrivate::GetHeaderButtonWidgetFirst(); if (flags & wxCONTROL_DIRTY) button = wxGTKPrivate::GetHeaderButtonWidgetLast(); - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); - 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; @@ -203,6 +221,19 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, state = GTK_STATE_PRELIGHT; } +#ifdef __WXGTK3__ + cairo_t* cr = wxGetGTKDrawable(win, dc); + if (cr) + { + GtkStyleContext* sc = gtk_widget_get_style_context(button); + gtk_style_context_save(sc); + gtk_style_context_set_state(sc, stateTypeToFlags[state]); + gtk_render_background(sc, cr, rect.x - x_diff+4, rect.y+4, rect.width-8, rect.height-8); + gtk_render_frame(sc, cr, rect.x - x_diff+4, rect.y+4, rect.width-8, rect.height-8); + gtk_style_context_restore(sc); + } +#else + GdkWindow* gdk_window = wxGetGTKDrawable(win, dc); gtk_paint_box ( gtk_widget_get_style(button), @@ -214,6 +245,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, "button", dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height ); +#endif return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); } @@ -223,7 +255,11 @@ int wxRendererGTK::GetHeaderButtonHeight(wxWindow *WXUNUSED(win)) GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget(); GtkRequisition req; +#ifdef __WXGTK3__ + gtk_widget_get_preferred_height(button, NULL, &req.height); +#else GTK_WIDGET_GET_CLASS(button)->size_request(button, &req); +#endif return req.height; } @@ -242,10 +278,6 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, { GtkWidget *tree = wxGTKPrivate::GetTreeWidget(); - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); - wxASSERT_MSG( gdk_window, - wxT("cannot use wxRendererNative on wxDC of this type") ); - GtkStateType state; if ( flags & wxCONTROL_CURRENT ) state = GTK_STATE_PRELIGHT; @@ -256,7 +288,19 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, if (win->GetLayoutDirection() == wxLayout_RightToLeft) x_diff = rect.width; +#ifdef __WXGTK3__ + cairo_t* cr = wxGetGTKDrawable(win, dc); + if (cr) + { + gtk_widget_set_state_flags(tree, stateTypeToFlags[state], true); + GtkStyleContext* sc = gtk_widget_get_style_context(tree); + gtk_render_expander(sc, cr, rect.x - x_diff, rect.y, rect.width, rect.height); + } +#else // x and y parameters specify the center of the expander + GdkWindow* gdk_window = wxGetGTKDrawable(win, dc); + if (gdk_window == NULL) + return; gtk_paint_expander ( gtk_widget_get_style(tree), @@ -270,6 +314,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED ); +#endif } @@ -320,15 +365,16 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win, return; } - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); - wxASSERT_MSG( gdk_window, - wxT("cannot use wxRendererNative on wxDC of this type") ); - - wxCoord full_size = GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget()); + wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc); + if (drawable == NULL) + return; // are we drawing vertical or horizontal splitter? const bool isVert = orient == wxVERTICAL; + GtkWidget* widget = wxGTKPrivate::GetSplitterWidget(orient); + const int full_size = GetGtkSplitterFullSize(widget); + GdkRectangle rect; if ( isVert ) @@ -350,6 +396,18 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win, if (win->GetLayoutDirection() == wxLayout_RightToLeft) x_diff = rect.width; +#ifdef __WXGTK3__ + cairo_t* cr = wxGetGTKDrawable(win, dc); + if (cr) + { + gtk_widget_set_state_flags(widget, stateTypeToFlags[flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL], true); + GtkStyleContext* sc = gtk_widget_get_style_context(widget); + gtk_render_handle(sc, cr, rect.x - x_diff, rect.y, rect.width, rect.height); + } +#else + GdkWindow* gdk_window = wxGetGTKDrawable(win, dc); + if (gdk_window == NULL) + return; gtk_paint_handle ( gtk_widget_get_style(win->m_wxwindow), @@ -365,6 +423,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win, rect.height, isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL ); +#endif } void @@ -380,19 +439,12 @@ 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. - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); - 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 - int arrowX = rect.width/4 + 1; - int arrowWidth = rect.width - (arrowX*2); - - // scale arrow's height accoording to the width - int arrowHeight = rect.width/3; - int arrowY = (rect.height-arrowHeight)/2 + - ((rect.height-arrowHeight) & 1); + const int size = rect.width / 2; + const int x = rect.x + (size + 1) / 2; + const int y = rect.y + (rect.height - size + 1) / 2; GtkStateType state; @@ -405,6 +457,18 @@ wxRendererGTK::DrawDropArrow(wxWindow* win, else state = GTK_STATE_NORMAL; +#ifdef __WXGTK3__ + cairo_t* cr = wxGetGTKDrawable(win, dc); + if (cr) + { + gtk_widget_set_state_flags(button, stateTypeToFlags[state], true); + GtkStyleContext* sc = gtk_widget_get_style_context(button); + gtk_render_arrow(sc, cr, G_PI, x, y, size); + } +#else + GdkWindow* gdk_window = wxGetGTKDrawable(win, dc); + if (gdk_window == NULL) + return; // draw arrow on button gtk_paint_arrow ( @@ -417,11 +481,10 @@ wxRendererGTK::DrawDropArrow(wxWindow* win, "arrow", GTK_ARROW_DOWN, FALSE, - rect.x + arrowX, - rect.y + arrowY, - arrowWidth, - arrowHeight + x, y, + size, size ); +#endif } void @@ -455,16 +518,13 @@ wxRendererGTK::DrawCheckBox(wxWindow* win, { GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget(); - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); - 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); +#ifndef __WXGTK3__ GtkStateType state; if ( flags & wxCONTROL_PRESSED ) @@ -484,6 +544,35 @@ wxRendererGTK::DrawCheckBox(wxWindow* win, shadow_type = GTK_SHADOW_IN; else shadow_type = GTK_SHADOW_OUT; +#endif + +#ifdef __WXGTK3__ + cairo_t* cr = wxGetGTKDrawable(win, dc); + if (cr) + { + int stateFlags = GTK_STATE_FLAG_NORMAL; + if (flags & wxCONTROL_CHECKED) + stateFlags = GTK_STATE_FLAG_ACTIVE; + if (flags & wxCONTROL_DISABLED) + stateFlags |= GTK_STATE_FLAG_INSENSITIVE; + if (flags & wxCONTROL_UNDETERMINED) + stateFlags |= GTK_STATE_FLAG_INCONSISTENT; + if (flags & wxCONTROL_CURRENT) + stateFlags |= GTK_STATE_FLAG_PRELIGHT; + GtkStyleContext* sc = gtk_widget_get_style_context(button); + gtk_style_context_save(sc); + gtk_style_context_set_state(sc, GtkStateFlags(stateFlags)); + gtk_style_context_add_class(sc, GTK_STYLE_CLASS_CHECK); + gtk_render_check(sc, cr, + rect.x + (rect.width - indicator_size) / 2, + rect.y + (rect.height - indicator_size) / 2, + indicator_size, indicator_size); + gtk_style_context_restore(sc); + } +#else + GdkWindow* gdk_window = wxGetGTKDrawable(win, dc); + if (gdk_window == NULL) + return; gtk_paint_check ( @@ -498,6 +587,7 @@ wxRendererGTK::DrawCheckBox(wxWindow* win, dc.LogicalToDeviceY(rect.y) + indicator_spacing, indicator_size, indicator_size ); +#endif } void @@ -508,10 +598,6 @@ wxRendererGTK::DrawPushButton(wxWindow* win, { GtkWidget *button = wxGTKPrivate::GetButtonWidget(); - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); - wxASSERT_MSG( gdk_window, - wxT("cannot use wxRendererNative on wxDC of this type") ); - // draw button GtkStateType state; @@ -524,6 +610,22 @@ wxRendererGTK::DrawPushButton(wxWindow* win, else state = GTK_STATE_NORMAL; +#ifdef __WXGTK3__ + cairo_t* cr = wxGetGTKDrawable(win, dc); + if (cr) + { + GtkStyleContext* sc = gtk_widget_get_style_context(button); + gtk_style_context_save(sc); + gtk_style_context_set_state(sc, stateTypeToFlags[state]); + gtk_render_background(sc, cr, rect.x, rect.y, rect.width, rect.height); + gtk_render_frame(sc, cr, rect.x, rect.y, rect.width, rect.height); + gtk_style_context_restore(sc); + } +#else + GdkWindow* gdk_window = wxGetGTKDrawable(win, dc); + if (gdk_window == NULL) + return; + gtk_paint_box ( gtk_widget_get_style(button), @@ -538,6 +640,7 @@ wxRendererGTK::DrawPushButton(wxWindow* win, rect.width, rect.height ); +#endif } void @@ -546,11 +649,9 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win, const wxRect& rect, int flags ) { - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); - wxASSERT_MSG( gdk_window, - wxT("cannot use wxRendererNative on wxDC of this type") ); + wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc); - if (flags & wxCONTROL_SELECTED) + if (drawable && (flags & wxCONTROL_SELECTED)) { int x_diff = 0; if (win->GetLayoutDirection() == wxLayout_RightToLeft) @@ -559,10 +660,10 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win, // the wxCONTROL_FOCUSED state is deduced // directly from the m_wxwindow by GTK+ gtk_paint_flat_box(gtk_widget_get_style(wxGTKPrivate::GetTreeWidget()), - gdk_window, + drawable, GTK_STATE_SELECTED, GTK_SHADOW_NONE, - NULL, + NULL_RECT win->m_wxwindow, "cell_even", dc.LogicalToDeviceX(rect.x) - x_diff, @@ -577,9 +678,9 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win, void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); - wxASSERT_MSG( gdk_window, - wxT("cannot use wxRendererNative on wxDC of this type") ); + wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc); + if (drawable == NULL) + return; GtkStateType state; if (flags & wxCONTROL_SELECTED) @@ -587,24 +688,36 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i else state = GTK_STATE_NORMAL; +#ifdef __WXGTK3__ + GtkStyleContext* sc = gtk_widget_get_style_context(win->m_widget); + gtk_style_context_save(sc); + gtk_style_context_set_state(sc, stateTypeToFlags[state]); + gtk_render_focus(sc, drawable, rect.x, rect.y, rect.width, rect.height); + gtk_style_context_restore(sc); +#else gtk_paint_focus( gtk_widget_get_style(win->m_widget), - gdk_window, + drawable, state, - NULL, + NULL_RECT win->m_wxwindow, NULL, dc.LogicalToDeviceX(rect.x), dc.LogicalToDeviceY(rect.y), rect.width, rect.height ); +#endif } +//TODO: GTK3 implementations for the remaining functions below + // Uses the theme to draw the border and fill for something like a wxTextCtrl void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { GtkWidget *entry = wxGTKPrivate::GetTextEntryWidget(); - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); + wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc); + if (drawable == NULL) + return; GtkStateType state = GTK_STATE_NORMAL; if ( flags & wxCONTROL_DISABLED ) @@ -615,10 +728,10 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_paint_shadow ( gtk_widget_get_style(entry), - gdk_window, + drawable, state, GTK_SHADOW_OUT, - NULL, + NULL_RECT entry, "entry", dc.LogicalToDeviceX(rect.x), @@ -633,7 +746,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in { GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget(); - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); + wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc); GtkStateType state = GTK_STATE_NORMAL; if ( flags & wxCONTROL_DISABLED ) @@ -641,13 +754,16 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_widget_set_can_focus(combo, (flags & wxCONTROL_CURRENT) != 0); + if (drawable == NULL) + return; + gtk_paint_shadow ( gtk_widget_get_style(combo), - gdk_window, + drawable, state, GTK_SHADOW_OUT, - NULL, + NULL_RECT combo, "combobox", dc.LogicalToDeviceX(rect.x), @@ -666,10 +782,10 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_paint_arrow ( gtk_widget_get_style(combo), - gdk_window, + drawable, state, GTK_SHADOW_OUT, - NULL, + NULL_RECT combo, "arrow", GTK_ARROW_DOWN, @@ -687,10 +803,10 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_paint_box ( gtk_widget_get_style(combo), - gdk_window, + drawable, state, GTK_SHADOW_ETCHED_OUT, - NULL, + NULL_RECT combo, "vseparator", dc.LogicalToDeviceX(r.x), @@ -713,7 +829,9 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, { GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget(); - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); + wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc); + if (drawable == NULL) + return; GtkShadowType shadow_type = GTK_SHADOW_OUT; if ( flags & wxCONTROL_CHECKED ) @@ -734,10 +852,10 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, gtk_paint_option ( gtk_widget_get_style(button), - gdk_window, + drawable, state, shadow_type, - NULL, + NULL_RECT button, "radiobutton", dc.LogicalToDeviceX(rect.x),