X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a174f139e105c38ae852104eb6a894b3a0d88e07..01f5f03e7f9c19ca75ae6dbd4050c2b54e52e406:/src/mac/carbon/settings.cpp diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp index 92d586c90c..9c33a5bf2f 100644 --- a/src/mac/carbon/settings.cpp +++ b/src/mac/carbon/settings.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: settings.cpp // Purpose: wxSettings -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,6 +17,8 @@ #include "wx/gdicmn.h" #include "wx/utils.h" +#include "wx/mac/uma.h" + // ---------------------------------------------------------------------------- // wxSystemSettingsNative // ---------------------------------------------------------------------------- @@ -42,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 ; @@ -97,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; }