From 191e43fd02e958cd302049c469fb0f5ca9b67ceb Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Mon, 2 Mar 2009 20:09:10 +0000 Subject: [PATCH] revert r59246; the window parameter was there by purpose (i.e. for consistency with other Get* methods -- even if unused); document what the win parameter does in the various wxRenderer::Get* methods git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/renderer.h | 14 +++----------- interface/wx/renderer.h | 27 ++++++++++++++------------- src/generic/gridctrl.cpp | 4 ++-- src/generic/renderg.cpp | 4 ++-- src/gtk/renderer.cpp | 4 ++-- src/msw/renderer.cpp | 4 ++-- src/osx/carbon/renderer.cpp | 4 ++-- 7 files changed, 27 insertions(+), 34 deletions(-) diff --git a/include/wx/renderer.h b/include/wx/renderer.h index 9a4bded205..16bd75f9bf 100644 --- a/include/wx/renderer.h +++ b/include/wx/renderer.h @@ -228,12 +228,8 @@ public: const wxRect& rect, int flags = 0) = 0; -#if WXWIN_COMPATIBILITY_2_8 // Returns the default size of a check box. - wxDEPRECATED_INLINE( virtual wxSize GetCheckBoxSize(wxWindow *WXUNUSED(win)), - return GetCheckBoxSize(); ); -#endif - virtual wxSize GetCheckBoxSize() const = 0; + virtual wxSize GetCheckBoxSize(wxWindow *win) = 0; // draw blank button // @@ -408,12 +404,8 @@ public: int flags = 0) { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); } -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED_INLINE( virtual wxSize GetCheckBoxSize(wxWindow *WXUNUSED(win)), - return m_rendererNative.GetCheckBoxSize(); ); -#endif - virtual wxSize GetCheckBoxSize() const - { return m_rendererNative.GetCheckBoxSize(); } + virtual wxSize GetCheckBoxSize(wxWindow *win) + { return m_rendererNative.GetCheckBoxSize(win); } virtual void DrawPushButton(wxWindow *win, wxDC& dc, diff --git a/interface/wx/renderer.h b/interface/wx/renderer.h index 61f3f56c07..0d0803e4f4 100644 --- a/interface/wx/renderer.h +++ b/interface/wx/renderer.h @@ -132,8 +132,9 @@ enum wxHeaderSortIconType @class wxDelegateRendererNative wxDelegateRendererNative allows reuse of renderers code by forwarding all the - wxRendererNative methods to the given object and thus allowing you to only - modify some of its methods -- without having to reimplement all of them. + wxRendererNative methods to the given object and + thus allowing you to only modify some of its methods -- without having to + reimplement all of them. Note that the "normal", inheritance-based approach, doesn't work with the renderers as it is impossible to derive from a class unknown at compile-time @@ -145,11 +146,11 @@ enum wxHeaderSortIconType by using this class. Except for the constructor, it has exactly the same methods as - wxRendererNative and their implementation is trivial: they are simply forwarded - to the real renderer. Note that the "real" renderer may, in turn, be a - wxDelegateRendererNative as well and that there may be arbitrarily many levels - like this -- but at the end of the chain there must be a real renderer which - does the drawing. + wxRendererNative and their implementation is + trivial: they are simply forwarded to the real renderer. Note that the "real" + renderer may, in turn, be a wxDelegateRendererNative as well and that there may + be arbitrarily many levels like this -- but at the end of the chain there must + be a real renderer which does the drawing. @library{wxcore} @category{gdi} @@ -210,7 +211,7 @@ public: virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0 ); - virtual wxSize GetCheckBoxSize() const; + virtual wxSize GetCheckBoxSize(wxWindow *win); virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0 ); @@ -447,19 +448,19 @@ public: /** Returns the size of a check box. + The @a win parameter is not used currently and can be @NULL. */ - virtual wxSize GetCheckBoxSize() const = 0; + virtual wxSize GetCheckBoxSize(wxWindow* win) = 0; /** Returns the height of a header button, either a fixed platform height if - available, or a - generic height based on the window's font. + available, or a generic height based on the @a win window's font. */ virtual int GetHeaderButtonHeight(wxWindow* win) = 0; /** - Get the splitter parameters, see - wxSplitterRenderParams. + Get the splitter parameters, see wxSplitterRenderParams. + The @a win parameter should be a wxSplitterWindow. */ virtual wxSplitterRenderParams GetSplitterParams(const wxWindow* win) = 0; diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp index 1047bf8d99..54a79a9b0d 100644 --- a/src/generic/gridctrl.cpp +++ b/src/generic/gridctrl.cpp @@ -743,7 +743,7 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params) wxSize wxGridCellBoolRenderer::ms_sizeCheckMark; -wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& WXUNUSED(grid), +wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid, wxGridCellAttr& WXUNUSED(attr), wxDC& WXUNUSED(dc), int WXUNUSED(row), @@ -752,7 +752,7 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& WXUNUSED(grid), // compute it only once (no locks for MT safeness in GUI thread...) if ( !ms_sizeCheckMark.x ) { - ms_sizeCheckMark = wxRendererNative::Get().GetCheckBoxSize(); + ms_sizeCheckMark = wxRendererNative::Get().GetCheckBoxSize(&grid); } return ms_sizeCheckMark; diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 9a0c7d6f2a..4fcd52f56f 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -98,7 +98,7 @@ public: const wxRect& rect, int flags = 0); - virtual wxSize GetCheckBoxSize() const; + virtual wxSize GetCheckBoxSize(wxWindow *win); virtual void DrawPushButton(wxWindow *win, wxDC& dc, @@ -625,7 +625,7 @@ wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win), } } -wxSize wxRendererGeneric::GetCheckBoxSize() const +wxSize wxRendererGeneric::GetCheckBoxSize(wxWindow *WXUNUSED(win)) { return wxSize(16, 16); } diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index f3b5cd45af..a70d4e35b7 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -121,7 +121,7 @@ public: virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0); - virtual wxSize GetCheckBoxSize() const; + virtual wxSize GetCheckBoxSize(wxWindow *win); virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); }; @@ -428,7 +428,7 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, } wxSize -wxRendererGTK::GetCheckBoxSize() const +wxRendererGTK::GetCheckBoxSize(wxWindow *WXUNUSED(win)) { gint indicator_size, indicator_spacing; gtk_widget_style_get(wxGTKPrivate::GetCheckButtonWidget(), diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index c8f46f0274..094ad6c8b8 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -213,7 +213,7 @@ public: const wxRect& rect, int flags=0); - virtual wxSize GetCheckBoxSize() const; + virtual wxSize GetCheckBoxSize(wxWindow *win); virtual int GetHeaderButtonHeight(wxWindow *win); @@ -388,7 +388,7 @@ void wxRendererMSW::DrawFocusRect(wxWindow * WXUNUSED(win), ::DrawFocusRect(GraphicsHDC(&dc), &rc); } -wxSize wxRendererMSW::GetCheckBoxSize() const +wxSize wxRendererMSW::GetCheckBoxSize(wxWindow * WXUNUSED(win)) { return wxSize(::GetSystemMetrics(SM_CXMENUCHECK), ::GetSystemMetrics(SM_CYMENUCHECK)); diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp index ecae8ddd39..f8e770f425 100644 --- a/src/osx/carbon/renderer.cpp +++ b/src/osx/carbon/renderer.cpp @@ -75,7 +75,7 @@ public: const wxRect& rect, int flags = 0); - virtual wxSize GetCheckBoxSize() const; + virtual wxSize GetCheckBoxSize(wxWindow* win); virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, @@ -381,7 +381,7 @@ wxRendererMac::DrawCheckBox(wxWindow *win, kind, kThemeAdornmentNone); } -wxSize wxRendererMac::GetCheckBoxSize() const +wxSize wxRendererMac::GetCheckBoxSize(wxWindow* WXUNUSED(win)) { wxSize size; SInt32 width, height; -- 2.45.2