Using Carbon Calls for getting highlight color

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

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index a81eda8c629f816249e953d0187abd7694d646f1..d1ceaeae1a0e3331156f58a17e7ee292f1029181 100644 (file)
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -76,7 +76,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_HIGHLIGHT:
             {
                 RGBColor hilite ;
         case wxSYS_COLOUR_HIGHLIGHT:
             {
                 RGBColor hilite ;

-                LMGetHiliteRGB(&hilite) ;
+                GetThemeBrushAsColor( kThemeBrushPrimaryHighlightColor, 32, true, &hilite );

                 return wxColor( hilite.red >> 8 , hilite.green >> 8  , hilite.blue >> 8  ) ;
             }
             break ;
                 return wxColor( hilite.red >> 8 , hilite.green >> 8  , hilite.blue >> 8  ) ;
             }
             break ;


@@ -94,7 +94,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_HIGHLIGHTTEXT :
             {
                 RGBColor hilite ;
         case wxSYS_COLOUR_HIGHLIGHTTEXT :
             {
                 RGBColor hilite ;

-                LMGetHiliteRGB(&hilite) ;
+                GetThemeBrushAsColor( kThemeBrushPrimaryHighlightColor, 32, true, &hilite );

                 if ( ( hilite.red + hilite.green + hilite.blue ) == 0 )
                         return *wxWHITE ;
                 else
                 if ( ( hilite.red + hilite.green + hilite.blue ) == 0 )
                         return *wxWHITE ;
                 else