correct hhp2cached path

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

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index 9cdf66aa6650c0048bc4fda5ab1d4f04fc2618f4..58cecfb357174b30e14fb849aac5fbe6f4929e9e 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:
 // Purpose:     wxSettings
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,15 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "settings.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/settings.h"
 #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"
 
 
 #include "wx/mac/uma.h"
 


@@ -31,38 +30,33 @@
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {

-    int major,minor;
-    wxGetOsVersion( &major, &minor );
-    
-    switch( index )
+    wxColour resultColor;
+    ThemeBrush colorBrushID;
+
+    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_BTNFACE:
         case wxSYS_COLOUR_MENUBAR:
         case wxSYS_COLOUR_WINDOWFRAME:
         case wxSYS_COLOUR_ACTIVEBORDER:
         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 :
             break ;
 
         case wxSYS_COLOUR_LISTBOX :

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

             break ;
             break ;

-        }
+

         case wxSYS_COLOUR_BTNSHADOW:
         case wxSYS_COLOUR_BTNSHADOW:

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

             break ;
 
         case wxSYS_COLOUR_BTNTEXT:
             break ;
 
         case wxSYS_COLOUR_BTNTEXT:


@@ -71,53 +65,74 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_CAPTIONTEXT:
         case wxSYS_COLOUR_INFOTEXT:
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
         case wxSYS_COLOUR_CAPTIONTEXT:
         case wxSYS_COLOUR_INFOTEXT:
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:

-            return *wxBLACK;
+            resultColor = *wxBLACK;

             break ;
             break ;

+

         case wxSYS_COLOUR_HIGHLIGHT:
             {
         case wxSYS_COLOUR_HIGHLIGHT:
             {

-                RGBColor hilite ;
-                LMGetHiliteRGB(&hilite) ;
-                return wxColor( hilite.red >> 8 , hilite.green >> 8  , hilite.blue >> 8  ) ;
+#if 0
+            // NB: enable this case as desired
+                colorBrushID = kThemeBrushAlternatePrimaryHighlightColor;
+#else
+                colorBrushID = kThemeBrushPrimaryHighlightColor;
+#endif
+                resultColor = wxColor( wxMacCreateCGColorFromHITheme(colorBrushID) );

             }
             break ;
             }
             break ;

+

         case wxSYS_COLOUR_BTNHIGHLIGHT:
         case wxSYS_COLOUR_GRAYTEXT:
         case wxSYS_COLOUR_BTNHIGHLIGHT:
         case wxSYS_COLOUR_GRAYTEXT:

-            return wxColor( 0xCC , 0xCC , 0xCC ) ;
+            resultColor = wxColor( 0xCC, 0xCC, 0xCC );

             break ;
             break ;

-    
+

         case wxSYS_COLOUR_3DDKSHADOW:
         case wxSYS_COLOUR_3DDKSHADOW:

-            return wxColor( 0x44 , 0x44 , 0x44 ) ;
+            resultColor = wxColor( 0x44, 0x44, 0x44 );

             break ;
             break ;

+

         case wxSYS_COLOUR_3DLIGHT:
         case wxSYS_COLOUR_3DLIGHT:

-            return wxColor( 0xCC , 0xCC , 0xCC ) ;
+            resultColor = wxColor( 0xCC, 0xCC, 0xCC );

             break ;
             break ;

+

         case wxSYS_COLOUR_HIGHLIGHTTEXT :
         case wxSYS_COLOUR_HIGHLIGHTTEXT :

+#if 0 
+            // NB: enable this case as desired
+            resultColor = *wxWHITE ;
+#else

             {
             {

-                RGBColor hilite ;
-                LMGetHiliteRGB(&hilite) ;
-                if ( ( hilite.red + hilite.green + hilite.blue ) == 0 )
-                        return *wxWHITE ;
+                wxColour highlightcolor( wxMacCreateCGColorFromHITheme(kThemeBrushPrimaryHighlightColor) );
+                if ((highlightcolor.Red() + highlightcolor.Green()  + highlightcolor.Blue() ) == 0)
+                    resultColor = *wxWHITE ;

                 else
                 else

-                        return *wxBLACK ;
+                    resultColor = *wxBLACK ;

             }
             }

+#endif

             break ;
             break ;

+

         case wxSYS_COLOUR_INFOBK :
         case wxSYS_COLOUR_INFOBK :

-        case wxSYS_COLOUR_APPWORKSPACE: 
-            return *wxWHITE ;
+            // we don't have a way to detect tooltip color, so use the
+            // standard value used at least on 10.4:
+            resultColor = wxColour( 0xFF, 0xFF, 0xD3 ) ;
+            break ;
+        case wxSYS_COLOUR_APPWORKSPACE:
+            resultColor =  wxColor( 0x80, 0x80, 0x80 ); ;

             break ;
 
         case wxSYS_COLOUR_HOTLIGHT:
         case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
         case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
         case wxSYS_COLOUR_MENUHILIGHT:
             break ;
 
         case wxSYS_COLOUR_HOTLIGHT:
         case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
         case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
         case wxSYS_COLOUR_MENUHILIGHT:

-            // TODO
-            return *wxBLACK;
-         
-        case wxSYS_COLOUR_MAX:
-            wxFAIL_MSG( _T("unknown system colour index") );
+            // TODO:
+            resultColor = *wxBLACK;
+            break ;
+
+        // case wxSYS_COLOUR_MAX:
+        default:
+            resultColor = *wxWHITE;
+            // wxCHECK_MSG( index >= wxSYS_COLOUR_MAX, false, _T("unknown system colour index") );

             break ;
     }
             break ;
     }

-    return *wxWHITE;
+
+    return resultColor;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -132,20 +147,13 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         case wxSYS_SYSTEM_FONT :
         case wxSYS_DEVICE_DEFAULT_FONT :
         case wxSYS_DEFAULT_GUI_FONT :
         case wxSYS_SYSTEM_FONT :
         case wxSYS_DEVICE_DEFAULT_FONT :
         case wxSYS_DEFAULT_GUI_FONT :

-            {
-                return *wxSMALL_FONT ;
-                    } ;
+            return *wxSMALL_FONT ;

             break ;
             break ;

-        case wxSYS_OEM_FIXED_FONT :
-        case wxSYS_ANSI_FIXED_FONT :
-        case wxSYS_SYSTEM_FIXED_FONT :
+

         default :
         default :

-            {
-                return *wxNORMAL_FONT ;
-                    } ;

             break ;
             break ;

-                

     }
     }

+

     return *wxNORMAL_FONT;
 }
 
     return *wxNORMAL_FONT;
 }
 


@@ -158,12 +166,12 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
 {
     int value;
 
 {
     int value;
 

-    switch ( index)
+    switch ( index )

     {
         case wxSYS_MOUSE_BUTTONS:
     {
         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;
             return 2;

-            
+

         // TODO case wxSYS_BORDER_X:
         // TODO case wxSYS_BORDER_Y:
         // TODO case wxSYS_CURSOR_X:
         // TODO case wxSYS_BORDER_X:
         // TODO case wxSYS_BORDER_Y:
         // TODO case wxSYS_CURSOR_X:


@@ -174,14 +182,12 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         // TODO case wxSYS_DRAG_Y:
         // TODO case wxSYS_EDGE_X:
         // TODO case wxSYS_EDGE_Y:
         // TODO case wxSYS_DRAG_Y:
         // TODO case wxSYS_EDGE_X:
         // TODO case wxSYS_EDGE_Y:

-            
+

         case wxSYS_HSCROLL_ARROW_X:
         case wxSYS_HSCROLL_ARROW_X:

-            return 16;

         case wxSYS_HSCROLL_ARROW_Y:
         case wxSYS_HSCROLL_ARROW_Y:

-            return 16;

         case wxSYS_HTHUMB_X:
             return 16;
         case wxSYS_HTHUMB_X:
             return 16;

-            
+

         // TODO case wxSYS_ICON_X:
         // TODO case wxSYS_ICON_Y:
         // TODO case wxSYS_ICONSPACING_X:
         // TODO case wxSYS_ICON_X:
         // TODO case wxSYS_ICON_Y:
         // TODO case wxSYS_ICONSPACING_X:


@@ -190,55 +196,61 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         // TODO case wxSYS_WINDOWMIN_Y:
 
         case wxSYS_SCREEN_X:
         // TODO case wxSYS_WINDOWMIN_Y:
 
         case wxSYS_SCREEN_X:

-            wxDisplaySize(&value, NULL);
+            wxDisplaySize( &value, NULL );

             return value;
             return value;

+

         case wxSYS_SCREEN_Y:
         case wxSYS_SCREEN_Y:

-            wxDisplaySize(NULL, &value);
+            wxDisplaySize( NULL, &value );

             return value;
             return value;

-            
+

         // TODO case wxSYS_FRAMESIZE_X:
         // TODO case wxSYS_FRAMESIZE_Y:
         // TODO case wxSYS_SMALLICON_X:
         // TODO case wxSYS_SMALLICON_Y:
         // TODO case wxSYS_FRAMESIZE_X:
         // TODO case wxSYS_FRAMESIZE_Y:
         // TODO case wxSYS_SMALLICON_X:
         // TODO case wxSYS_SMALLICON_Y:

-            
+

         case wxSYS_HSCROLL_Y:
         case wxSYS_HSCROLL_Y:

-            return 16;

         case wxSYS_VSCROLL_X:
         case wxSYS_VSCROLL_X:

-            return 16;

         case wxSYS_VSCROLL_ARROW_X:
         case wxSYS_VSCROLL_ARROW_X:

-            return 16;

         case wxSYS_VSCROLL_ARROW_Y:
         case wxSYS_VSCROLL_ARROW_Y:

-            return 16;

         case wxSYS_VTHUMB_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;
         case wxSYS_PENWINDOWS_PRESENT:
             return 0;

-            
-        // TODO case wxSYS_SHOW_SOUNDS:
-            
+

         case wxSYS_SWAP_BUTTONS:
             return 0;
 
         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:
+
+        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.);
+#endif

         default:
         default:

-            return -1;  // unsupported metric
+            // unsupported metric
+            break;

     }
     }

-    return 0;
+
+    return -1;

 }
 
 bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
 {
     switch (index)
     {
 }
 
 bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
 {
     switch (index)
     {

-        case wxSYS_CAN_ICONIZE_FRAME: 
+        case wxSYS_CAN_ICONIZE_FRAME:

         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return TRUE;
-            
+            return true;
+

         default:
         default:

-            return FALSE;
+            return false;

     }
 }
     }
 }