From a2ee1945871d7b9d71ec18954ffb2f0f239c2e57 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Thu, 12 Feb 2009 01:06:53 +0000 Subject: [PATCH] Restore DrawRadioButton to the main wxRenderer API, create a method overload for the wxUniv API so that it can coexist with the wxUniv method of the same name. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/renderer.h | 6 +++--- include/wx/univ/renderer.h | 7 +++++++ src/generic/renderg.cpp | 4 ++-- src/gtk/renderer.cpp | 4 ++-- src/osx/carbon/renderer.cpp | 4 ++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/include/wx/renderer.h b/include/wx/renderer.h index fed5b7f699..16bd75f9bf 100644 --- a/include/wx/renderer.h +++ b/include/wx/renderer.h @@ -278,7 +278,7 @@ public: int flags = 0) = 0; // Draw a native wxRadioButton (just the graphical portion) - virtual void DrawOptionButton(wxWindow* win, + virtual void DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) = 0; @@ -443,11 +443,11 @@ public: int flags = 0) { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); } - virtual void DrawOptionButton(wxWindow* win, + virtual void DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) - { m_rendererNative.DrawOptionButton( win, dc, rect, flags); } + { m_rendererNative.DrawRadioButton( win, dc, rect, flags); } virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) { return m_rendererNative.GetSplitterParams(win); } diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index cec9197297..ddbf384e5a 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -208,6 +208,13 @@ public: wxAlignment align = wxALIGN_LEFT, int indexAccel = -1) = 0; + // draw a radio button sans label or bitmap, for wxRenderer API compat. + virtual void DrawRadioButton(wxDC& dc, + const wxRect& rect, + int flags = 0, + wxAlignment align = wxALIGN_LEFT) + { DrawRadioButton(dc, wxEmptyString, wxNullBitmap, rect, flags, align); } + #if wxUSE_TOOLBAR // draw a toolbar button (label may be empty, bitmap may be invalid, if // both conditions are true this function draws a separator) diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index b055226017..4fcd52f56f 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -118,7 +118,7 @@ public: virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); - virtual void DrawOptionButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); + virtual void DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); @@ -743,7 +743,7 @@ void wxRendererGeneric::DrawComboBox(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc) wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawComboBox"); } -void wxRendererGeneric::DrawOptionButton(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc), +void wxRendererGeneric::DrawRadioButton(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc), const wxRect& WXUNUSED(rect), int WXUNUSED(flags)) { wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawRadioButton"); diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index 2411e870ad..a70d4e35b7 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -114,7 +114,7 @@ public: const wxRect& rect, int flags=0); - virtual void DrawOptionButton(wxWindow* win, + virtual void DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); @@ -728,7 +728,7 @@ void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc, // Draw a themed radio button -void wxRendererGTK::DrawOptionButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) +void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget(); diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp index cc98ee5651..f8e770f425 100644 --- a/src/osx/carbon/renderer.cpp +++ b/src/osx/carbon/renderer.cpp @@ -100,7 +100,7 @@ public: virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); - virtual void DrawOptionButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); + virtual void DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); private: void DrawMacThemeButton(wxWindow *win, @@ -500,7 +500,7 @@ void wxRendererMac::DrawComboBox(wxWindow* win, wxDC& dc, DrawMacThemeButton(win, dc, rect, flags, kind, kThemeAdornmentNone); } -void wxRendererMac::DrawOptionButton(wxWindow* win, wxDC& dc, +void wxRendererMac::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { int kind; -- 2.45.2