corrected wake up code

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

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index e61c589c6983da65461d5b5c1552991b966a01ca..bfb9e951b282f215ddfa59c9c2e6c954a1e048e9 100644 (file)
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -9,10 +9,6 @@
 // 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"


@@ -33,7 +29,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
     int major,minor;
     wxGetOsVersion( &major, &minor );
 {
     int major,minor;
     wxGetOsVersion( &major, &minor );

-    
+

     switch( index )
     {
         case wxSYS_COLOUR_SCROLLBAR :
     switch( index )
     {
         case wxSYS_COLOUR_SCROLLBAR :


@@ -76,7 +72,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 ;


@@ -84,7 +80,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_GRAYTEXT:
             return wxColor( 0xCC , 0xCC , 0xCC ) ;
             break ;
         case wxSYS_COLOUR_GRAYTEXT:
             return wxColor( 0xCC , 0xCC , 0xCC ) ;
             break ;

-    
+

         case wxSYS_COLOUR_3DDKSHADOW:
             return wxColor( 0x44 , 0x44 , 0x44 ) ;
             break ;
         case wxSYS_COLOUR_3DDKSHADOW:
             return wxColor( 0x44 , 0x44 , 0x44 ) ;
             break ;


@@ -94,7 +90,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


@@ -102,7 +98,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
             }
             break ;
         case wxSYS_COLOUR_INFOBK :
             }
             break ;
         case wxSYS_COLOUR_INFOBK :

-        case wxSYS_COLOUR_APPWORKSPACE: 
+        case wxSYS_COLOUR_APPWORKSPACE:

             return *wxWHITE ;
             break ;
 
             return *wxWHITE ;
             break ;
 


@@ -112,7 +108,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_MENUHILIGHT:
             // TODO
             return *wxBLACK;
         case wxSYS_COLOUR_MENUHILIGHT:
             // TODO
             return *wxBLACK;

-         
+

         case wxSYS_COLOUR_MAX:
             wxFAIL_MSG( _T("unknown system colour index") );
             break ;
         case wxSYS_COLOUR_MAX:
             wxFAIL_MSG( _T("unknown system colour index") );
             break ;


@@ -134,17 +130,11 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         case wxSYS_DEFAULT_GUI_FONT :
             {
                 return *wxSMALL_FONT ;
         case wxSYS_DEFAULT_GUI_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;
 }


@@ -154,7 +144,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 // ----------------------------------------------------------------------------
 
 // Get a system metric, e.g. scrollbar size
 // ----------------------------------------------------------------------------
 
 // Get a system metric, e.g. scrollbar size

-int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))

 {
     int value;
 
 {
     int value;
 


@@ -163,7 +153,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
         case wxSYS_MOUSE_BUTTONS:
             // we emulate a two button mouse (ctrl + click = right button )
             return 2;
         case wxSYS_MOUSE_BUTTONS:
             // we emulate a two button mouse (ctrl + click = right button )
             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 +164,14 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
         // 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:
             return 16;
         case wxSYS_HSCROLL_ARROW_Y:
             return 16;
         case wxSYS_HTHUMB_X:
             return 16;
         case wxSYS_HSCROLL_ARROW_X:
             return 16;
         case wxSYS_HSCROLL_ARROW_Y:
             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:


@@ -195,12 +185,12 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
         case wxSYS_SCREEN_Y:
             wxDisplaySize(NULL, &value);
             return value;
         case wxSYS_SCREEN_Y:
             wxDisplaySize(NULL, &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:
             return 16;
         case wxSYS_VSCROLL_X:
         case wxSYS_HSCROLL_Y:
             return 16;
         case wxSYS_VSCROLL_X:


@@ -211,34 +201,34 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
             return 16;
         case wxSYS_VTHUMB_Y:
             return 16;
             return 16;
         case wxSYS_VTHUMB_Y:
             return 16;

-            
+

         // TODO case wxSYS_CAPTION_Y:
         // TODO case wxSYS_MENU_Y:
         // TODO case wxSYS_NETWORK_PRESENT:
         // 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:
         // TODO case wxSYS_SHOW_SOUNDS:

-            
+

         case wxSYS_SWAP_BUTTONS:
             return 0;
 
         default:
         case wxSYS_SWAP_BUTTONS:
             return 0;
 
         default:

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

     }
     }

-    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;

     }
 }
     }
 }