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

16
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 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:
void DrawMacThemeButton(wxWindow *win,
@@ -351,7 +351,7 @@ wxRendererMac::DrawMacThemeButton(wxWindow *win,
drawInfo.adornment = adornment;
if (flags & wxCONTROL_FOCUSED)
drawInfo.adornment |= kThemeAdornmentFocus;
HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
}
}
@@ -366,7 +366,7 @@ wxRendererMac::DrawCheckBox(wxWindow *win,
flags |= wxCONTROL_SELECTED;
int kind;
if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL ||
(win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
kind = kThemeCheckBoxSmall;
@@ -469,7 +469,7 @@ void wxRendererMac::DrawChoice(wxWindow* win, wxDC& dc,
const wxRect& rect, int flags)
{
int kind;
if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL ||
(win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
kind = kThemePopupButtonSmall;
@@ -487,7 +487,7 @@ void wxRendererMac::DrawComboBox(wxWindow* win, wxDC& dc,
const wxRect& rect, int flags)
{
int kind;
if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL ||
(win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
kind = kThemeComboBoxSmall;
@@ -500,11 +500,11 @@ void wxRendererMac::DrawComboBox(wxWindow* win, wxDC& dc,
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)
{
int kind;
if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL ||
(win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
kind = kThemeRadioButtonSmall;
@@ -532,7 +532,7 @@ void wxRendererMac::DrawTextCtrl(wxWindow* win, wxDC& dc,
dc.SetBrush( *wxWHITE_BRUSH );
dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle(rect);
dc.SetBrush( *wxTRANSPARENT_BRUSH );
HIRect hiRect = CGRectMake( x, y, w, h );