X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..511bec9640556c23969942f7912ada90c19d36ac:/src/mac/carbon/settings.cpp?ds=sidebyside

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index bfb9e951b2..450b800996 100644
--- 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,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+
 #include "wx/gdicmn.h"
-#include "wx/utils.h"
 
 #include "wx/mac/uma.h"
 
@@ -27,10 +31,14 @@
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
-    int major,minor;
+    int major, minor;
+    wxColour resultColor;
+    RGBColor macRGB;
+    ThemeBrush colorBrushID;
+
     wxGetOsVersion( &major, &minor );
 
-    switch( index )
+    switch ( index )
     {
         case wxSYS_COLOUR_SCROLLBAR :
         case wxSYS_COLOUR_BACKGROUND:
@@ -43,22 +51,21 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_MENUBAR:
-            return wxColor( 0xDD , 0xDD , 0xDD ) ;
+            resultColor = wxColor( 0xDD, 0xDD, 0xDD );
             break ;
 
         case wxSYS_COLOUR_LISTBOX :
-        {
             if (major >= 10)
-                return *wxWHITE ;
+                resultColor = *wxWHITE ;
             else
-                return wxColor( 0xEE , 0xEE , 0xEE ) ;
+                resultColor = wxColor( 0xEE, 0xEE, 0xEE );
             break ;
-        }
+
         case wxSYS_COLOUR_BTNSHADOW:
             if (major >= 10)
-                return wxColor( 0xBE , 0xBE , 0xBE ) ;
+                resultColor = wxColor( 0xBE, 0xBE, 0xBE );
             else
-                return wxColor( 0x44 , 0x44 , 0x44 ) ;
+                resultColor = wxColor( 0x44, 0x44, 0x44 );
             break ;
 
         case wxSYS_COLOUR_BTNTEXT:
@@ -67,53 +74,69 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_CAPTIONTEXT:
         case wxSYS_COLOUR_INFOTEXT:
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
-            return *wxBLACK;
+            resultColor = *wxBLACK;
             break ;
+
         case wxSYS_COLOUR_HIGHLIGHT:
-            {
-                RGBColor hilite ;
-                GetThemeBrushAsColor( kThemeBrushPrimaryHighlightColor, 32, true, &hilite );
-                return wxColor( hilite.red >> 8 , hilite.green >> 8  , hilite.blue >> 8  ) ;
-            }
+
+#if 0 && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
+            // NB: enable this case as desired
+            colorBrushID = kThemeBrushAlternatePrimaryHighlightColor;
+#else
+            colorBrushID = kThemeBrushPrimaryHighlightColor;
+#endif
+
+            GetThemeBrushAsColor( colorBrushID, 32, true, &macRGB );
+            resultColor = wxColor( macRGB.red >> 8, macRGB.green >> 8, macRGB.blue >> 8 );
             break ;
+
         case wxSYS_COLOUR_BTNHIGHLIGHT:
         case wxSYS_COLOUR_GRAYTEXT:
-            return wxColor( 0xCC , 0xCC , 0xCC ) ;
+            resultColor = wxColor( 0xCC, 0xCC, 0xCC );
             break ;
 
         case wxSYS_COLOUR_3DDKSHADOW:
-            return wxColor( 0x44 , 0x44 , 0x44 ) ;
+            resultColor = wxColor( 0x44, 0x44, 0x44 );
             break ;
+
         case wxSYS_COLOUR_3DLIGHT:
-            return wxColor( 0xCC , 0xCC , 0xCC ) ;
+            resultColor = wxColor( 0xCC, 0xCC, 0xCC );
             break ;
+
         case wxSYS_COLOUR_HIGHLIGHTTEXT :
-            {
-                RGBColor hilite ;
-                GetThemeBrushAsColor( kThemeBrushPrimaryHighlightColor, 32, true, &hilite );
-                if ( ( hilite.red + hilite.green + hilite.blue ) == 0 )
-                        return *wxWHITE ;
-                else
-                        return *wxBLACK ;
-            }
+#if 0 && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
+            // NB: enable this case as desired
+            resultColor = *wxWHITE ;
+#else
+            GetThemeBrushAsColor( kThemeBrushPrimaryHighlightColor, 32, true, &macRGB );
+            if ((macRGB.red + macRGB.green + macRGB.blue) == 0)
+                resultColor = *wxWHITE ;
+            else
+                resultColor = *wxBLACK ;
+#endif
             break ;
+
         case wxSYS_COLOUR_INFOBK :
         case wxSYS_COLOUR_APPWORKSPACE:
-            return *wxWHITE ;
+            resultColor = *wxWHITE ;
             break ;
 
         case wxSYS_COLOUR_HOTLIGHT:
         case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
         case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
         case wxSYS_COLOUR_MENUHILIGHT:
-            // TODO
-            return *wxBLACK;
+            // TODO:
+            resultColor = *wxBLACK;
+            break ;
 
-        case wxSYS_COLOUR_MAX:
-            wxFAIL_MSG( _T("unknown system colour index") );
+        // case wxSYS_COLOUR_MAX:
+        default:
+            resultColor = *wxWHITE;
+            // wxCHECK_MSG( index >= wxSYS_COLOUR_MAX, false, _T("unknown system colour index") );
             break ;
     }
-    return *wxWHITE;
+
+    return resultColor;
 }
 
 // ----------------------------------------------------------------------------
@@ -128,14 +151,13 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         case wxSYS_SYSTEM_FONT :
         case wxSYS_DEVICE_DEFAULT_FONT :
         case wxSYS_DEFAULT_GUI_FONT :
-            {
-                return *wxSMALL_FONT ;
-            } ;
+            return *wxSMALL_FONT ;
             break ;
 
         default :
             break ;
     }
+
     return *wxNORMAL_FONT;
 }
 
@@ -148,10 +170,10 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
 {
     int value;
 
-    switch ( index)
+    switch ( index )
     {
         case wxSYS_MOUSE_BUTTONS:
-            // we emulate a two button mouse (ctrl + click = right button )
+            // we emulate a two button mouse (ctrl + click = right button)
             return 2;
 
         // TODO case wxSYS_BORDER_X:
@@ -166,9 +188,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         // TODO case wxSYS_EDGE_Y:
 
         case wxSYS_HSCROLL_ARROW_X:
-            return 16;
         case wxSYS_HSCROLL_ARROW_Y:
-            return 16;
         case wxSYS_HTHUMB_X:
             return 16;
 
@@ -180,10 +200,11 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         // TODO case wxSYS_WINDOWMIN_Y:
 
         case wxSYS_SCREEN_X:
-            wxDisplaySize(&value, NULL);
+            wxDisplaySize( &value, NULL );
             return value;
+
         case wxSYS_SCREEN_Y:
-            wxDisplaySize(NULL, &value);
+            wxDisplaySize( NULL, &value );
             return value;
 
         // TODO case wxSYS_FRAMESIZE_X:
@@ -192,31 +213,28 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         // TODO case wxSYS_SMALLICON_Y:
 
         case wxSYS_HSCROLL_Y:
-            return 16;
         case wxSYS_VSCROLL_X:
-            return 16;
         case wxSYS_VSCROLL_ARROW_X:
-            return 16;
         case wxSYS_VSCROLL_ARROW_Y:
-            return 16;
         case wxSYS_VTHUMB_Y:
             return 16;
 
-        // TODO case wxSYS_CAPTION_Y:
-        // TODO case wxSYS_MENU_Y:
-        // TODO case wxSYS_NETWORK_PRESENT:
-
         case wxSYS_PENWINDOWS_PRESENT:
             return 0;
 
-        // TODO case wxSYS_SHOW_SOUNDS:
-
         case wxSYS_SWAP_BUTTONS:
             return 0;
 
+        // TODO: case wxSYS_CAPTION_Y:
+        // TODO: case wxSYS_MENU_Y:
+        // TODO: case wxSYS_NETWORK_PRESENT:
+        // TODO: case wxSYS_SHOW_SOUNDS:
+
         default:
-            break;  // unsupported metric
+            // unsupported metric
+            break;
     }
+
     return -1;
 }