summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXColor.h
diff options
context:
space:
mode:
Diffstat (limited to 'macosx/tkMacOSXColor.h')
-rw-r--r--macosx/tkMacOSXColor.h329
1 files changed, 158 insertions, 171 deletions
diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h
index 82c88c9..e27500d 100644
--- a/macosx/tkMacOSXColor.h
+++ b/macosx/tkMacOSXColor.h
@@ -6,7 +6,7 @@
* colors in a GC are unsigned longs. These are meant to be used as indexes
* into a table of XColors, where an XColor is declared in Xlib.h as:
* typedef struct {
- * unsigned long pixel;
+ * unsigned long pixel;
* unsigned short red, green, blue;
* char flags;
* char pad;
@@ -48,7 +48,7 @@ typedef struct xpixel_t {
unsigned value: 24; /* Either RGB or an index into systemColorMap. */
unsigned colortype: 8;
} xpixel;
-
+
typedef union MacPixel_t {
unsigned long ulong;
xpixel pixel;
@@ -64,17 +64,17 @@ enum macColormap {
lightColormap,
darkColormap,
};
-
+
/*
* In TkMacOSXColor.c a Tk hash table is constructed from the static data
* below to map system color names to CGColors.
- */
+ */
typedef struct {
const char *name;
enum colorType type;
int value;
- char *macName;
+ const char *macName;
/* Fields below are filled in after or during construction of the hash table. */
int index;
NSString *selector;
@@ -88,181 +88,168 @@ typedef struct {
*/
static SystemColorDatum systemColorData[] = {
-{"Pixel", rgbColor, 0 },
-{"Transparent", clearColor, 0 },
+{"Pixel", rgbColor, 0, NULL, 0, NULL },
+{"Transparent", clearColor, 0, NULL, 0, NULL },
-{"Highlight", HIBrush, kThemeBrushPrimaryHighlightColor },
-{"HighlightSecondary", HIBrush, kThemeBrushSecondaryHighlightColor },
-{"HighlightText", HIBrush, kThemeBrushBlack },
-{"HighlightAlternate", HIBrush, kThemeBrushAlternatePrimaryHighlightColor },
-{"PrimaryHighlightColor", HIBrush, kThemeBrushPrimaryHighlightColor },
-{"ButtonFace", HIBrush, kThemeBrushButtonFaceActive },
-{"SecondaryHighlightColor", HIBrush, kThemeBrushSecondaryHighlightColor },
-{"ButtonFrame", HIBrush, kThemeBrushButtonFrameActive },
-{"AlternatePrimaryHighlightColor", HIBrush, kThemeBrushAlternatePrimaryHighlightColor },
-{"WindowBody", HIBrush, kThemeBrushDocumentWindowBackground },
-{"SheetBackground", HIBrush, kThemeBrushSheetBackground },
-{"MenuActive", HIBrush, kThemeBrushMenuBackgroundSelected },
-{"Menu", HIBrush, kThemeBrushMenuBackground },
-{"DialogBackgroundInactive", HIBrush, kThemeBrushDialogBackgroundInactive },
-{"DialogBackgroundActive", HIBrush, kThemeBrushDialogBackgroundActive },
-{"AlertBackgroundActive", HIBrush, kThemeBrushAlertBackgroundActive },
-{"AlertBackgroundInactive", HIBrush, kThemeBrushAlertBackgroundInactive },
-{"ModelessDialogBackgroundActive", HIBrush, kThemeBrushModelessDialogBackgroundActive },
-{"ModelessDialogBackgroundInactive", HIBrush, kThemeBrushModelessDialogBackgroundInactive },
-{"UtilityWindowBackgroundActive", HIBrush, kThemeBrushUtilityWindowBackgroundActive },
-{"UtilityWindowBackgroundInactive", HIBrush, kThemeBrushUtilityWindowBackgroundInactive },
-{"ListViewSortColumnBackground", HIBrush, kThemeBrushListViewSortColumnBackground },
-{"ListViewBackground", HIBrush, kThemeBrushListViewBackground },
-{"IconLabelBackground", HIBrush, kThemeBrushIconLabelBackground },
-{"ListViewSeparator", HIBrush, kThemeBrushListViewSeparator },
-{"ChasingArrows", HIBrush, kThemeBrushChasingArrows },
-{"DragHilite", HIBrush, kThemeBrushDragHilite },
-{"DocumentWindowBackground", HIBrush, kThemeBrushDocumentWindowBackground },
-{"FinderWindowBackground", HIBrush, kThemeBrushFinderWindowBackground },
-{"ScrollBarDelimiterActive", HIBrush, kThemeBrushScrollBarDelimiterActive },
-{"ScrollBarDelimiterInactive", HIBrush, kThemeBrushScrollBarDelimiterInactive },
-{"FocusHighlight", HIBrush, kThemeBrushFocusHighlight },
-{"PopupArrowActive", HIBrush, kThemeBrushPopupArrowActive },
-{"PopupArrowPressed", HIBrush, kThemeBrushPopupArrowPressed },
-{"PopupArrowInactive", HIBrush, kThemeBrushPopupArrowInactive },
-{"AppleGuideCoachmark", HIBrush, kThemeBrushAppleGuideCoachmark },
-{"IconLabelBackgroundSelected", HIBrush, kThemeBrushIconLabelBackgroundSelected },
-{"StaticAreaFill", HIBrush, kThemeBrushStaticAreaFill },
-{"ActiveAreaFill", HIBrush, kThemeBrushActiveAreaFill },
-{"ButtonFrameActive", HIBrush, kThemeBrushButtonFrameActive },
-{"ButtonFrameInactive", HIBrush, kThemeBrushButtonFrameInactive },
-{"ButtonFaceActive", HIBrush, kThemeBrushButtonFaceActive },
-{"ButtonFaceInactive", HIBrush, kThemeBrushButtonFaceInactive },
-{"ButtonFacePressed", HIBrush, kThemeBrushButtonFacePressed },
-{"ButtonActiveDarkShadow", HIBrush, kThemeBrushButtonActiveDarkShadow },
-{"ButtonActiveDarkHighlight", HIBrush, kThemeBrushButtonActiveDarkHighlight },
-{"ButtonActiveLightShadow", HIBrush, kThemeBrushButtonActiveLightShadow },
-{"ButtonActiveLightHighlight", HIBrush, kThemeBrushButtonActiveLightHighlight },
-{"ButtonInactiveDarkShadow", HIBrush, kThemeBrushButtonInactiveDarkShadow },
-{"ButtonInactiveDarkHighlight", HIBrush, kThemeBrushButtonInactiveDarkHighlight },
-{"ButtonInactiveLightShadow", HIBrush, kThemeBrushButtonInactiveLightShadow },
-{"ButtonInactiveLightHighlight", HIBrush, kThemeBrushButtonInactiveLightHighlight },
-{"ButtonPressedDarkShadow", HIBrush, kThemeBrushButtonPressedDarkShadow },
-{"ButtonPressedDarkHighlight", HIBrush, kThemeBrushButtonPressedDarkHighlight },
-{"ButtonPressedLightShadow", HIBrush, kThemeBrushButtonPressedLightShadow },
-{"ButtonPressedLightHighlight", HIBrush, kThemeBrushButtonPressedLightHighlight },
-{"BevelActiveLight", HIBrush, kThemeBrushBevelActiveLight },
-{"BevelActiveDark", HIBrush, kThemeBrushBevelActiveDark },
-{"BevelInactiveLight", HIBrush, kThemeBrushBevelInactiveLight },
-{"BevelInactiveDark", HIBrush, kThemeBrushBevelInactiveDark },
-{"NotificationWindowBackground", HIBrush, kThemeBrushNotificationWindowBackground },
-{"MovableModalBackground", HIBrush, kThemeBrushMovableModalBackground },
-{"SheetBackgroundOpaque", HIBrush, kThemeBrushSheetBackgroundOpaque },
-{"DrawerBackground", HIBrush, kThemeBrushDrawerBackground },
-{"ToolbarBackground", HIBrush, kThemeBrushToolbarBackground },
-{"SheetBackgroundTransparent", HIBrush, kThemeBrushSheetBackgroundTransparent },
-{"MenuBackground", HIBrush, kThemeBrushMenuBackground },
-{"MenuBackgroundSelected", HIBrush, kThemeBrushMenuBackgroundSelected },
-{"ListViewOddRowBackground", HIBrush, kThemeBrushListViewOddRowBackground },
-{"ListViewEvenRowBackground", HIBrush, kThemeBrushListViewEvenRowBackground },
-{"ListViewColumnDivider", HIBrush, kThemeBrushListViewColumnDivider },
+{"Highlight", HIBrush, kThemeBrushPrimaryHighlightColor, NULL, 0, NULL },
+{"HighlightSecondary", HIBrush, kThemeBrushSecondaryHighlightColor, NULL, 0, NULL },
+{"HighlightText", HIBrush, kThemeBrushBlack, NULL, 0, NULL },
+{"HighlightAlternate", HIBrush, kThemeBrushAlternatePrimaryHighlightColor, NULL, 0, NULL },
+{"PrimaryHighlightColor", HIBrush, kThemeBrushPrimaryHighlightColor, NULL, 0, NULL },
+{"ButtonFace", HIBrush, kThemeBrushButtonFaceActive, NULL, 0, NULL },
+{"SecondaryHighlightColor", HIBrush, kThemeBrushSecondaryHighlightColor, NULL, 0, NULL },
+{"ButtonFrame", HIBrush, kThemeBrushButtonFrameActive, NULL, 0, NULL },
+{"AlternatePrimaryHighlightColor", HIBrush, kThemeBrushAlternatePrimaryHighlightColor, NULL, 0, NULL },
+{"WindowBody", HIBrush, kThemeBrushDocumentWindowBackground, NULL, 0, NULL },
+{"SheetBackground", HIBrush, kThemeBrushSheetBackground, NULL, 0, NULL },
+{"MenuActive", HIBrush, kThemeBrushMenuBackgroundSelected, NULL, 0, NULL },
+{"Menu", HIBrush, kThemeBrushMenuBackground, NULL, 0, NULL },
+{"DialogBackgroundInactive", HIBrush, kThemeBrushDialogBackgroundInactive, NULL, 0, NULL },
+{"DialogBackgroundActive", HIBrush, kThemeBrushDialogBackgroundActive, NULL, 0, NULL },
+{"AlertBackgroundActive", HIBrush, kThemeBrushAlertBackgroundActive, NULL, 0, NULL },
+{"AlertBackgroundInactive", HIBrush, kThemeBrushAlertBackgroundInactive, NULL, 0, NULL },
+{"ModelessDialogBackgroundActive", HIBrush, kThemeBrushModelessDialogBackgroundActive, NULL, 0, NULL },
+{"ModelessDialogBackgroundInactive", HIBrush, kThemeBrushModelessDialogBackgroundInactive, NULL, 0, NULL },
+{"UtilityWindowBackgroundActive", HIBrush, kThemeBrushUtilityWindowBackgroundActive, NULL, 0, NULL },
+{"UtilityWindowBackgroundInactive", HIBrush, kThemeBrushUtilityWindowBackgroundInactive, NULL, 0, NULL },
+{"ListViewSortColumnBackground", HIBrush, kThemeBrushListViewSortColumnBackground, NULL, 0, NULL },
+{"ListViewBackground", HIBrush, kThemeBrushListViewBackground, NULL, 0, NULL },
+{"IconLabelBackground", HIBrush, kThemeBrushIconLabelBackground, NULL, 0, NULL },
+{"ListViewSeparator", HIBrush, kThemeBrushListViewSeparator, NULL, 0, NULL },
+{"ChasingArrows", HIBrush, kThemeBrushChasingArrows, NULL, 0, NULL },
+{"DragHilite", HIBrush, kThemeBrushDragHilite, NULL, 0, NULL },
+{"DocumentWindowBackground", HIBrush, kThemeBrushDocumentWindowBackground, NULL, 0, NULL },
+{"FinderWindowBackground", HIBrush, kThemeBrushFinderWindowBackground, NULL, 0, NULL },
+{"ScrollBarDelimiterActive", HIBrush, kThemeBrushScrollBarDelimiterActive, NULL, 0, NULL },
+{"ScrollBarDelimiterInactive", HIBrush, kThemeBrushScrollBarDelimiterInactive, NULL, 0, NULL },
+{"FocusHighlight", HIBrush, kThemeBrushFocusHighlight, NULL, 0, NULL },
+{"PopupArrowActive", HIBrush, kThemeBrushPopupArrowActive, NULL, 0, NULL },
+{"PopupArrowPressed", HIBrush, kThemeBrushPopupArrowPressed, NULL, 0, NULL },
+{"PopupArrowInactive", HIBrush, kThemeBrushPopupArrowInactive, NULL, 0, NULL },
+{"AppleGuideCoachmark", HIBrush, kThemeBrushAppleGuideCoachmark, NULL, 0, NULL },
+{"IconLabelBackgroundSelected", HIBrush, kThemeBrushIconLabelBackgroundSelected, NULL, 0, NULL },
+{"StaticAreaFill", HIBrush, kThemeBrushStaticAreaFill, NULL, 0, NULL },
+{"ActiveAreaFill", HIBrush, kThemeBrushActiveAreaFill, NULL, 0, NULL },
+{"ButtonFrameActive", HIBrush, kThemeBrushButtonFrameActive, NULL, 0, NULL },
+{"ButtonFrameInactive", HIBrush, kThemeBrushButtonFrameInactive, NULL, 0, NULL },
+{"ButtonFaceActive", HIBrush, kThemeBrushButtonFaceActive, NULL, 0, NULL },
+{"ButtonFaceInactive", HIBrush, kThemeBrushButtonFaceInactive, NULL, 0, NULL },
+{"ButtonFacePressed", HIBrush, kThemeBrushButtonFacePressed, NULL, 0, NULL },
+{"ButtonActiveDarkShadow", HIBrush, kThemeBrushButtonActiveDarkShadow, NULL, 0, NULL },
+{"ButtonActiveDarkHighlight", HIBrush, kThemeBrushButtonActiveDarkHighlight, NULL, 0, NULL },
+{"ButtonActiveLightShadow", HIBrush, kThemeBrushButtonActiveLightShadow, NULL, 0, NULL },
+{"ButtonActiveLightHighlight", HIBrush, kThemeBrushButtonActiveLightHighlight, NULL, 0, NULL },
+{"ButtonInactiveDarkShadow", HIBrush, kThemeBrushButtonInactiveDarkShadow, NULL, 0, NULL },
+{"ButtonInactiveDarkHighlight", HIBrush, kThemeBrushButtonInactiveDarkHighlight, NULL, 0, NULL },
+{"ButtonInactiveLightShadow", HIBrush, kThemeBrushButtonInactiveLightShadow, NULL, 0, NULL },
+{"ButtonInactiveLightHighlight", HIBrush, kThemeBrushButtonInactiveLightHighlight, NULL, 0, NULL },
+{"ButtonPressedDarkShadow", HIBrush, kThemeBrushButtonPressedDarkShadow, NULL, 0, NULL },
+{"ButtonPressedDarkHighlight", HIBrush, kThemeBrushButtonPressedDarkHighlight, NULL, 0, NULL },
+{"ButtonPressedLightShadow", HIBrush, kThemeBrushButtonPressedLightShadow, NULL, 0, NULL },
+{"ButtonPressedLightHighlight", HIBrush, kThemeBrushButtonPressedLightHighlight, NULL, 0, NULL },
+{"BevelActiveLight", HIBrush, kThemeBrushBevelActiveLight, NULL, 0, NULL },
+{"BevelActiveDark", HIBrush, kThemeBrushBevelActiveDark, NULL, 0, NULL },
+{"BevelInactiveLight", HIBrush, kThemeBrushBevelInactiveLight, NULL, 0, NULL },
+{"BevelInactiveDark", HIBrush, kThemeBrushBevelInactiveDark, NULL, 0, NULL },
+{"NotificationWindowBackground", HIBrush, kThemeBrushNotificationWindowBackground, NULL, 0, NULL },
+{"MovableModalBackground", HIBrush, kThemeBrushMovableModalBackground, NULL, 0, NULL },
+{"SheetBackgroundOpaque", HIBrush, kThemeBrushSheetBackgroundOpaque, NULL, 0, NULL },
+{"DrawerBackground", HIBrush, kThemeBrushDrawerBackground, NULL, 0, NULL },
+{"ToolbarBackground", HIBrush, kThemeBrushToolbarBackground, NULL, 0, NULL },
+{"SheetBackgroundTransparent", HIBrush, kThemeBrushSheetBackgroundTransparent, NULL, 0, NULL },
+{"MenuBackground", HIBrush, kThemeBrushMenuBackground, NULL, 0, NULL },
+{"MenuBackgroundSelected", HIBrush, kThemeBrushMenuBackgroundSelected, NULL, 0, NULL },
+{"ListViewOddRowBackground", HIBrush, kThemeBrushListViewOddRowBackground, NULL, 0, NULL },
+{"ListViewEvenRowBackground", HIBrush, kThemeBrushListViewEvenRowBackground, NULL, 0, NULL },
+{"ListViewColumnDivider", HIBrush, kThemeBrushListViewColumnDivider, NULL, 0, NULL },
-{"ButtonText", HIText, kThemeTextColorPushButtonActive },
-{"MenuActiveText", HIText, kThemeTextColorMenuItemSelected },
-{"MenuDisabled", HIText, kThemeTextColorMenuItemDisabled },
-{"MenuText", HIText, kThemeTextColorMenuItemActive },
-{"BlackText", HIText, kThemeTextColorBlack },
-{"DialogActiveText", HIText, kThemeTextColorDialogActive },
-{"DialogInactiveText", HIText, kThemeTextColorDialogInactive },
-{"AlertActiveText", HIText, kThemeTextColorAlertActive },
-{"AlertInactiveText", HIText, kThemeTextColorAlertInactive },
-{"ModelessDialogActiveText", HIText, kThemeTextColorModelessDialogActive },
-{"ModelessDialogInactiveText", HIText, kThemeTextColorModelessDialogInactive },
-{"WindowHeaderActiveText", HIText, kThemeTextColorWindowHeaderActive },
-{"WindowHeaderInactiveText", HIText, kThemeTextColorWindowHeaderInactive },
-{"PlacardActiveText", HIText, kThemeTextColorPlacardActive },
-{"PlacardInactiveText", HIText, kThemeTextColorPlacardInactive },
-{"PlacardPressedText", HIText, kThemeTextColorPlacardPressed },
-{"PushButtonActiveText", HIText, kThemeTextColorPushButtonActive },
-{"PushButtonInactiveText", HIText, kThemeTextColorPushButtonInactive },
-{"PushButtonPressedText", HIText, kThemeTextColorPushButtonPressed },
-{"BevelButtonActiveText", HIText, kThemeTextColorBevelButtonActive },
-{"BevelButtonInactiveText", HIText, kThemeTextColorBevelButtonInactive },
-{"BevelButtonPressedText", HIText, kThemeTextColorBevelButtonPressed },
-{"PopupButtonActiveText", HIText, kThemeTextColorPopupButtonActive },
-{"PopupButtonInactiveText", HIText, kThemeTextColorPopupButtonInactive },
-{"PopupButtonPressedText", HIText, kThemeTextColorPopupButtonPressed },
-{"IconLabelText", HIText, kThemeTextColorIconLabel },
-{"ListViewText", HIText, kThemeTextColorListView },
-{"DocumentWindowTitleActiveText", HIText, kThemeTextColorDocumentWindowTitleActive },
-{"DocumentWindowTitleInactiveText", HIText, kThemeTextColorDocumentWindowTitleInactive },
-{"MovableModalWindowTitleActiveText", HIText, kThemeTextColorMovableModalWindowTitleActive },
-{"MovableModalWindowTitleInactiveText", HIText, kThemeTextColorMovableModalWindowTitleInactive },
-{"UtilityWindowTitleActiveText", HIText, kThemeTextColorUtilityWindowTitleActive },
-{"UtilityWindowTitleInactiveText", HIText, kThemeTextColorUtilityWindowTitleInactive },
-{"PopupWindowTitleActiveText", HIText, kThemeTextColorPopupWindowTitleActive },
-{"PopupWindowTitleInactiveText", HIText, kThemeTextColorPopupWindowTitleInactive },
-{"RootMenuActiveText", HIText, kThemeTextColorRootMenuActive },
-{"RootMenuSelectedText", HIText, kThemeTextColorRootMenuSelected },
-{"RootMenuDisabledText", HIText, kThemeTextColorRootMenuDisabled },
-{"MenuItemActiveText", HIText, kThemeTextColorMenuItemActive },
-{"MenuItemSelectedText", HIText, kThemeTextColorMenuItemSelected },
-{"MenuItemDisabledText", HIText, kThemeTextColorMenuItemDisabled },
-{"PopupLabelActiveText", HIText, kThemeTextColorPopupLabelActive },
-{"PopupLabelInactiveText", HIText, kThemeTextColorPopupLabelInactive },
-{"TabFrontActiveText", HIText, kThemeTextColorTabFrontActive },
-{"TabNonFrontActiveText", HIText, kThemeTextColorTabNonFrontActive },
-{"TabNonFrontPressedText", HIText, kThemeTextColorTabNonFrontPressed },
-{"TabFrontInactiveText", HIText, kThemeTextColorTabFrontInactive },
-{"TabNonFrontInactiveText", HIText, kThemeTextColorTabNonFrontInactive },
-{"IconLabelSelectedText", HIText, kThemeTextColorIconLabelSelected },
-{"BevelButtonStickyActiveText", HIText, kThemeTextColorBevelButtonStickyActive },
-{"BevelButtonStickyInactiveText", HIText, kThemeTextColorBevelButtonStickyInactive },
-{"NotificationText", HIText, kThemeTextColorNotification },
-{"SystemDetailText", HIText, kThemeTextColorSystemDetail },
-{"PlacardBackground", HIBackground, kThemeBackgroundPlacard },
-{"WindowHeaderBackground", HIBackground, kThemeBackgroundWindowHeader },
-{"ListViewWindowHeaderBackground", HIBackground, kThemeBackgroundListViewWindowHeader },
-{"MetalBackground", HIBackground, kThemeBackgroundMetal },
+{"ButtonText", HIText, kThemeTextColorPushButtonActive, NULL, 0, NULL },
+{"MenuActiveText", HIText, kThemeTextColorMenuItemSelected, NULL, 0, NULL },
+{"MenuDisabled", HIText, kThemeTextColorMenuItemDisabled, NULL, 0, NULL },
+{"MenuText", HIText, kThemeTextColorMenuItemActive, NULL, 0, NULL },
+{"BlackText", HIText, kThemeTextColorBlack, NULL, 0, NULL },
+{"DialogActiveText", HIText, kThemeTextColorDialogActive, NULL, 0, NULL },
+{"DialogInactiveText", HIText, kThemeTextColorDialogInactive, NULL, 0, NULL },
+{"AlertActiveText", HIText, kThemeTextColorAlertActive, NULL, 0, NULL },
+{"AlertInactiveText", HIText, kThemeTextColorAlertInactive, NULL, 0, NULL },
+{"ModelessDialogActiveText", HIText, kThemeTextColorModelessDialogActive, NULL, 0, NULL },
+{"ModelessDialogInactiveText", HIText, kThemeTextColorModelessDialogInactive, NULL, 0, NULL },
+{"WindowHeaderActiveText", HIText, kThemeTextColorWindowHeaderActive, NULL, 0, NULL },
+{"WindowHeaderInactiveText", HIText, kThemeTextColorWindowHeaderInactive, NULL, 0, NULL },
+{"PlacardActiveText", HIText, kThemeTextColorPlacardActive, NULL, 0, NULL },
+{"PlacardInactiveText", HIText, kThemeTextColorPlacardInactive, NULL, 0, NULL },
+{"PlacardPressedText", HIText, kThemeTextColorPlacardPressed, NULL, 0, NULL },
+{"PushButtonActiveText", HIText, kThemeTextColorPushButtonActive, NULL, 0, NULL },
+{"PushButtonInactiveText", HIText, kThemeTextColorPushButtonInactive, NULL, 0, NULL },
+{"PushButtonPressedText", HIText, kThemeTextColorPushButtonPressed, NULL, 0, NULL },
+{"BevelButtonActiveText", HIText, kThemeTextColorBevelButtonActive, NULL, 0, NULL },
+{"BevelButtonInactiveText", HIText, kThemeTextColorBevelButtonInactive, NULL, 0, NULL },
+{"BevelButtonPressedText", HIText, kThemeTextColorBevelButtonPressed, NULL, 0, NULL },
+{"PopupButtonActiveText", HIText, kThemeTextColorPopupButtonActive, NULL, 0, NULL },
+{"PopupButtonInactiveText", HIText, kThemeTextColorPopupButtonInactive, NULL, 0, NULL },
+{"PopupButtonPressedText", HIText, kThemeTextColorPopupButtonPressed, NULL, 0, NULL },
+{"IconLabelText", HIText, kThemeTextColorIconLabel, NULL, 0, NULL },
+{"ListViewText", HIText, kThemeTextColorListView, NULL, 0, NULL },
+{"DocumentWindowTitleActiveText", HIText, kThemeTextColorDocumentWindowTitleActive, NULL, 0, NULL },
+{"DocumentWindowTitleInactiveText", HIText, kThemeTextColorDocumentWindowTitleInactive, NULL, 0, NULL },
+{"MovableModalWindowTitleActiveText", HIText, kThemeTextColorMovableModalWindowTitleActive, NULL, 0, NULL },
+{"MovableModalWindowTitleInactiveText", HIText, kThemeTextColorMovableModalWindowTitleInactive, NULL, 0, NULL },
+{"UtilityWindowTitleActiveText", HIText, kThemeTextColorUtilityWindowTitleActive, NULL, 0, NULL },
+{"UtilityWindowTitleInactiveText", HIText, kThemeTextColorUtilityWindowTitleInactive, NULL, 0, NULL },
+{"PopupWindowTitleActiveText", HIText, kThemeTextColorPopupWindowTitleActive, NULL, 0, NULL },
+{"PopupWindowTitleInactiveText", HIText, kThemeTextColorPopupWindowTitleInactive, NULL, 0, NULL },
+{"RootMenuActiveText", HIText, kThemeTextColorRootMenuActive, NULL, 0, NULL },
+{"RootMenuSelectedText", HIText, kThemeTextColorRootMenuSelected, NULL, 0, NULL },
+{"RootMenuDisabledText", HIText, kThemeTextColorRootMenuDisabled, NULL, 0, NULL },
+{"MenuItemActiveText", HIText, kThemeTextColorMenuItemActive, NULL, 0, NULL },
+{"MenuItemSelectedText", HIText, kThemeTextColorMenuItemSelected, NULL, 0, NULL },
+{"MenuItemDisabledText", HIText, kThemeTextColorMenuItemDisabled, NULL, 0, NULL },
+{"PopupLabelActiveText", HIText, kThemeTextColorPopupLabelActive, NULL, 0, NULL },
+{"PopupLabelInactiveText", HIText, kThemeTextColorPopupLabelInactive, NULL, 0, NULL },
+{"TabFrontActiveText", HIText, kThemeTextColorTabFrontActive, NULL, 0, NULL },
+{"TabNonFrontActiveText", HIText, kThemeTextColorTabNonFrontActive, NULL, 0, NULL },
+{"TabNonFrontPressedText", HIText, kThemeTextColorTabNonFrontPressed, NULL, 0, NULL },
+{"TabFrontInactiveText", HIText, kThemeTextColorTabFrontInactive, NULL, 0, NULL },
+{"TabNonFrontInactiveText", HIText, kThemeTextColorTabNonFrontInactive, NULL, 0, NULL },
+{"IconLabelSelectedText", HIText, kThemeTextColorIconLabelSelected, NULL, 0, NULL },
+{"BevelButtonStickyActiveText", HIText, kThemeTextColorBevelButtonStickyActive, NULL, 0, NULL },
+{"BevelButtonStickyInactiveText", HIText, kThemeTextColorBevelButtonStickyInactive, NULL, 0, NULL },
+{"NotificationText", HIText, kThemeTextColorNotification, NULL, 0, NULL },
+{"SystemDetailText", HIText, kThemeTextColorSystemDetail, NULL, 0, NULL },
+{"PlacardBackground", HIBackground, kThemeBackgroundPlacard, NULL, 0, NULL },
+{"WindowHeaderBackground", HIBackground, kThemeBackgroundWindowHeader, NULL, 0, NULL },
+{"ListViewWindowHeaderBackground", HIBackground, kThemeBackgroundListViewWindowHeader, NULL, 0, NULL },
+{"MetalBackground", HIBackground, kThemeBackgroundMetal, NULL, 0, NULL },
-{"SecondaryGroupBoxBackground", HIBackground, kThemeBackgroundSecondaryGroupBox },
-{"TabPaneBackground", HIBackground, kThemeBackgroundTabPane },
-{"WhiteText", HIText, kThemeTextColorWhite },
-{"Black", HIBrush, kThemeBrushBlack },
-{"White", HIBrush, kThemeBrushWhite },
+{"SecondaryGroupBoxBackground", HIBackground, kThemeBackgroundSecondaryGroupBox, NULL, 0, NULL },
+{"TabPaneBackground", HIBackground, kThemeBackgroundTabPane, NULL, 0, NULL },
+{"WhiteText", HIText, kThemeTextColorWhite, NULL, 0, NULL },
+{"Black", HIBrush, kThemeBrushBlack, NULL, 0, NULL },
+{"White", HIBrush, kThemeBrushWhite, NULL, 0, NULL },
/*
* Dynamic Colors
*/
-{"WindowBackgroundColor", ttkBackground, 0 },
-{"WindowBackgroundColor1", ttkBackground, 1 },
-{"WindowBackgroundColor2", ttkBackground, 2 },
-{"WindowBackgroundColor3", ttkBackground, 3 },
-{"WindowBackgroundColor4", ttkBackground, 4 },
-{"WindowBackgroundColor5", ttkBackground, 5 },
-{"WindowBackgroundColor6", ttkBackground, 6 },
-{"WindowBackgroundColor7", ttkBackground, 7 },
+{"WindowBackgroundColor", ttkBackground, 0, NULL, 0, NULL },
+{"WindowBackgroundColor1", ttkBackground, 1, NULL, 0, NULL },
+{"WindowBackgroundColor2", ttkBackground, 2, NULL, 0, NULL },
+{"WindowBackgroundColor3", ttkBackground, 3, NULL, 0, NULL },
+{"WindowBackgroundColor4", ttkBackground, 4, NULL, 0, NULL },
+{"WindowBackgroundColor5", ttkBackground, 5, NULL, 0, NULL },
+{"WindowBackgroundColor6", ttkBackground, 6, NULL, 0, NULL },
+{"WindowBackgroundColor7", ttkBackground, 7, NULL, 0, NULL },
/* Apple's SecondaryLabelColor is the same as their LabelColor so we roll our own. */
-{"SecondaryLabelColor", ttkBackground, 14 },
-
-{"TextColor", semantic, 0, "textColor" },
-{"SelectedTextColor", semantic, 0, "selectedTextColor" },
-{"LabelColor", semantic, 0, "textColor"},
-{"LabelColor", semantic, 0, "labelColor"},
-{"ControlTextColor", semantic, 0, "controlTextColor" },
-{"DisabledControlTextColor", semantic, 0, "disabledControlTextColor" },
-#if MAC_OS_X_VERSION_MAX_ALLOWED > 1060
-{"SelectedTabTextColor", semantic, 0, "whiteColor" },
-#else
-{"SelectedTabTextColor", semantic, 0, "blackColor" },
-#endif
-{"TextBackgroundColor", semantic, 0, "textBackgroundColor" },
-{"SelectedTextBackgroundColor", semantic, 0, "selectedTextBackgroundColor" },
-{"ControlAccentColor", semantic, 0, "controlAccentColor" },
-{"LinkColor", semantic, 0, "blueColor" },
-{"LinkColor", semantic, 0, "linkColor" },
-{"PlaceholderTextColor", semantic, 0, "grayColor" },
-{"PlaceholderTextColor", semantic, 0, "placeholderTextColor" },
-{"SeparatorColor", semantic, 0, "grayColor" },
-{"SeparatorColor", semantic, 0, "separatorColor" },
-{NULL, 0, 0 }
+{"SecondaryLabelColor", ttkBackground, 14, NULL, 0, NULL },
+/* Color to use for notebook tab labels -- depends on OS version. */
+{"SelectedTabTextColor", semantic, 0, "textColor", 0, NULL },
+/* Semantic colors that we simulate on older systems which don't supoort them. */
+{"ControlAccentColor", semantic, 0, "controlAccentColor", 0, NULL },
+{"LabelColor", semantic, 0, "blackColor", 0, NULL },
+{"LinkColor", semantic, 0, "blueColor", 0, NULL },
+{"PlaceholderTextColor", semantic, 0, "grayColor", 0, NULL },
+{"SeparatorColor", semantic, 0, "grayColor", 0, NULL },
+{NULL, 0, 0, NULL, 0, NULL }
};
#endif