From 6e6b532c1a5d0a061e084607e214005a200d5440 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 20 Aug 2009 00:44:22 +0000 Subject: [PATCH] Rename wxRendererNative::DrawRadioButton() to DrawRadioBitmap(). This old name function conflicted with the one in wxRenderer in wxUniv and also was misleading as this function draws only a bitmap and not the entire wxRadioButton control. The old workaround for the warnings about the function names conflict was ugly and unmaintainable, as proven by the fact that wxRenderer method signature already became different from the wxRendererNative one. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/renderer.h | 20 ++++++++++---------- include/wx/univ/renderer.h | 7 ------- interface/wx/renderer.h | 10 +++++----- src/generic/renderg.cpp | 6 +++--- src/gtk/renderer.cpp | 4 ++-- src/msw/renderer.cpp | 4 ++-- src/osx/carbon/renderer.cpp | 4 ++-- src/univ/themes/gtk.cpp | 10 +++++----- 8 files changed, 29 insertions(+), 36 deletions(-) diff --git a/include/wx/renderer.h b/include/wx/renderer.h index 16bd75f9bf..fbe6a105af 100644 --- a/include/wx/renderer.h +++ b/include/wx/renderer.h @@ -277,11 +277,11 @@ public: const wxRect& rect, int flags = 0) = 0; - // Draw a native wxRadioButton (just the graphical portion) - virtual void DrawRadioButton(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) = 0; + // Draw a native wxRadioButton bitmap + virtual void DrawRadioBitmap(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags = 0) = 0; // geometry functions // ------------------ @@ -443,11 +443,11 @@ public: int flags = 0) { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); } - virtual void DrawRadioButton(wxWindow* win, - wxDC& dc, - const wxRect& rect, - int flags = 0) - { m_rendererNative.DrawRadioButton( win, dc, rect, flags); } + virtual void DrawRadioBitmap(wxWindow* win, + wxDC& dc, + const wxRect& rect, + int flags = 0) + { m_rendererNative.DrawRadioBitmap(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 ddbf384e5a..cec9197297 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -208,13 +208,6 @@ 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/interface/wx/renderer.h b/interface/wx/renderer.h index 0d0803e4f4..b5d3fd3b83 100644 --- a/interface/wx/renderer.h +++ b/interface/wx/renderer.h @@ -409,22 +409,22 @@ public: /** Draw a native wxChoice */ - virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) = 0; + virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) = 0; /** Draw a native wxComboBox */ - virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) = 0; + virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) = 0; /** Draw a native wxTextCtrl frame */ - virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) = 0; + virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) = 0; /** - Draw a native wxRadioButton (just the button image, not the text) + Draw a native wxRadioButton bitmap. */ - virtual void DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) = 0; + virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) = 0; /** Return the currently used renderer. diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index c2c74c54bf..77dabb8f0b 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 DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); + virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); @@ -739,10 +739,10 @@ void wxRendererGeneric::DrawComboBox(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc) wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawComboBox"); } -void wxRendererGeneric::DrawRadioButton(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc), +void wxRendererGeneric::DrawRadioBitmap(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc), const wxRect& WXUNUSED(rect), int WXUNUSED(flags)) { - wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawRadioButton"); + wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawRadioBitmap"); } void wxRendererGeneric::DrawTextCtrl(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc), diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index a70d4e35b7..9889c5e4da 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -114,7 +114,7 @@ public: const wxRect& rect, int flags=0); - virtual void DrawRadioButton(wxWindow* win, + virtual void DrawRadioBitmap(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::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(); diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index 8c31c76192..2408a16dd8 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -225,7 +225,7 @@ public: const wxRect& rect, int flags=0); - virtual void DrawRadioButton(wxWindow* win, + virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); @@ -527,7 +527,7 @@ void wxRendererMSW::DrawChoice(wxWindow* win, wxDC& dc, // Draw a themed radio button -void wxRendererMSW::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) +void wxRendererMSW::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { #if wxUSE_UXTHEME wxUxThemeHandle hTheme(win, L"BUTTON"); diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp index 49e9c18244..b0138ca631 100644 --- a/src/osx/carbon/renderer.cpp +++ b/src/osx/carbon/renderer.cpp @@ -101,7 +101,7 @@ public: virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); - virtual void DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); + virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); private: void DrawMacThemeButton(wxWindow *win, @@ -501,7 +501,7 @@ void wxRendererMac::DrawComboBox(wxWindow* win, wxDC& dc, DrawMacThemeButton(win, dc, rect, flags, kind, kThemeAdornmentNone); } -void wxRendererMac::DrawRadioButton(wxWindow* win, wxDC& dc, +void wxRendererMac::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { int kind; diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index 89d9fd33f1..35d3924f79 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -328,7 +328,7 @@ protected: wxCoord y1, wxCoord y2); // draw the radio button bitmap for the given state - void DrawRadioBitmap(wxDC& dc, const wxRect& rect, int flags); + void DrawRadioButtonBitmap(wxDC& dc, const wxRect& rect, int flags); // common part of DrawMenuItem() and DrawMenuBarItem() void DoDrawMenuItem(wxDC& dc, @@ -997,9 +997,9 @@ void wxGTKRenderer::DrawCheckBitmap(wxDC& dc, const wxRect& rectTotal) dc.DrawRectangle(rect); } -void wxGTKRenderer::DrawRadioBitmap(wxDC& dc, - const wxRect& rect, - int flags) +void wxGTKRenderer::DrawRadioButtonBitmap(wxDC& dc, + const wxRect& rect, + int flags) { wxCoord x = rect.x, y = rect.y, @@ -1134,7 +1134,7 @@ wxBitmap wxGTKRenderer::GetRadioBitmap(int flags) bmp.Create(size.x, size.y); dc.SelectObject(bmp); - DrawRadioBitmap(dc, size, flags); + DrawRadioButtonBitmap(dc, size, flags); } return bmp; -- 2.45.2