From fc1f7cd5dd9741ebd9e2ec36f6af2f01c107af72 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Mon, 4 Feb 2002 20:56:53 +0000 Subject: [PATCH] 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 --- src/mac/carbon/settings.cpp | 12 ++++++++++++ src/mac/settings.cpp | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp index 8c7591cfdb..5c3cc0990b 100644 --- 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_MENUBAR: 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_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; } diff --git a/src/mac/settings.cpp b/src/mac/settings.cpp index 8c7591cfdb..5c3cc0990b 100644 --- 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_MENUBAR: 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_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; } -- 2.45.2