no changes (de-TABified, undid some horrors with which someone replaced my ?: operators
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2273,20 +2273,17 @@ void wxWin32Renderer::DrawRadioButton(wxDC& dc,
|
||||
wxAlignment align,
|
||||
int indexAccel)
|
||||
{
|
||||
wxBitmap bmp;
|
||||
if ( bitmap.Ok() )
|
||||
DrawCheckOrRadioButton(dc, label,
|
||||
bitmap,
|
||||
rect, flags, align, indexAccel,
|
||||
FOCUS_RECT_OFFSET_Y); // default focus rect offset
|
||||
bmp = bitmap;
|
||||
else
|
||||
{
|
||||
wxBitmap rbitmap(GetRadioBitmap(flags));
|
||||
bmp = GetRadioBitmap(flags);
|
||||
|
||||
DrawCheckOrRadioButton(dc, label,
|
||||
rbitmap,
|
||||
bmp,
|
||||
rect, flags, align, indexAccel,
|
||||
FOCUS_RECT_OFFSET_Y); // default focus rect offset
|
||||
}
|
||||
}
|
||||
|
||||
void wxWin32Renderer::DrawCheckButton(wxDC& dc,
|
||||
const wxString& label,
|
||||
@@ -2296,20 +2293,17 @@ void wxWin32Renderer::DrawCheckButton(wxDC& dc,
|
||||
wxAlignment align,
|
||||
int indexAccel)
|
||||
{
|
||||
wxBitmap bmp;
|
||||
if ( bitmap.Ok() )
|
||||
DrawCheckOrRadioButton(dc, label,
|
||||
bitmap,
|
||||
rect, flags, align, indexAccel,
|
||||
0); // no focus rect offset for checkboxes
|
||||
bmp = bitmap;
|
||||
else
|
||||
{
|
||||
wxBitmap cbitmap(GetCheckBitmap(flags));
|
||||
bmp = GetCheckBitmap(flags);
|
||||
|
||||
DrawCheckOrRadioButton(dc, label,
|
||||
cbitmap,
|
||||
bmp,
|
||||
rect, flags, align, indexAccel,
|
||||
0); // no focus rect offset for checkboxes
|
||||
}
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// text control
|
||||
|
Reference in New Issue
Block a user