]> git.saurik.com Git - wxWidgets.git/commitdiff
fix undefined variable color to colour
authorBenjamin Williams <bwilliams@kirix.com>
Sun, 24 Aug 2008 12:00:09 +0000 (12:00 +0000)
committerBenjamin Williams <bwilliams@kirix.com>
Sun, 24 Aug 2008 12:00:09 +0000 (12:00 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/aui/auibar.cpp

index 5fc61e4b75985f8a5506ce2e285b6deedcb6991f..17ac5e8bd0a09fe34f35bc5523c895d41e1ac73d 100644 (file)
@@ -113,19 +113,19 @@ static wxColor GetBaseColor()
 #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON\r
     wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));\r
 #else
 #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON\r
     wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));\r
 #else
-    wxColor base_color = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+    wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 #endif
 
     // the base_colour is too pale to use as our base colour,
     // so darken it a bit --
 #endif
 
     // the base_colour is too pale to use as our base colour,
     // so darken it a bit --
-    if ((255-base_color.Red()) +
-        (255-base_color.Green()) +
-        (255-base_color.Blue()) < 60)
+    if ((255-base_colour.Red()) +
+        (255-base_colour.Green()) +
+        (255-base_colour.Blue()) < 60)
     {
     {
-        base_color = wxAuiStepColour(base_color, 92);
+        base_colour = wxAuiStepColour(base_colour, 92);
     }
 
     }
 
-    return base_color;
+    return base_colour;
 }
 
 
 }