process pending wx events before sending idle events

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

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index 6f19bfb7dc8651e7715b7684e4094aebb4fb9074..81cbcc4b94f8d28258b3e81c5266e42b1e1e8c15 100644 (file)
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        settings.cpp
+// Name:        src/mac/carbon/settings.cpp
 // Purpose:     wxSettings
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,8 +12,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/settings.h"
-#include "wx/gdicmn.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/gdicmn.h"
+#endif
 
 #include "wx/mac/uma.h"
 
@@ -36,12 +39,14 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour 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_WINDOW:
         case wxSYS_COLOUR_WINDOWFRAME:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
@@ -83,7 +88,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 #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:
@@ -113,9 +118,11 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
             break ;
 
         case wxSYS_COLOUR_INFOBK :
-        case wxSYS_COLOUR_APPWORKSPACE:
             resultColor = *wxWHITE ;
             break ;
+        case wxSYS_COLOUR_APPWORKSPACE:
+            resultColor =  wxColor( 0x80, 0x80, 0x80 ); ;
+            break ;
 
         case wxSYS_COLOUR_HOTLIGHT:
         case wxSYS_COLOUR_GRADIENTACTIVECAPTION: