X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02f07b1980c4b5dc289340de3835f90662c759a3..ada175836e7b9e456b7f32d82bfb5f6b21d5608d:/src/gtk/renderer.cpp diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index e3c002a91a..9889c5e4da 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -36,7 +36,6 @@ #include "wx/dcgraph.h" #include "wx/gtk/dc.h" #include "wx/gtk/private.h" -#include "wx/gtk/private/win_gtk.h" #include @@ -55,6 +54,9 @@ public: wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, wxHeaderButtonParams* params = NULL); + virtual int GetHeaderButtonHeight(wxWindow *win); + + // draw the expanded/collapsed icon for a tree control item virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, @@ -97,24 +99,24 @@ public: const wxRect& rect, int flags = 0); - virtual void DrawChoice(wxWindow* win, - wxDC& dc, - const wxRect& rect, + virtual void DrawChoice(wxWindow* win, + wxDC& dc, + const wxRect& rect, int flags=0); - virtual void DrawComboBox(wxWindow* win, - wxDC& dc, - const wxRect& rect, + virtual void DrawComboBox(wxWindow* win, + wxDC& dc, + const wxRect& rect, int flags=0); - virtual void DrawTextCtrl(wxWindow* win, - wxDC& dc, - const wxRect& rect, + virtual void DrawTextCtrl(wxWindow* win, + wxDC& dc, + const wxRect& rect, int flags=0); - virtual void DrawRadioButton(wxWindow* win, - wxDC& dc, - const wxRect& rect, + virtual void DrawRadioBitmap(wxWindow* win, + wxDC& dc, + const wxRect& rect, int flags=0); virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0); @@ -139,10 +141,10 @@ wxRendererNative& wxRendererNative::GetDefault() static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc) { GdkWindow* gdk_window = NULL; - + #if wxUSE_GRAPHICS_CONTEXT if ( dc.IsKindOf( CLASSINFO(wxGCDC) ) ) - gdk_window = WX_PIZZA(win->m_wxwindow)->m_backing_window; + gdk_window = win->GTKGetDrawingWindow(); else #endif { @@ -155,6 +157,11 @@ static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc) gdk_window = dc.GetGDKWindow(); #endif } + +#if !wxUSE_GRAPHICS_CONTEXT + wxUnusedVar(win); +#endif + return gdk_window; } @@ -172,6 +179,10 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, { 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, @@ -205,6 +216,17 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); } +int wxRendererGTK::GetHeaderButtonHeight(wxWindow *WXUNUSED(win)) +{ + GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget(); + + GtkRequisition req; + GTK_WIDGET_GET_CLASS(button)->size_request(button, &req); + + return req.height; +} + + // draw a ">" or "v" button void wxRendererGTK::DrawTreeItemButton(wxWindow* win, @@ -495,9 +517,9 @@ wxRendererGTK::DrawPushButton(wxWindow* win, NULL, button, "button", - dc.LogicalToDeviceX(rect.x), - dc.LogicalToDeviceY(rect.y), - rect.width, + dc.LogicalToDeviceX(rect.x), + dc.LogicalToDeviceY(rect.y), + rect.width, rect.height ); } @@ -508,6 +530,8 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win, const wxRect& rect, int flags ) { + GtkWidget *tree = wxGTKPrivate::GetTreeWidget(); + GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); wxASSERT_MSG( gdk_window, wxT("cannot use wxRendererNative on wxDC of this type") ); @@ -516,14 +540,15 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win, if (win->GetLayoutDirection() == wxLayout_RightToLeft) x_diff = rect.width; - GtkStateType state; + GtkStateType state = GTK_STATE_NORMAL; + if (flags & wxCONTROL_SELECTED) { // the wxCONTROL_FOCUSED state is deduced // directly from the m_wxwindow by GTK+ state = GTK_STATE_SELECTED; - gtk_paint_flat_box( win->m_widget->style, + gtk_paint_flat_box( tree->style, // win->m_widget->style, gdk_window, state, GTK_SHADOW_NONE, @@ -542,7 +567,10 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win, if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED)) { - gtk_paint_focus( win->m_widget->style, + if (flags & wxCONTROL_SELECTED) + state = GTK_STATE_SELECTED; + + gtk_paint_focus( tree->style, gdk_window, state, NULL, @@ -552,7 +580,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win, // 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, @@ -594,7 +622,7 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in GtkStateType state = GTK_STATE_NORMAL; if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; - + if (flags & wxCONTROL_CURRENT ) GTK_WIDGET_SET_FLAGS( entry, GTK_HAS_FOCUS ); else @@ -602,7 +630,7 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_paint_shadow ( - entry->style, + entry->style, gdk_window, state, GTK_SHADOW_OUT, @@ -612,7 +640,7 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in dc.LogicalToDeviceX(rect.x), dc.LogicalToDeviceY(rect.y), rect.width, - rect.height + rect.height ); } @@ -626,7 +654,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in GtkStateType state = GTK_STATE_NORMAL; if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; - + if (flags & wxCONTROL_CURRENT ) GTK_WIDGET_SET_FLAGS( combo, GTK_HAS_FOCUS ); else @@ -634,7 +662,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_paint_shadow ( - combo->style, + combo->style, gdk_window, state, GTK_SHADOW_OUT, @@ -644,7 +672,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in dc.LogicalToDeviceX(rect.x), dc.LogicalToDeviceY(rect.y), rect.width, - rect.height + rect.height ); wxRect r = rect; @@ -656,7 +684,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_paint_arrow ( - combo->style, + combo->style, gdk_window, state, GTK_SHADOW_OUT, @@ -677,7 +705,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_paint_box ( - combo->style, + combo->style, gdk_window, state, GTK_SHADOW_ETCHED_OUT, @@ -698,20 +726,20 @@ void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc, DrawComboBox( win, dc, rect, flags ); } - + // Draw a themed radio button -void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) +void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget(); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); - + GtkShadowType shadow_type = GTK_SHADOW_OUT; if ( flags & wxCONTROL_CHECKED ) shadow_type = GTK_SHADOW_IN; else if ( flags & wxCONTROL_UNDETERMINED ) shadow_type = GTK_SHADOW_ETCHED_IN; - + GtkStateType state = GTK_STATE_NORMAL; if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; @@ -731,8 +759,8 @@ void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, NULL, button, "radiobutton", - dc.LogicalToDeviceX(rect.x), - dc.LogicalToDeviceY(rect.y), + dc.LogicalToDeviceX(rect.x), + dc.LogicalToDeviceY(rect.y), rect.width, rect.height ); }