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

Rename wxRendererNative::DrawRadioButton() to DrawRadioBitmap().

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2009-08-20 00:44:22 +00:00
parent 995a95737a
commit 6e6b532c1a
8 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/univ/themes/gtk.cpp
View File

@@ -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;