From: David Surovell Date: Thu, 1 Dec 2005 23:32:47 +0000 (+0000) Subject: minor cleanup, part 2 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/17cfea01628866d8c0669d54406b37c550995597?ds=sidebyside minor cleanup, part 2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp index 47de1b4b9d..994394c5a6 100755 --- a/src/mac/carbon/dccg.cpp +++ b/src/mac/carbon/dccg.cpp @@ -2009,7 +2009,7 @@ void wxDC::Clear(void) } break ; - default + default: break ; } } diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index d091e383e1..2aadedd476 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -544,8 +544,9 @@ bool wxToolBar::Realize() #ifndef __WXWINCE__ int remapValue = (-1); - if (wxSystemOptions::HasOption(wxT("msw.remap"))) - remapValue = wxSystemOptions::GetOptionInt(wxT("msw.remap")); + const wxChar *remapOptionStr = wxT("msw.remap"); + if (wxSystemOptions::HasOption( remapOptionStr )) + remapValue = wxSystemOptions::GetOptionInt( remapOptionStr ); doTransparent = (remapValue == 2); if (!doTransparent) @@ -590,7 +591,7 @@ bool wxToolBar::Realize() wx_truncate_cast(wxCoord, nTools), 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; wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight); dcAllButtons.SelectObject(bitmap);