mac cleanup

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

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index 669260c1df432c6701063e88a15368014d582fb3..03f1f1dcebfbe28c4fb82298e288ff3ce81091f7 100644 (file)
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -30,13 +30,9 @@
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {

-    int major, minor;

     wxColour resultColor;
     wxColour resultColor;

-    RGBColor macRGB;

     ThemeBrush colorBrushID;
 
     ThemeBrush colorBrushID;
 

-    wxGetOsVersion( &major, &minor );
-

     switch ( index )
     {
         case wxSYS_COLOUR_WINDOW:
     switch ( index )
     {
         case wxSYS_COLOUR_WINDOW:


@@ -56,17 +52,11 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
             break ;
 
         case wxSYS_COLOUR_LISTBOX :
             break ;
 
         case wxSYS_COLOUR_LISTBOX :

-            if (major >= 10)
-                resultColor = *wxWHITE ;
-            else
-                resultColor = wxColor( 0xEE, 0xEE, 0xEE );
+            resultColor = *wxWHITE ;

             break ;
 
         case wxSYS_COLOUR_BTNSHADOW:
             break ;
 
         case wxSYS_COLOUR_BTNSHADOW:

-            if (major >= 10)
-                resultColor = wxColor( 0xBE, 0xBE, 0xBE );
-            else
-                resultColor = wxColor( 0x44, 0x44, 0x44 );
+            resultColor = wxColor( 0xBE, 0xBE, 0xBE );

             break ;
 
         case wxSYS_COLOUR_BTNTEXT:
             break ;
 
         case wxSYS_COLOUR_BTNTEXT:


@@ -79,16 +69,15 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
             break ;
 
         case wxSYS_COLOUR_HIGHLIGHT:
             break ;
 
         case wxSYS_COLOUR_HIGHLIGHT:

-
+            {

 #if 0
             // NB: enable this case as desired
 #if 0
             // NB: enable this case as desired

-            colorBrushID = kThemeBrushAlternatePrimaryHighlightColor;
+                colorBrushID = kThemeBrushAlternatePrimaryHighlightColor;

 #else
 #else

-            colorBrushID = kThemeBrushPrimaryHighlightColor;
+                colorBrushID = kThemeBrushPrimaryHighlightColor;

 #endif
 #endif

-
-            GetThemeBrushAsColor( colorBrushID, 32, true, &macRGB );
-            resultColor = wxColor( macRGB );
+                resultColor = wxColor( wxMacCreateCGColorFromHITheme(colorBrushID) );
+            }

             break ;
 
         case wxSYS_COLOUR_BTNHIGHLIGHT:
             break ;
 
         case wxSYS_COLOUR_BTNHIGHLIGHT:


@@ -109,11 +98,13 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
             // NB: enable this case as desired
             resultColor = *wxWHITE ;
 #else
             // 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 ;
+            {
+                wxColour highlightcolor( wxMacCreateCGColorFromHITheme(kThemeBrushPrimaryHighlightColor) );
+                if ((highlightcolor.Red() + highlightcolor.Green()  + highlightcolor.Blue() ) == 0)
+                    resultColor = *wxWHITE ;
+                else
+                    resultColor = *wxBLACK ;
+            }

 #endif
             break ;
 
 #endif
             break ;
 


@@ -234,8 +225,13 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         // TODO: case wxSYS_SHOW_SOUNDS:
 
         case wxSYS_DCLICK_MSEC:
         // TODO: case wxSYS_SHOW_SOUNDS:
 
         case wxSYS_DCLICK_MSEC:

+#ifdef __LP64__
+            // default on mac is 30 ticks, we shouldn't really use wxSYS_DCLICK_MSEC anyway 
+            // but rather rely on the 'click-count' by the system delivered in a mouse event
+            return 500;
+#else

             return (int)(GetDblTime() * 1000. / 60.);
             return (int)(GetDblTime() * 1000. / 60.);

-
+#endif

         default:
             // unsupported metric
             break;
         default:
             // unsupported metric
             break;