X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10d302224e3555520f3e3c29d4dc7b7a9654b295..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/gtk1/renderer.cpp diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp index beb39a217f..04cd173fd4 100644 --- a/src/gtk1/renderer.cpp +++ b/src/gtk1/renderer.cpp @@ -48,10 +48,12 @@ class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererNative { public: // draw the header control button (used by wxListCtrl) - virtual void DrawHeaderButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0); + virtual int DrawHeaderButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0, + wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, + wxHeaderButtonParams* params=NULL); virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, @@ -121,11 +123,13 @@ wxRendererGTK::GetButtonWidget() // list/tree controls drawing // ---------------------------------------------------------------------------- -void +int wxRendererGTK::DrawHeaderButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags) + int flags, + wxHeaderSortIconType WXUNUSED(sortArrow), + wxHeaderButtonParams* WXUNUSED(params)) { GtkWidget *button = GetButtonWidget(); @@ -143,6 +147,8 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, "button", dc.LogicalToDeviceX(rect.x) -1, rect.y -1, rect.width +2, rect.height +2 ); + + return rect.width + 2; } // ---------------------------------------------------------------------------- @@ -287,7 +293,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, GTK_PIZZA(win->m_wxwindow)->bin_window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, - (GdkRectangle*) NULL, + NULL, win->m_wxwindow, (char *)"paned", // const_cast isVert ? position : size.x - 2*SASH_SIZE,