// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "settings.h"
-#endif
+#include "wx/wxprec.h"
#include "wx/settings.h"
#include "wx/gdicmn.h"
wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
{
- int major,minor;
+ int major, minor;
+ wxColour resultColor;
+ RGBColor macRGB;
+ ThemeBrush colorBrushID;
+
wxGetOsVersion( &major, &minor );
-
- switch( index )
+
+ switch ( index )
{
case wxSYS_COLOUR_SCROLLBAR :
case wxSYS_COLOUR_BACKGROUND:
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 ;
+ resultColor = *wxWHITE ;
else
- return wxColor( 0xEE , 0xEE , 0xEE ) ;
+ resultColor = wxColor( 0xEE, 0xEE, 0xEE );
break ;
- }
+
case wxSYS_COLOUR_BTNSHADOW:
- return wxColor( 0x44 , 0x44 , 0x44 ) ;
+ if (major >= 10)
+ resultColor = wxColor( 0xBE, 0xBE, 0xBE );
+ else
+ resultColor = wxColor( 0x44, 0x44, 0x44 );
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 ;
- LMGetHiliteRGB(&hilite) ;
- return wxColor( hilite.red >> 8 , hilite.green >> 8 , hilite.blue >> 8 ) ;
- }
+
+#if 0 && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
+ // NB: enable this case as desired
+ colorBrushID = kThemeBrushAlternatePrimaryHighlightColor;
+#else
+ colorBrushID = kThemeBrushPrimaryHighlightColor;
+#endif
+
+ GetThemeBrushAsColor( colorBrushID, 32, true, &macRGB );
+ resultColor = wxColor( macRGB.red >> 8, macRGB.green >> 8, macRGB.blue >> 8 );
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 :
- {
- RGBColor hilite ;
- LMGetHiliteRGB(&hilite) ;
- if ( ( hilite.red + hilite.green + hilite.blue ) == 0 )
- return *wxWHITE ;
- else
- return *wxBLACK ;
- }
+#if 0 && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
+ // NB: enable this case as desired
+ resultColor = *wxWHITE ;
+#else
+ GetThemeBrushAsColor( kThemeBrushPrimaryHighlightColor, 32, true, &macRGB );
+ if ((macRGB.red + macRGB.green + macRGB.blue) == 0)
+ resultColor = *wxWHITE ;
+ else
+ resultColor = *wxBLACK ;
+#endif
break ;
+
case wxSYS_COLOUR_INFOBK :
- case wxSYS_COLOUR_APPWORKSPACE:
- return *wxWHITE ;
+ case wxSYS_COLOUR_APPWORKSPACE:
+ resultColor = *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") );
+ // TODO:
+ resultColor = *wxBLACK;
+ break ;
+
+ // 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 ;
- case wxSYS_OEM_FIXED_FONT :
- case wxSYS_ANSI_FIXED_FONT :
- case wxSYS_SYSTEM_FIXED_FONT :
+
default :
- {
- return *wxNORMAL_FONT ;
- } ;
break ;
-
}
+
return *wxNORMAL_FONT;
}
// ----------------------------------------------------------------------------
// Get a system metric, e.g. scrollbar size
-int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
{
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;
- case wxSYS_BORDER_X:
- // TODO
- return 0;
- case wxSYS_BORDER_Y:
- // TODO
- return 0;
- case wxSYS_CURSOR_X:
- // TODO
- return 0;
- case wxSYS_CURSOR_Y:
- // TODO
- return 0;
- case wxSYS_DCLICK_X:
- // TODO
- return 0;
- case wxSYS_DCLICK_Y:
- // TODO
- return 0;
- case wxSYS_DRAG_X:
- // TODO
- return 0;
- case wxSYS_DRAG_Y:
- // TODO
- return 0;
- case wxSYS_EDGE_X:
- // TODO
- return 0;
- case wxSYS_EDGE_Y:
- // TODO
- return 0;
+
+ // TODO case wxSYS_BORDER_X:
+ // TODO case wxSYS_BORDER_Y:
+ // TODO case wxSYS_CURSOR_X:
+ // TODO case wxSYS_CURSOR_Y:
+ // TODO case wxSYS_DCLICK_X:
+ // TODO case wxSYS_DCLICK_Y:
+ // TODO case wxSYS_DRAG_X:
+ // TODO case wxSYS_DRAG_Y:
+ // TODO case wxSYS_EDGE_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;
- case wxSYS_ICON_X:
- // TODO
- return 0;
- case wxSYS_ICON_Y:
- // TODO
- return 0;
- case wxSYS_ICONSPACING_X:
- // TODO
- return 0;
- case wxSYS_ICONSPACING_Y:
- // TODO
- return 0;
- case wxSYS_WINDOWMIN_X:
- // TODO
- return 0;
- case wxSYS_WINDOWMIN_Y:
- // TODO
- return 0;
+
+ // TODO case wxSYS_ICON_X:
+ // TODO case wxSYS_ICON_Y:
+ // TODO case wxSYS_ICONSPACING_X:
+ // TODO case wxSYS_ICONSPACING_Y:
+ // TODO case wxSYS_WINDOWMIN_X:
+ // 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;
- case wxSYS_FRAMESIZE_X:
- // TODO
- return 0;
- case wxSYS_FRAMESIZE_Y:
- // TODO
- return 0;
- case wxSYS_SMALLICON_X:
- // TODO
- return 0;
- case wxSYS_SMALLICON_Y:
- // TODO
- return 0;
+
+ // TODO case wxSYS_FRAMESIZE_X:
+ // TODO case wxSYS_FRAMESIZE_Y:
+ // TODO case wxSYS_SMALLICON_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;
- case wxSYS_CAPTION_Y:
- // TODO
- return 0;
- case wxSYS_MENU_Y:
- // TODO
- return 0;
- case wxSYS_NETWORK_PRESENT:
- // TODO
- return 0;
+
case wxSYS_PENWINDOWS_PRESENT:
return 0;
- case wxSYS_SHOW_SOUNDS:
- // TODO
- return 0;
+
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:
+
default:
- return 0;
+ // unsupported metric
+ break;
}
- return 0;
+
+ return -1;
}
bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
{
switch (index)
{
- case wxSYS_CAN_ICONIZE_FRAME:
+ case wxSYS_CAN_ICONIZE_FRAME:
case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
- return TRUE;
-
+ return true;
+
default:
- return FALSE;
+ return false;
}
}
projects / wxWidgets.git / blobdiff