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 47de1b4b9d4bcb05c733a6707f4848580733e599..994394c5a6482fda78b654236394bb87f7f8f163 100755 (executable)
--- a/src/mac/carbon/dccg.cpp
+++ b/src/mac/carbon/dccg.cpp
@@ -2009,7 +2009,7 @@ void  wxDC::Clear(void)
                 }
                 break ;
 
                 }
                 break ;
 

-            default
+            default:

                 break ;
         }
     }
                 break ;
         }
     }

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index d091e383e1a234a2c1819744fc2d554f331453e1..2aadedd4765e4641b9d0b4c74e143851ae6ae1e7 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -544,8 +544,9 @@ bool wxToolBar::Realize()
 
 #ifndef __WXWINCE__
     int remapValue = (-1);
 
 #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)
 
     doTransparent = (remapValue == 2);
     if (!doTransparent)


@@ -590,7 +591,7 @@ bool wxToolBar::Realize()
                                           wx_truncate_cast(wxCoord, nTools),
                       totalBitmapHeight = m_defaultHeight;
 
                                           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);
         wxMemoryDC dcAllButtons;
         wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
         dcAllButtons.SelectObject(bitmap);