fix off by one (or rather "off by border width") bug in ScrollWindow() (part of patch...

[wxWidgets.git] / src / mac / carbon / settings.cpp

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index e543a54fd8e0ed75bf0e00d2332ec70f5ce9db43..81cbcc4b94f8d28258b3e81c5266e42b1e1e8c15 100644 (file)
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -39,12 +39,14 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 
     switch ( index )
     {
 
     switch ( index )
     {

+        case wxSYS_COLOUR_WINDOW:
+            resultColor = *wxWHITE ;
+            break ;

         case wxSYS_COLOUR_SCROLLBAR :
         case wxSYS_COLOUR_BACKGROUND:
         case wxSYS_COLOUR_ACTIVECAPTION:
         case wxSYS_COLOUR_INACTIVECAPTION:
         case wxSYS_COLOUR_MENU:
         case wxSYS_COLOUR_SCROLLBAR :
         case wxSYS_COLOUR_BACKGROUND:
         case wxSYS_COLOUR_ACTIVECAPTION:
         case wxSYS_COLOUR_INACTIVECAPTION:
         case wxSYS_COLOUR_MENU:

-        case wxSYS_COLOUR_WINDOW:

         case wxSYS_COLOUR_WINDOWFRAME:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_WINDOWFRAME:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:


@@ -86,7 +88,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 #endif
 
             GetThemeBrushAsColor( colorBrushID, 32, true, &macRGB );
 #endif
 
             GetThemeBrushAsColor( colorBrushID, 32, true, &macRGB );

-            resultColor = wxColor( macRGB.red >> 8, macRGB.green >> 8, macRGB.blue >> 8 );
+            resultColor = wxColor( macRGB );

             break ;
 
         case wxSYS_COLOUR_BTNHIGHLIGHT:
             break ;
 
         case wxSYS_COLOUR_BTNHIGHLIGHT:


@@ -116,9 +118,11 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
             break ;
 
         case wxSYS_COLOUR_INFOBK :
             break ;
 
         case wxSYS_COLOUR_INFOBK :

-        case wxSYS_COLOUR_APPWORKSPACE:

             resultColor = *wxWHITE ;
             break ;
             resultColor = *wxWHITE ;
             break ;

+        case wxSYS_COLOUR_APPWORKSPACE:
+            resultColor =  wxColor( 0x80, 0x80, 0x80 ); ;
+            break ;

 
         case wxSYS_COLOUR_HOTLIGHT:
         case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
 
         case wxSYS_COLOUR_HOTLIGHT:
         case wxSYS_COLOUR_GRADIENTACTIVECAPTION: