Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-02-12 01:06:53 +00:00
parent 5ec8cc4ddd
commit a2ee194587
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/renderer.h
View File

@@ -278,7 +278,7 @@ public:
int flags = 0) = 0; int flags = 0) = 0;
// Draw a native wxRadioButton (just the graphical portion) // Draw a native wxRadioButton (just the graphical portion)
virtual void DrawOptionButton(wxWindow* win, virtual void DrawRadioButton(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) = 0; int flags = 0) = 0;
@@ -443,11 +443,11 @@ public:
int flags = 0) int flags = 0)
{ m_rendererNative.DrawTextCtrl( win, dc, rect, flags); } { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); }
virtual void DrawOptionButton(wxWindow* win, virtual void DrawRadioButton(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0)
{ m_rendererNative.DrawOptionButton( win, dc, rect, flags); } { m_rendererNative.DrawRadioButton( win, dc, rect, flags); }
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win)
{ return m_rendererNative.GetSplitterParams(win); } { return m_rendererNative.GetSplitterParams(win); }

7
include/wx/univ/renderer.h
View File

@@ -208,6 +208,13 @@ public:
wxAlignment align = wxALIGN_LEFT, wxAlignment align = wxALIGN_LEFT,
int indexAccel = -1) = 0; 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 #if wxUSE_TOOLBAR
// draw a toolbar button (label may be empty, bitmap may be invalid, if // draw a toolbar button (label may be empty, bitmap may be invalid, if
// both conditions are true this function draws a separator) // both conditions are true this function draws a separator)

4
src/generic/renderg.cpp
View File

@@ -118,7 +118,7 @@ public:
virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); 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); virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
@@ -743,7 +743,7 @@ void wxRendererGeneric::DrawComboBox(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc)
wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawComboBox"); 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)) const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
{ {
wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawRadioButton"); wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawRadioButton");

4
src/gtk/renderer.cpp
View File

@@ -114,7 +114,7 @@ public:
const wxRect& rect, const wxRect& rect,
int flags=0); int flags=0);
virtual void DrawOptionButton(wxWindow* win, virtual void DrawRadioButton(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags=0); int flags=0);
@@ -728,7 +728,7 @@ void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc,
// Draw a themed radio button // 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(); GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();

4
src/osx/carbon/renderer.cpp
View File

@@ -100,7 +100,7 @@ public:
virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); 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: private:
void DrawMacThemeButton(wxWindow *win, void DrawMacThemeButton(wxWindow *win,
@@ -500,7 +500,7 @@ void wxRendererMac::DrawComboBox(wxWindow* win, wxDC& dc,
DrawMacThemeButton(win, dc, rect, flags, kind, kThemeAdornmentNone); 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) const wxRect& rect, int flags)
{ {
int kind; int kind;