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

Realize remap code cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2005-11-23 08:01:47 +00:00
parent 370d2fd7cc
commit bb86baea10
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/msw/tbar95.cpp
View File

@@ -554,21 +554,18 @@ bool wxToolBar::Realize()
const bool isVertical = HasFlag(wxTB_VERTICAL); const bool isVertical = HasFlag(wxTB_VERTICAL);
bool doRemap, doRemapBg, doTransparent; bool doRemap, doRemapBg, doTransparent;
#ifdef __WXWINCE__ doRemapBg = doRemap = doTransparent = false;
doRemapBg = false;
doRemap = false; #ifndef __WXWINCE__
doTransparent = false; int remapValue = (-1);
#else if (wxSystemOptions::HasOption(wxT("msw.remap")))
if (wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 2) remapValue = wxSystemOptions::GetOptionInt(wxT("msw.remap"));
doTransparent = (remapValue == 2);
if (!doTransparent)
{ {
doRemapBg = doRemap = false; doRemap = (remapValue != 0);
doTransparent = true;
}
else
{ doRemap = !wxSystemOptions::HasOption(wxT("msw.remap"))
|| wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 1;
doRemapBg = !doRemap; doRemapBg = !doRemap;
doTransparent = false;
} }
#endif #endif
@@ -611,6 +608,7 @@ bool wxToolBar::Realize()
wxMemoryDC dcAllButtons; wxMemoryDC dcAllButtons;
wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight); wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
dcAllButtons.SelectObject(bitmap); dcAllButtons.SelectObject(bitmap);
#ifdef __WXWINCE__ #ifdef __WXWINCE__
dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192))); dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192)));
#else #else
@@ -822,7 +820,6 @@ bool wxToolBar::Realize()
continue; continue;
} }
TBBUTTON& button = buttons[i]; TBBUTTON& button = buttons[i];
wxZeroMemory(button); wxZeroMemory(button);