/////////////////////////////////////////////////////////////////////////////
-// Name: settings.cpp
+// Name: src/mac/carbon/settings.cpp
// Purpose: wxSettings
// Author: Stefan Csomor
// Modified by:
#include "wx/wxprec.h"
#include "wx/settings.h"
-#include "wx/gdicmn.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+ #include "wx/gdicmn.h"
+#endif
#include "wx/mac/uma.h"
wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
{
- int major,minor;
- wxGetOsVersion( &major, &minor );
+ wxColour resultColor;
+ ThemeBrush colorBrushID;
- switch( index )
+ switch ( index )
{
+ case wxSYS_COLOUR_WINDOW:
+ resultColor = *wxWHITE ;
+ break ;
case wxSYS_COLOUR_SCROLLBAR :
case wxSYS_COLOUR_BACKGROUND:
case wxSYS_COLOUR_ACTIVECAPTION:
case wxSYS_COLOUR_INACTIVECAPTION:
case wxSYS_COLOUR_MENU:
- case wxSYS_COLOUR_WINDOW:
case wxSYS_COLOUR_WINDOWFRAME:
case wxSYS_COLOUR_ACTIVEBORDER:
case wxSYS_COLOUR_INACTIVEBORDER:
case wxSYS_COLOUR_BTNFACE:
case wxSYS_COLOUR_MENUBAR:
- return wxColor( 0xDD , 0xDD , 0xDD ) ;
+ resultColor = wxColor( 0xDD, 0xDD, 0xDD );
break ;
case wxSYS_COLOUR_LISTBOX :
- {
- if (major >= 10)
- return *wxWHITE ;
- else
- return wxColor( 0xEE , 0xEE , 0xEE ) ;
+ resultColor = *wxWHITE ;
break ;
- }
+
case wxSYS_COLOUR_BTNSHADOW:
- if (major >= 10)
- return wxColor( 0xBE , 0xBE , 0xBE ) ;
- else
- return wxColor( 0x44 , 0x44 , 0x44 ) ;
+ resultColor = wxColor( 0xBE, 0xBE, 0xBE );
break ;
case wxSYS_COLOUR_BTNTEXT:
case wxSYS_COLOUR_CAPTIONTEXT:
case wxSYS_COLOUR_INFOTEXT:
case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
- return *wxBLACK;
+ resultColor = *wxBLACK;
break ;
+
case wxSYS_COLOUR_HIGHLIGHT:
{
- RGBColor hilite ;
- GetThemeBrushAsColor( kThemeBrushPrimaryHighlightColor, 32, true, &hilite );
- return wxColor( hilite.red >> 8 , hilite.green >> 8 , hilite.blue >> 8 ) ;
+#if 0
+ // NB: enable this case as desired
+ colorBrushID = kThemeBrushAlternatePrimaryHighlightColor;
+#else
+ colorBrushID = kThemeBrushPrimaryHighlightColor;
+#endif
+ resultColor = wxColor( wxMacCreateCGColorFromHITheme(colorBrushID) );
}
break ;
+
case wxSYS_COLOUR_BTNHIGHLIGHT:
case wxSYS_COLOUR_GRAYTEXT:
- return wxColor( 0xCC , 0xCC , 0xCC ) ;
+ resultColor = wxColor( 0xCC, 0xCC, 0xCC );
break ;
case wxSYS_COLOUR_3DDKSHADOW:
- return wxColor( 0x44 , 0x44 , 0x44 ) ;
+ resultColor = wxColor( 0x44, 0x44, 0x44 );
break ;
+
case wxSYS_COLOUR_3DLIGHT:
- return wxColor( 0xCC , 0xCC , 0xCC ) ;
+ resultColor = wxColor( 0xCC, 0xCC, 0xCC );
break ;
+
case wxSYS_COLOUR_HIGHLIGHTTEXT :
+#if 0
+ // NB: enable this case as desired
+ resultColor = *wxWHITE ;
+#else
{
- RGBColor hilite ;
- GetThemeBrushAsColor( kThemeBrushPrimaryHighlightColor, 32, true, &hilite );
- if ( ( hilite.red + hilite.green + hilite.blue ) == 0 )
- return *wxWHITE ;
+ wxColour highlightcolor( wxMacCreateCGColorFromHITheme(kThemeBrushPrimaryHighlightColor) );
+ if ((highlightcolor.Red() + highlightcolor.Green() + highlightcolor.Blue() ) == 0)
+ resultColor = *wxWHITE ;
else
- return *wxBLACK ;
+ resultColor = *wxBLACK ;
}
+#endif
break ;
+
case wxSYS_COLOUR_INFOBK :
+ // we don't have a way to detect tooltip color, so use the
+ // standard value used at least on 10.4:
+ resultColor = wxColour( 0xFF, 0xFF, 0xD3 ) ;
+ break ;
case wxSYS_COLOUR_APPWORKSPACE:
- return *wxWHITE ;
+ resultColor = wxColor( 0x80, 0x80, 0x80 ); ;
break ;
case wxSYS_COLOUR_HOTLIGHT:
case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
case wxSYS_COLOUR_MENUHILIGHT:
- // TODO
- return *wxBLACK;
+ // TODO:
+ resultColor = *wxBLACK;
+ break ;
- case wxSYS_COLOUR_MAX:
- wxFAIL_MSG( _T("unknown system colour index") );
+ // case wxSYS_COLOUR_MAX:
+ default:
+ resultColor = *wxWHITE;
+ // wxCHECK_MSG( index >= wxSYS_COLOUR_MAX, false, _T("unknown system colour index") );
break ;
}
- return *wxWHITE;
+
+ return resultColor;
}
// ----------------------------------------------------------------------------
case wxSYS_SYSTEM_FONT :
case wxSYS_DEVICE_DEFAULT_FONT :
case wxSYS_DEFAULT_GUI_FONT :
- {
- return *wxSMALL_FONT ;
- } ;
+ return *wxSMALL_FONT ;
break ;
default :
break ;
}
+
return *wxNORMAL_FONT;
}
{
int value;
- switch ( index)
+ switch ( index )
{
case wxSYS_MOUSE_BUTTONS:
- // we emulate a two button mouse (ctrl + click = right button )
+ // we emulate a two button mouse (ctrl + click = right button)
return 2;
// TODO case wxSYS_BORDER_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;
// TODO case wxSYS_WINDOWMIN_Y:
case wxSYS_SCREEN_X:
- wxDisplaySize(&value, NULL);
+ wxDisplaySize( &value, NULL );
return value;
+
case wxSYS_SCREEN_Y:
- wxDisplaySize(NULL, &value);
+ wxDisplaySize( NULL, &value );
return value;
// TODO case wxSYS_FRAMESIZE_X:
// TODO case wxSYS_SMALLICON_Y:
case wxSYS_HSCROLL_Y:
- return 16;
case wxSYS_VSCROLL_X:
- return 16;
case wxSYS_VSCROLL_ARROW_X:
- return 16;
case wxSYS_VSCROLL_ARROW_Y:
- return 16;
case wxSYS_VTHUMB_Y:
return 16;
- // TODO case wxSYS_CAPTION_Y:
- // TODO case wxSYS_MENU_Y:
- // TODO case wxSYS_NETWORK_PRESENT:
-
case wxSYS_PENWINDOWS_PRESENT:
return 0;
- // TODO case wxSYS_SHOW_SOUNDS:
-
case wxSYS_SWAP_BUTTONS:
return 0;
+ // TODO: case wxSYS_CAPTION_Y:
+ // TODO: case wxSYS_MENU_Y:
+ // TODO: case wxSYS_NETWORK_PRESENT:
+ // TODO: case wxSYS_SHOW_SOUNDS:
+
+ case wxSYS_DCLICK_MSEC:
+#ifdef __LP64__
+ // default on mac is 30 ticks, we shouldn't really use wxSYS_DCLICK_MSEC anyway
+ // but rather rely on the 'click-count' by the system delivered in a mouse event
+ return 500;
+#else
+ return (int)(GetDblTime() * 1000. / 60.);
+#endif
default:
- break; // unsupported metric
+ // unsupported metric
+ break;
}
+
return -1;
}
projects / wxWidgets.git / blobdiff