fixed (yet another?) crash in wxStrtok

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

diff --git a/src/mac/settings.cpp b/src/mac/settings.cpp
index b272f5f5dd59c8c1ccd2a9ac533929563d682aee..5c3cc0990bc594963d1b304b334830c589a9798a 100644 (file)
--- a/src/mac/settings.cpp
+++ b/src/mac/settings.cpp
@@ -17,7 +17,17 @@
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 
-wxColour wxSystemSettings::GetSystemColour(int index)
+#include "wx/mac/uma.h"
+
+// ----------------------------------------------------------------------------
+// wxSystemSettingsNative
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+// colours
+// ----------------------------------------------------------------------------
+
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
     int major,minor;
     wxGetOsVersion( &major, &minor );
@@ -34,6 +44,7 @@ wxColour wxSystemSettings::GetSystemColour(int index)
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
+        case wxSYS_COLOUR_MENUBAR:
             return wxColor( 0xDD , 0xDD , 0xDD ) ;
             break ;
 
@@ -89,11 +100,26 @@ wxColour wxSystemSettings::GetSystemColour(int index)
         case wxSYS_COLOUR_APPWORKSPACE: 
             return *wxWHITE ;
             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") );
+            break ;
     }
     return *wxWHITE;
 }
 
-wxFont wxSystemSettings::GetSystemFont(int index)
+// ----------------------------------------------------------------------------
+// fonts
+// ----------------------------------------------------------------------------
+
+wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {
     switch (index)
     {
@@ -118,8 +144,12 @@ wxFont wxSystemSettings::GetSystemFont(int index)
     return *wxNORMAL_FONT;
 }
 
+// ----------------------------------------------------------------------------
+// system metrics/features
+// ----------------------------------------------------------------------------
+
 // Get a system metric, e.g. scrollbar size
-int wxSystemSettings::GetSystemMetric(int index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
 {
     switch ( index)
     {
@@ -156,11 +186,11 @@ int wxSystemSettings::GetSystemMetric(int index)
             // TODO
             return 0;
         case wxSYS_HSCROLL_ARROW_X:
-                    return 16;
+            return 16;
         case wxSYS_HSCROLL_ARROW_Y:
-                    return 16;
+            return 16;
         case wxSYS_HTHUMB_X:
-                    return 16;
+            return 16;
         case wxSYS_ICON_X:
             // TODO
             return 0;
@@ -198,44 +228,45 @@ int wxSystemSettings::GetSystemMetric(int index)
             // TODO
             return 0;
         case wxSYS_HSCROLL_Y:
-                    return 16;
+            return 16;
         case wxSYS_VSCROLL_X:
-                    return 16;
+            return 16;
         case wxSYS_VSCROLL_ARROW_X:
-                    return 16;
+            return 16;
         case wxSYS_VSCROLL_ARROW_Y:
-                    return 16;
+            return 16;
         case wxSYS_VTHUMB_Y:
-                    return 16;
+            return 16;
         case wxSYS_CAPTION_Y:
             // TODO
-                    return 0;
+            return 0;
         case wxSYS_MENU_Y:
             // TODO
-                    return 0;
+            return 0;
         case wxSYS_NETWORK_PRESENT:
             // TODO
-                    return 0;
+            return 0;
         case wxSYS_PENWINDOWS_PRESENT:
-                    return 0;
+            return 0;
         case wxSYS_SHOW_SOUNDS:
             // TODO
             return 0;
         case wxSYS_SWAP_BUTTONS:
-                return 0;
-            default:
-                return 0;
+            return 0;
+        default:
+            return 0;
     }
     return 0;
 }
 
-bool wxSystemSettings::GetCapability(int index)
+bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
 {
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME: 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
-            return TRUE; break;
+            return TRUE;
+            
         default:
             return FALSE;
     }