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

no changes (de-TABified, undid some horrors with which someone replaced my ?: operators

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-02-14 21:29:34 +00:00
parent ba696cfadf
commit cc4bc3a06b
1 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/univ/themes/win32.cpp
View File

@@ -2273,20 +2273,17 @@ void wxWin32Renderer::DrawRadioButton(wxDC& dc,
wxAlignment align, wxAlignment align,
int indexAccel) int indexAccel)
{ {
wxBitmap bmp;
if ( bitmap.Ok() ) if ( bitmap.Ok() )
DrawCheckOrRadioButton(dc, label, bmp = bitmap;
bitmap,
rect, flags, align, indexAccel,
FOCUS_RECT_OFFSET_Y); // default focus rect offset
else else
{ bmp = GetRadioBitmap(flags);
wxBitmap rbitmap(GetRadioBitmap(flags));
DrawCheckOrRadioButton(dc, label, DrawCheckOrRadioButton(dc, label,
rbitmap, bmp,
rect, flags, align, indexAccel, rect, flags, align, indexAccel,
FOCUS_RECT_OFFSET_Y); // default focus rect offset FOCUS_RECT_OFFSET_Y); // default focus rect offset
} }
}
void wxWin32Renderer::DrawCheckButton(wxDC& dc, void wxWin32Renderer::DrawCheckButton(wxDC& dc,
const wxString& label, const wxString& label,
@@ -2296,20 +2293,17 @@ void wxWin32Renderer::DrawCheckButton(wxDC& dc,
wxAlignment align, wxAlignment align,
int indexAccel) int indexAccel)
{ {
wxBitmap bmp;
if ( bitmap.Ok() ) if ( bitmap.Ok() )
DrawCheckOrRadioButton(dc, label, bmp = bitmap;
bitmap,
rect, flags, align, indexAccel,
0); // no focus rect offset for checkboxes
else else
{ bmp = GetCheckBitmap(flags);
wxBitmap cbitmap(GetCheckBitmap(flags));
DrawCheckOrRadioButton(dc, label, DrawCheckOrRadioButton(dc, label,
cbitmap, bmp,
rect, flags, align, indexAccel, rect, flags, align, indexAccel,
0); // no focus rect offset for checkboxes 0); // no focus rect offset for checkboxes
} }
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// text control // text control