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

rename wxRendererNative::DrawRadioButton() to DrawOptionButton() to avoid conflict with wxUniv function with the same name

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-28 13:55:51 +00:00
parent 3b7fa2069b
commit 99c4be6806
4 changed files with 92 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
include/wx/renderer.h
View File

@@ -254,19 +254,34 @@ public:
// draw the focus rectangle around the label contained in the given rect // draw the focus rectangle around the label contained in the given rect
// //
// only wxCONTROL_SELECTED makes sense in flags here // only wxCONTROL_SELECTED makes sense in flags here
virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) = 0; virtual void DrawFocusRect(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags = 0) = 0;
// Draw a native wxChoice // 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 // 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 // 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 graphical portion) // Draw a native wxRadioButton (just the graphical portion)
virtual void DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) = 0; virtual void DrawOptionButton(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags = 0) = 0;
// geometry functions // geometry functions
// ------------------ // ------------------
@@ -386,7 +401,7 @@ public:
virtual void DrawCheckBox(wxWindow *win, virtual void DrawCheckBox(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0 ) int flags = 0)
{ m_rendererNative.DrawCheckBox( win, dc, rect, flags ); } { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); }
virtual wxSize GetCheckBoxSize(wxWindow *win) virtual wxSize GetCheckBoxSize(wxWindow *win)
@@ -395,29 +410,44 @@ public:
virtual void DrawPushButton(wxWindow *win, virtual void DrawPushButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0 ) int flags = 0)
{ m_rendererNative.DrawPushButton( win, dc, rect, flags ); } { m_rendererNative.DrawPushButton( win, dc, rect, flags ); }
virtual void DrawItemSelectionRect(wxWindow *win, virtual void DrawItemSelectionRect(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0 ) int flags = 0)
{ m_rendererNative.DrawItemSelectionRect( win, dc, rect, flags ); } { m_rendererNative.DrawItemSelectionRect( win, dc, rect, flags ); }
virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) virtual void DrawFocusRect(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
{ m_rendererNative.DrawFocusRect( win, dc, rect, flags ); } { m_rendererNative.DrawFocusRect( win, dc, rect, flags ); }
virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) virtual void DrawChoice(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
{ m_rendererNative.DrawChoice( win, dc, rect, flags); } { m_rendererNative.DrawChoice( win, dc, rect, flags); }
virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) virtual void DrawComboBox(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
{ m_rendererNative.DrawComboBox( win, dc, rect, flags); } { m_rendererNative.DrawComboBox( win, dc, rect, flags); }
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)
{ m_rendererNative.DrawTextCtrl( win, dc, rect, flags); } { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); }
virtual void DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) virtual void DrawOptionButton(wxWindow* win,
{ m_rendererNative.DrawRadioButton( win, dc, rect, flags); } wxDC& dc,
const wxRect& rect,
int flags = 0)
{ m_rendererNative.DrawOptionButton( 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); }

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 DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); virtual void DrawOptionButton(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)
// FIXME: Implement // FIXME: Implement
} }
void wxRendererGeneric::DrawRadioButton(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc), void wxRendererGeneric::DrawOptionButton(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
const wxRect& WXUNUSED(rect), int WXUNUSED(flags)) const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
{ {
// FIXME: Implement // FIXME: Implement

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 DrawRadioButton(wxWindow* win, virtual void DrawOptionButton(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::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) void wxRendererGTK::DrawOptionButton(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 DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); virtual void DrawOptionButton(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::DrawRadioButton(wxWindow* win, wxDC& dc, void wxRendererMac::DrawOptionButton(wxWindow* win, wxDC& dc,
const wxRect& rect, int flags) const wxRect& rect, int flags)
{ {
int kind; int kind;