minor cleanup, part 2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2005-12-01 23:32:47 +00:00
parent 97071cdbff
commit 17cfea0162
2 changed files with 5 additions and 4 deletions

View File

@@ -2009,7 +2009,7 @@ void wxDC::Clear(void)
} }
break ; break ;
default default:
break ; break ;
} }
} }

View File

@@ -544,8 +544,9 @@ bool wxToolBar::Realize()
#ifndef __WXWINCE__ #ifndef __WXWINCE__
int remapValue = (-1); int remapValue = (-1);
if (wxSystemOptions::HasOption(wxT("msw.remap"))) const wxChar *remapOptionStr = wxT("msw.remap");
remapValue = wxSystemOptions::GetOptionInt(wxT("msw.remap")); if (wxSystemOptions::HasOption( remapOptionStr ))
remapValue = wxSystemOptions::GetOptionInt( remapOptionStr );
doTransparent = (remapValue == 2); doTransparent = (remapValue == 2);
if (!doTransparent) if (!doTransparent)
@@ -590,7 +591,7 @@ bool wxToolBar::Realize()
wx_truncate_cast(wxCoord, nTools), wx_truncate_cast(wxCoord, nTools),
totalBitmapHeight = m_defaultHeight; totalBitmapHeight = m_defaultHeight;
// Create a bitmap and copy all the tool bitmaps to it // Create a bitmap and copy all the tool bitmaps into it
wxMemoryDC dcAllButtons; wxMemoryDC dcAllButtons;
wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight); wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
dcAllButtons.SelectObject(bitmap); dcAllButtons.SelectObject(bitmap);