added missing system colours (exact colours to be defined)

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

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index 8c7591cfdbd2d7a2c7fbb13a812c6fee83887ed8..5c3cc0990bc594963d1b304b334830c589a9798a 100644 (file)
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -44,6 +44,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:

+        case wxSYS_COLOUR_MENUBAR:

             return wxColor( 0xDD , 0xDD , 0xDD ) ;
             break ;
 
             return wxColor( 0xDD , 0xDD , 0xDD ) ;
             break ;
 


@@ -99,6 +100,17 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_APPWORKSPACE: 
             return *wxWHITE ;
             break ;
         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;
 }
     }
     return *wxWHITE;
 }

diff --git a/src/mac/settings.cpp b/src/mac/settings.cpp
index 8c7591cfdbd2d7a2c7fbb13a812c6fee83887ed8..5c3cc0990bc594963d1b304b334830c589a9798a 100644 (file)
--- a/src/mac/settings.cpp
+++ b/src/mac/settings.cpp
@@ -44,6 +44,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:

+        case wxSYS_COLOUR_MENUBAR:

             return wxColor( 0xDD , 0xDD , 0xDD ) ;
             break ;
 
             return wxColor( 0xDD , 0xDD , 0xDD ) ;
             break ;
 


@@ -99,6 +100,17 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_APPWORKSPACE: 
             return *wxWHITE ;
             break ;
         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;
 }
     }
     return *wxWHITE;
 }