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

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

@@ -641,8 +641,8 @@ private:
static const char *frame_button_close_xpm[] = { static const char *frame_button_close_xpm[] = {
"12 10 2 1", "12 10 2 1",
" c None", " c None",
". c black", ". c black",
" ", " ",
" .. .. ", " .. .. ",
" .. .. ", " .. .. ",
@@ -656,8 +656,8 @@ static const char *frame_button_close_xpm[] = {
static const char *frame_button_help_xpm[] = { static const char *frame_button_help_xpm[] = {
"12 10 2 1", "12 10 2 1",
" c None", " c None",
". c #000000", ". c #000000",
" .... ", " .... ",
" .. .. ", " .. .. ",
" .. .. ", " .. .. ",
@@ -671,8 +671,8 @@ static const char *frame_button_help_xpm[] = {
static const char *frame_button_maximize_xpm[] = { static const char *frame_button_maximize_xpm[] = {
"12 10 2 1", "12 10 2 1",
" c None", " c None",
". c #000000", ". c #000000",
" ......... ", " ......... ",
" ......... ", " ......... ",
" . . ", " . . ",
@@ -686,8 +686,8 @@ static const char *frame_button_maximize_xpm[] = {
static const char *frame_button_minimize_xpm[] = { static const char *frame_button_minimize_xpm[] = {
"12 10 2 1", "12 10 2 1",
" c None", " c None",
". c #000000", ". c #000000",
" ", " ",
" ", " ",
" ", " ",
@@ -701,8 +701,8 @@ static const char *frame_button_minimize_xpm[] = {
static const char *frame_button_restore_xpm[] = { static const char *frame_button_restore_xpm[] = {
"12 10 2 1", "12 10 2 1",
" c None", " c None",
". c #000000", ". c #000000",
" ...... ", " ...... ",
" ...... ", " ...... ",
" . . ", " . . ",
@@ -2211,10 +2211,10 @@ wxBitmap wxWin32Renderer::GetIndicator(IndicatorType indType, int flags)
if (xpm) if (xpm)
{ {
wxBitmap bmp(xpm); wxBitmap bmp(xpm);
return bmp; return bmp;
} }
else else
return wxNullBitmap; return wxNullBitmap;
} }
void wxWin32Renderer::DrawCheckOrRadioButton(wxDC& dc, void wxWin32Renderer::DrawCheckOrRadioButton(wxDC& dc,
@@ -2273,19 +2273,16 @@ void wxWin32Renderer::DrawRadioButton(wxDC& dc,
wxAlignment align, wxAlignment align,
int indexAccel) int indexAccel)
{ {
if (bitmap.Ok()) wxBitmap bmp;
DrawCheckOrRadioButton(dc, label, if ( bitmap.Ok() )
bitmap, bmp = 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,
@@ -2296,19 +2293,16 @@ void wxWin32Renderer::DrawCheckButton(wxDC& dc,
wxAlignment align, wxAlignment align,
int indexAccel) int indexAccel)
{ {
if (bitmap.Ok()) wxBitmap bmp;
DrawCheckOrRadioButton(dc, label, if ( bitmap.Ok() )
bitmap, bmp = 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
}
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------