switching colors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index e543a54fd8e0ed75bf0e00d2332ec70f5ce9db43..4df74a6dd876ec1fcfbf60718eeba74983c0148f 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:


@@ -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:

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 6d86234520fa47b8d8e6862e193f753e8615c9ec..975404ea78360fbc0f548de3f52c6b5124eaec2a 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1199,7 +1199,7 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
     wxBrush brush ;
     wxColour newCol(GetBackgroundColour());
 
     wxBrush brush ;
     wxColour newCol(GetBackgroundColour());
 

-    if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) )
+    if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) )

         brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
     else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )
         brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
         brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
     else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )
         brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;