Fix bug [0d63621b6c]: Aqua ttk uses incorrect background colors.

1 files changed, 199 insertions, 197 deletions

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 459ca47..b90fae3 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -22,6 +22,7 @@ struct SystemColorMapEntry {
     ThemeBrush brush;
     ThemeTextColor textColor;
     ThemeBackgroundKind background;
+    int depth;
 };  /* unsigned char pixelCode; */
 
 /*
@@ -32,145 +33,153 @@ struct SystemColorMapEntry {
 
 #define MIN_PIXELCODE  30
 static const struct SystemColorMapEntry systemColorMap[] = {
-    { "Transparent",			    0, 0, 0 },							/*  30: TRANSPARENT_PIXEL */
-    { "Highlight",			    kThemeBrushPrimaryHighlightColor, 0, 0 },			/*  31: HIGHLIGHT_PIXEL */
-    { "HighlightSecondary",		    kThemeBrushSecondaryHighlightColor, 0, 0 },			/*  32: HIGHLIGHT_SECONDARY_PIXEL */
-    { "HighlightText",			    kThemeBrushBlack, 0, 0 },					/*  33: HIGHLIGHT_TEXT_PIXEL */
-    { "HighlightAlternate",		    kThemeBrushAlternatePrimaryHighlightColor, 0, 0 },		/*  34: HIGHLIGHT_ALTERNATE_PIXEL */
-    { "ButtonText",			    0, kThemeTextColorPushButtonActive, 0 },			/*  35: CONTROL_TEXT_PIXEL */
-    { "PrimaryHighlightColor",		    kThemeBrushPrimaryHighlightColor, 0, 0 },			/*  36 */
-    { "ButtonFace",			    kThemeBrushButtonFaceActive, 0, 0 },			/*  37: CONTROL_BODY_PIXEL */
-    { "SecondaryHighlightColor",	    kThemeBrushSecondaryHighlightColor, 0, 0 },			/*  38 */
-    { "ButtonFrame",			    kThemeBrushButtonFrameActive, 0, 0 },			/*  39: CONTROL_FRAME_PIXEL */
-    { "AlternatePrimaryHighlightColor",	    kThemeBrushAlternatePrimaryHighlightColor, 0, 0 },		/*  40 */
-    { "WindowBody",			    kThemeBrushDocumentWindowBackground, 0, 0 },		/*  41: WINDOW_BODY_PIXEL */
-    { "SheetBackground",		    kThemeBrushSheetBackground, 0, 0 },				/*  42 */
-    { "MenuActive",			    kThemeBrushMenuBackgroundSelected, 0, 0 },			/*  43: MENU_ACTIVE_PIXEL */
-    { "Black",				    kThemeBrushBlack, 0, 0 },					/*  44 */
-    { "MenuActiveText",			    0, kThemeTextColorMenuItemSelected, 0 },			/*  45: MENU_ACTIVE_TEXT_PIXEL */
-    { "White",				    kThemeBrushWhite, 0, 0 },					/*  46 */
-    { "Menu",				    kThemeBrushMenuBackground, 0, 0 },				/*  47: MENU_BACKGROUND_PIXEL */
-    { "DialogBackgroundActive",		    kThemeBrushDialogBackgroundActive, 0, 0 },			/*  48 */
-    { "MenuDisabled",			    0, kThemeTextColorMenuItemDisabled, 0 },			/*  49: MENU_DISABLED_PIXEL */
-    { "DialogBackgroundInactive",	    kThemeBrushDialogBackgroundInactive, 0, 0 },		/*  50 */
-    { "MenuText",			    0, kThemeTextColorMenuItemActive, 0 },			/*  51: MENU_TEXT_PIXEL */
-    { "AppearanceColor",		    0, 0, 0 },							/*  52: APPEARANCE_PIXEL */
-    { "AlertBackgroundActive",		    kThemeBrushAlertBackgroundActive, 0, 0 },			/*  53 */
-    { "AlertBackgroundInactive",	    kThemeBrushAlertBackgroundInactive, 0, 0 },			/*  54 */
-    { "ModelessDialogBackgroundActive",	    kThemeBrushModelessDialogBackgroundActive, 0, 0 },		/*  55 */
-    { "ModelessDialogBackgroundInactive",   kThemeBrushModelessDialogBackgroundInactive, 0, 0 },	/*  56 */
-    { "UtilityWindowBackgroundActive",	    kThemeBrushUtilityWindowBackgroundActive, 0, 0 },		/*  57 */
-    { "UtilityWindowBackgroundInactive",    kThemeBrushUtilityWindowBackgroundInactive, 0, 0 },		/*  58 */
-    { "ListViewSortColumnBackground",	    kThemeBrushListViewSortColumnBackground, 0, 0 },		/*  59 */
-    { "ListViewBackground",		    kThemeBrushListViewBackground, 0, 0 },			/*  60 */
-    { "IconLabelBackground",		    kThemeBrushIconLabelBackground, 0, 0 },			/*  61 */
-    { "ListViewSeparator",		    kThemeBrushListViewSeparator, 0, 0 },			/*  62 */
-    { "ChasingArrows",			    kThemeBrushChasingArrows, 0, 0 },				/*  63 */
-    { "DragHilite",			    kThemeBrushDragHilite, 0, 0 },				/*  64 */
-    { "DocumentWindowBackground",	    kThemeBrushDocumentWindowBackground, 0, 0 },		/*  65 */
-    { "FinderWindowBackground",		    kThemeBrushFinderWindowBackground, 0, 0 },			/*  66 */
-    { "ScrollBarDelimiterActive",	    kThemeBrushScrollBarDelimiterActive, 0, 0 },		/*  67 */
-    { "ScrollBarDelimiterInactive",	    kThemeBrushScrollBarDelimiterInactive, 0, 0 },		/*  68 */
-    { "FocusHighlight",			    kThemeBrushFocusHighlight, 0, 0 },				/*  69 */
-    { "PopupArrowActive",		    kThemeBrushPopupArrowActive, 0, 0 },			/*  70 */
-    { "PopupArrowPressed",		    kThemeBrushPopupArrowPressed, 0, 0 },			/*  71 */
-    { "PopupArrowInactive",		    kThemeBrushPopupArrowInactive, 0, 0 },			/*  72 */
-    { "AppleGuideCoachmark",		    kThemeBrushAppleGuideCoachmark, 0, 0 },			/*  73 */
-    { "IconLabelBackgroundSelected",	    kThemeBrushIconLabelBackgroundSelected, 0, 0 },		/*  74 */
-    { "StaticAreaFill",			    kThemeBrushStaticAreaFill, 0, 0 },				/*  75 */
-    { "ActiveAreaFill",			    kThemeBrushActiveAreaFill, 0, 0 },				/*  76 */
-    { "ButtonFrameActive",		    kThemeBrushButtonFrameActive, 0, 0 },			/*  77 */
-    { "ButtonFrameInactive",		    kThemeBrushButtonFrameInactive, 0, 0 },			/*  78 */
-    { "ButtonFaceActive",		    kThemeBrushButtonFaceActive, 0, 0 },			/*  79 */
-    { "ButtonFaceInactive",		    kThemeBrushButtonFaceInactive, 0, 0 },			/*  80 */
-    { "ButtonFacePressed",		    kThemeBrushButtonFacePressed, 0, 0 },			/*  81 */
-    { "ButtonActiveDarkShadow",		    kThemeBrushButtonActiveDarkShadow, 0, 0 },			/*  82 */
-    { "ButtonActiveDarkHighlight",	    kThemeBrushButtonActiveDarkHighlight, 0, 0 },		/*  83 */
-    { "ButtonActiveLightShadow",	    kThemeBrushButtonActiveLightShadow, 0, 0 },			/*  84 */
-    { "ButtonActiveLightHighlight",	    kThemeBrushButtonActiveLightHighlight, 0, 0 },		/*  85 */
-    { "ButtonInactiveDarkShadow",	    kThemeBrushButtonInactiveDarkShadow, 0, 0 },		/*  86 */
-    { "ButtonInactiveDarkHighlight",	    kThemeBrushButtonInactiveDarkHighlight, 0, 0 },		/*  87 */
-    { "ButtonInactiveLightShadow",	    kThemeBrushButtonInactiveLightShadow, 0, 0 },		/*  88 */
-    { "ButtonInactiveLightHighlight",	    kThemeBrushButtonInactiveLightHighlight, 0, 0 },		/*  89 */
-    { "ButtonPressedDarkShadow",	    kThemeBrushButtonPressedDarkShadow, 0, 0 },			/*  90 */
-    { "ButtonPressedDarkHighlight",	    kThemeBrushButtonPressedDarkHighlight, 0, 0 },		/*  91 */
-    { "ButtonPressedLightShadow",	    kThemeBrushButtonPressedLightShadow, 0, 0 },		/*  92 */
-    { "ButtonPressedLightHighlight",	    kThemeBrushButtonPressedLightHighlight, 0, 0 },		/*  93 */
-    { "BevelActiveLight",		    kThemeBrushBevelActiveLight, 0, 0 },			/*  94 */
-    { "BevelActiveDark",		    kThemeBrushBevelActiveDark, 0, 0 },				/*  95 */
-    { "BevelInactiveLight",		    kThemeBrushBevelInactiveLight, 0, 0 },			/*  96 */
-    { "BevelInactiveDark",		    kThemeBrushBevelInactiveDark, 0, 0 },			/*  97 */
-    { "NotificationWindowBackground",	    kThemeBrushNotificationWindowBackground, 0, 0 },		/*  98 */
-    { "MovableModalBackground",		    kThemeBrushMovableModalBackground, 0, 0 },			/*  99 */
-    { "SheetBackgroundOpaque",		    kThemeBrushSheetBackgroundOpaque, 0, 0 },			/* 100 */
-    { "DrawerBackground",		    kThemeBrushDrawerBackground, 0, 0 },			/* 101 */
-    { "ToolbarBackground",		    kThemeBrushToolbarBackground, 0, 0 },			/* 102 */
-    { "SheetBackgroundTransparent",	    kThemeBrushSheetBackgroundTransparent, 0, 0 },		/* 103 */
-    { "MenuBackground",			    kThemeBrushMenuBackground, 0, 0 },				/* 104 */
-    { "Pixel",				    0, 0, 0 },							/* 105: PIXEL_MAGIC */
-    { "MenuBackgroundSelected",		    kThemeBrushMenuBackgroundSelected, 0, 0 },			/* 106 */
-    { "ListViewOddRowBackground",	    kThemeBrushListViewOddRowBackground, 0, 0 },		/* 107 */
-    { "ListViewEvenRowBackground",	    kThemeBrushListViewEvenRowBackground, 0, 0 },		/* 108 */
-    { "ListViewColumnDivider",		    kThemeBrushListViewColumnDivider, 0, 0 },			/* 109 */
-    { "BlackText",			    0, kThemeTextColorBlack, 0 },				/* 110 */
-    { "DialogActiveText",		    0, kThemeTextColorDialogActive, 0 },			/* 111 */
-    { "DialogInactiveText",		    0, kThemeTextColorDialogInactive, 0 },			/* 112 */
-    { "AlertActiveText",		    0, kThemeTextColorAlertActive, 0 },				/* 113 */
-    { "AlertInactiveText",		    0, kThemeTextColorAlertInactive, 0 },			/* 114 */
-    { "ModelessDialogActiveText",	    0, kThemeTextColorModelessDialogActive, 0 },		/* 115 */
-    { "ModelessDialogInactiveText",	    0, kThemeTextColorModelessDialogInactive, 0 },		/* 116 */
-    { "WindowHeaderActiveText",		    0, kThemeTextColorWindowHeaderActive, 0 },			/* 117 */
-    { "WindowHeaderInactiveText",	    0, kThemeTextColorWindowHeaderInactive, 0 },		/* 118 */
-    { "PlacardActiveText",		    0, kThemeTextColorPlacardActive, 0 },			/* 119 */
-    { "PlacardInactiveText",		    0, kThemeTextColorPlacardInactive, 0 },			/* 120 */
-    { "PlacardPressedText",		    0, kThemeTextColorPlacardPressed, 0 },			/* 121 */
-    { "PushButtonActiveText",		    0, kThemeTextColorPushButtonActive, 0 },			/* 122 */
-    { "PushButtonInactiveText",		    0, kThemeTextColorPushButtonInactive, 0 },			/* 123 */
-    { "PushButtonPressedText",		    0, kThemeTextColorPushButtonPressed, 0 },			/* 124 */
-    { "BevelButtonActiveText",		    0, kThemeTextColorBevelButtonActive, 0 },			/* 125 */
-    { "BevelButtonInactiveText",	    0, kThemeTextColorBevelButtonInactive, 0 },			/* 126 */
-    { "BevelButtonPressedText",		    0, kThemeTextColorBevelButtonPressed, 0 },			/* 127 */
-    { "PopupButtonActiveText",		    0, kThemeTextColorPopupButtonActive, 0 },			/* 128 */
-    { "PopupButtonInactiveText",	    0, kThemeTextColorPopupButtonInactive, 0 },			/* 129 */
-    { "PopupButtonPressedText",		    0, kThemeTextColorPopupButtonPressed, 0 },			/* 130 */
-    { "IconLabelText",			    0, kThemeTextColorIconLabel, 0 },				/* 131 */
-    { "ListViewText",			    0, kThemeTextColorListView, 0 },				/* 132 */
-    { "DocumentWindowTitleActiveText",	    0, kThemeTextColorDocumentWindowTitleActive, 0 },		/* 133 */
-    { "DocumentWindowTitleInactiveText",    0, kThemeTextColorDocumentWindowTitleInactive, 0 },		/* 134 */
-    { "MovableModalWindowTitleActiveText",  0, kThemeTextColorMovableModalWindowTitleActive, 0 },	/* 135 */
-    { "MovableModalWindowTitleInactiveText",0, kThemeTextColorMovableModalWindowTitleInactive, 0 },	/* 136 */
-    { "UtilityWindowTitleActiveText",	    0, kThemeTextColorUtilityWindowTitleActive, 0 },		/* 137 */
-    { "UtilityWindowTitleInactiveText",	    0, kThemeTextColorUtilityWindowTitleInactive, 0 },		/* 138 */
-    { "PopupWindowTitleActiveText",	    0, kThemeTextColorPopupWindowTitleActive, 0 },		/* 139 */
-    { "PopupWindowTitleInactiveText",	    0, kThemeTextColorPopupWindowTitleInactive, 0 },		/* 140 */
-    { "RootMenuActiveText",		    0, kThemeTextColorRootMenuActive, 0 },			/* 141 */
-    { "RootMenuSelectedText",		    0, kThemeTextColorRootMenuSelected, 0 },			/* 142 */
-    { "RootMenuDisabledText",		    0, kThemeTextColorRootMenuDisabled, 0 },			/* 143 */
-    { "MenuItemActiveText",		    0, kThemeTextColorMenuItemActive, 0 },			/* 144 */
-    { "MenuItemSelectedText",		    0, kThemeTextColorMenuItemSelected, 0 },			/* 145 */
-    { "MenuItemDisabledText",		    0, kThemeTextColorMenuItemDisabled, 0 },			/* 146 */
-    { "PopupLabelActiveText",		    0, kThemeTextColorPopupLabelActive, 0 },			/* 147 */
-    { "PopupLabelInactiveText",		    0, kThemeTextColorPopupLabelInactive, 0 },			/* 148 */
-    { "TabFrontActiveText",		    0, kThemeTextColorTabFrontActive, 0 },			/* 149 */
-    { "TabNonFrontActiveText",		    0, kThemeTextColorTabNonFrontActive, 0 },			/* 150 */
-    { "TabNonFrontPressedText",		    0, kThemeTextColorTabNonFrontPressed, 0 },			/* 151 */
-    { "TabFrontInactiveText",		    0, kThemeTextColorTabFrontInactive, 0 },			/* 152 */
-    { "TabNonFrontInactiveText",	    0, kThemeTextColorTabNonFrontInactive, 0 },			/* 153 */
-    { "IconLabelSelectedText",		    0, kThemeTextColorIconLabelSelected, 0 },			/* 154 */
-    { "BevelButtonStickyActiveText",	    0, kThemeTextColorBevelButtonStickyActive, 0 },		/* 155 */
-    { "BevelButtonStickyInactiveText",	    0, kThemeTextColorBevelButtonStickyInactive, 0 },		/* 156 */
-    { "NotificationText",		    0, kThemeTextColorNotification, 0 },			/* 157 */
-    { "SystemDetailText",		    0, kThemeTextColorSystemDetail, 0 },			/* 158 */
-    { "WhiteText",			    0, kThemeTextColorWhite, 0 },				/* 159 */
-    { "TabPaneBackground",		    0, 0, kThemeBackgroundTabPane },				/* 160 */
-    { "PlacardBackground",		    0, 0, kThemeBackgroundPlacard },				/* 161 */
-    { "WindowHeaderBackground",		    0, 0, kThemeBackgroundWindowHeader },			/* 162 */
-    { "ListViewWindowHeaderBackground",	    0, 0, kThemeBackgroundListViewWindowHeader },		/* 163 */
-    { "SecondaryGroupBoxBackground",	    0, 0, kThemeBackgroundSecondaryGroupBox },			/* 164 */
-    { "MetalBackground",		    0, 0, kThemeBackgroundMetal },				/* 165 */
-    { NULL,				    0, 0, 0 }
+    { "Transparent",			    0, 0, 0, 0 },						/*  30: TRANSPARENT_PIXEL */
+    { "Highlight",			    kThemeBrushPrimaryHighlightColor, 0, 0, 0 },		/*  31: HIGHLIGHT_PIXEL */
+    { "HighlightSecondary",		    kThemeBrushSecondaryHighlightColor, 0, 0, 0 },		/*  32: HIGHLIGHT_SECONDARY_PIXEL */
+    { "HighlightText",			    kThemeBrushBlack, 0, 0, 0 },				/*  33: HIGHLIGHT_TEXT_PIXEL */
+    { "HighlightAlternate",		    kThemeBrushAlternatePrimaryHighlightColor, 0, 0, 0 },	/*  34: HIGHLIGHT_ALTERNATE_PIXEL */
+    { "ButtonText",			    0, kThemeTextColorPushButtonActive, 0, 0 },			/*  35: CONTROL_TEXT_PIXEL */
+    { "PrimaryHighlightColor",		    kThemeBrushPrimaryHighlightColor, 0, 0, 0 },		/*  36 */
+    { "ButtonFace",			    kThemeBrushButtonFaceActive, 0, 0, 0 },			/*  37: CONTROL_BODY_PIXEL */
+    { "SecondaryHighlightColor",	    kThemeBrushSecondaryHighlightColor, 0, 0, 0 },		/*  38 */
+    { "ButtonFrame",			    kThemeBrushButtonFrameActive, 0, 0, 0 },			/*  39: CONTROL_FRAME_PIXEL */
+    { "AlternatePrimaryHighlightColor",	    kThemeBrushAlternatePrimaryHighlightColor, 0, 0, 0 },	/*  40 */
+    { "WindowBody",			    kThemeBrushDocumentWindowBackground, 0, 0, 0 },		/*  41: WINDOW_BODY_PIXEL */
+    { "SheetBackground",		    kThemeBrushSheetBackground, 0, 0, 0 },			/*  42 */
+    { "MenuActive",			    kThemeBrushMenuBackgroundSelected, 0, 0, 0 },		/*  43: MENU_ACTIVE_PIXEL */
+    { "Black",				    kThemeBrushBlack, 0, 0, 0 },				/*  44 */
+    { "MenuActiveText",			    0, kThemeTextColorMenuItemSelected, 0, 0 },			/*  45: MENU_ACTIVE_TEXT_PIXEL */
+    { "White",				    kThemeBrushWhite, 0, 0, 0 },				/*  46 */
+    { "Menu",				    kThemeBrushMenuBackground, 0, 0, 0 },			/*  47: MENU_BACKGROUND_PIXEL */
+    { "DialogBackgroundActive",		    kThemeBrushDialogBackgroundActive, 0, 0, 0 },		/*  48 */
+    { "MenuDisabled",			    0, kThemeTextColorMenuItemDisabled, 0, 0 },			/*  49: MENU_DISABLED_PIXEL */
+    { "DialogBackgroundInactive",	    kThemeBrushDialogBackgroundInactive, 0, 0, 0 },		/*  50 */
+    { "MenuText",			    0, kThemeTextColorMenuItemActive, 0, 0 },			/*  51: MENU_TEXT_PIXEL */
+    { "AppearanceColor",		    0, 0, 0, 0 },						/*  52: APPEARANCE_PIXEL */
+    { "AlertBackgroundActive",		    kThemeBrushAlertBackgroundActive, 0, 0, 0 },		/*  53 */
+    { "AlertBackgroundInactive",	    kThemeBrushAlertBackgroundInactive, 0, 0, 0 },		/*  54 */
+    { "ModelessDialogBackgroundActive",	    kThemeBrushModelessDialogBackgroundActive, 0, 0, 0 },	/*  55 */
+    { "ModelessDialogBackgroundInactive",   kThemeBrushModelessDialogBackgroundInactive, 0, 0, 0 },	/*  56 */
+    { "UtilityWindowBackgroundActive",	    kThemeBrushUtilityWindowBackgroundActive, 0, 0, 0 },	/*  57 */
+    { "UtilityWindowBackgroundInactive",    kThemeBrushUtilityWindowBackgroundInactive, 0, 0, 0 },	/*  58 */
+    { "ListViewSortColumnBackground",	    kThemeBrushListViewSortColumnBackground, 0, 0, 0 },		/*  59 */
+    { "ListViewBackground",		    kThemeBrushListViewBackground, 0, 0, 0 },			/*  60 */
+    { "IconLabelBackground",		    kThemeBrushIconLabelBackground, 0, 0, 0 },			/*  61 */
+    { "ListViewSeparator",		    kThemeBrushListViewSeparator, 0, 0, 0 },			/*  62 */
+    { "ChasingArrows",			    kThemeBrushChasingArrows, 0, 0, 0 },			/*  63 */
+    { "DragHilite",			    kThemeBrushDragHilite, 0, 0, 0 },				/*  64 */
+    { "DocumentWindowBackground",	    kThemeBrushDocumentWindowBackground, 0, 0, 0 },		/*  65 */
+    { "FinderWindowBackground",		    kThemeBrushFinderWindowBackground, 0, 0, 0 },		/*  66 */
+    { "ScrollBarDelimiterActive",	    kThemeBrushScrollBarDelimiterActive, 0, 0, 0 },		/*  67 */
+    { "ScrollBarDelimiterInactive",	    kThemeBrushScrollBarDelimiterInactive, 0, 0, 0 },		/*  68 */
+    { "FocusHighlight",			    kThemeBrushFocusHighlight, 0, 0, 0 },			/*  69 */
+    { "PopupArrowActive",		    kThemeBrushPopupArrowActive, 0, 0, 0 },			/*  70 */
+    { "PopupArrowPressed",		    kThemeBrushPopupArrowPressed, 0, 0, 0 },			/*  71 */
+    { "PopupArrowInactive",		    kThemeBrushPopupArrowInactive, 0, 0, 0 },			/*  72 */
+    { "AppleGuideCoachmark",		    kThemeBrushAppleGuideCoachmark, 0, 0, 0 },			/*  73 */
+    { "IconLabelBackgroundSelected",	    kThemeBrushIconLabelBackgroundSelected, 0, 0, 0 },		/*  74 */
+    { "StaticAreaFill",			    kThemeBrushStaticAreaFill, 0, 0, 0 },			/*  75 */
+    { "ActiveAreaFill",			    kThemeBrushActiveAreaFill, 0, 0, 0 },			/*  76 */
+    { "ButtonFrameActive",		    kThemeBrushButtonFrameActive, 0, 0, 0 },			/*  77 */
+    { "ButtonFrameInactive",		    kThemeBrushButtonFrameInactive, 0, 0, 0 },			/*  78 */
+    { "ButtonFaceActive",		    kThemeBrushButtonFaceActive, 0, 0, 0 },			/*  79 */
+    { "ButtonFaceInactive",		    kThemeBrushButtonFaceInactive, 0, 0, 0 },			/*  80 */
+    { "ButtonFacePressed",		    kThemeBrushButtonFacePressed, 0, 0, 0 },			/*  81 */
+    { "ButtonActiveDarkShadow",		    kThemeBrushButtonActiveDarkShadow, 0, 0, 0 },		/*  82 */
+    { "ButtonActiveDarkHighlight",	    kThemeBrushButtonActiveDarkHighlight, 0, 0, 0 },		/*  83 */
+    { "ButtonActiveLightShadow",	    kThemeBrushButtonActiveLightShadow, 0, 0, 0 },		/*  84 */
+    { "ButtonActiveLightHighlight",	    kThemeBrushButtonActiveLightHighlight, 0, 0, 0 },		/*  85 */
+    { "ButtonInactiveDarkShadow",	    kThemeBrushButtonInactiveDarkShadow, 0, 0, 0 },		/*  86 */
+    { "ButtonInactiveDarkHighlight",	    kThemeBrushButtonInactiveDarkHighlight, 0, 0, 0 },		/*  87 */
+    { "ButtonInactiveLightShadow",	    kThemeBrushButtonInactiveLightShadow, 0, 0, 0 },		/*  88 */
+    { "ButtonInactiveLightHighlight",	    kThemeBrushButtonInactiveLightHighlight, 0, 0, 0 },		/*  89 */
+    { "ButtonPressedDarkShadow",	    kThemeBrushButtonPressedDarkShadow, 0, 0, 0 },		/*  90 */
+    { "ButtonPressedDarkHighlight",	    kThemeBrushButtonPressedDarkHighlight, 0, 0, 0 },		/*  91 */
+    { "ButtonPressedLightShadow",	    kThemeBrushButtonPressedLightShadow, 0, 0, 0 },		/*  92 */
+    { "ButtonPressedLightHighlight",	    kThemeBrushButtonPressedLightHighlight, 0, 0, 0 },		/*  93 */
+    { "BevelActiveLight",		    kThemeBrushBevelActiveLight, 0, 0, 0 },			/*  94 */
+    { "BevelActiveDark",		    kThemeBrushBevelActiveDark, 0, 0, 0 },			/*  95 */
+    { "BevelInactiveLight",		    kThemeBrushBevelInactiveLight, 0, 0, 0 },			/*  96 */
+    { "BevelInactiveDark",		    kThemeBrushBevelInactiveDark, 0, 0, 0 },			/*  97 */
+    { "NotificationWindowBackground",	    kThemeBrushNotificationWindowBackground, 0, 0, 0 },		/*  98 */
+    { "MovableModalBackground",		    kThemeBrushMovableModalBackground, 0, 0, 0 },		/*  99 */
+    { "SheetBackgroundOpaque",		    kThemeBrushSheetBackgroundOpaque, 0, 0, 0 },		/* 100 */
+    { "DrawerBackground",		    kThemeBrushDrawerBackground, 0, 0, 0 },			/* 101 */
+    { "ToolbarBackground",		    kThemeBrushToolbarBackground, 0, 0, 0 },			/* 102 */
+    { "SheetBackgroundTransparent",	    kThemeBrushSheetBackgroundTransparent, 0, 0, 0 },		/* 103 */
+    { "MenuBackground",			    kThemeBrushMenuBackground, 0, 0, 0 },			/* 104 */
+    { "Pixel",				    0, 0, 0, 0 },						/* 105: PIXEL_MAGIC */
+    { "MenuBackgroundSelected",		    kThemeBrushMenuBackgroundSelected, 0, 0, 0 },		/* 106 */
+    { "ListViewOddRowBackground",	    kThemeBrushListViewOddRowBackground, 0, 0, 0 },		/* 107 */
+    { "ListViewEvenRowBackground",	    kThemeBrushListViewEvenRowBackground, 0, 0, 0 },		/* 108 */
+    { "ListViewColumnDivider",		    kThemeBrushListViewColumnDivider, 0, 0, 0 },		/* 109 */
+    { "BlackText",			    0, kThemeTextColorBlack, 0, 0 },				/* 110 */
+    { "DialogActiveText",		    0, kThemeTextColorDialogActive, 0, 0 },			/* 111 */
+    { "DialogInactiveText",		    0, kThemeTextColorDialogInactive, 0, 0 },			/* 112 */
+    { "AlertActiveText",		    0, kThemeTextColorAlertActive, 0, 0 },			/* 113 */
+    { "AlertInactiveText",		    0, kThemeTextColorAlertInactive, 0, 0 },			/* 114 */
+    { "ModelessDialogActiveText",	    0, kThemeTextColorModelessDialogActive, 0, 0 },		/* 115 */
+    { "ModelessDialogInactiveText",	    0, kThemeTextColorModelessDialogInactive, 0, 0 },		/* 116 */
+    { "WindowHeaderActiveText",		    0, kThemeTextColorWindowHeaderActive, 0, 0 },		/* 117 */
+    { "WindowHeaderInactiveText",	    0, kThemeTextColorWindowHeaderInactive, 0, 0 },		/* 118 */
+    { "PlacardActiveText",		    0, kThemeTextColorPlacardActive, 0, 0 },			/* 119 */
+    { "PlacardInactiveText",		    0, kThemeTextColorPlacardInactive, 0, 0 },			/* 120 */
+    { "PlacardPressedText",		    0, kThemeTextColorPlacardPressed, 0, 0 },			/* 121 */
+    { "PushButtonActiveText",		    0, kThemeTextColorPushButtonActive, 0, 0 },			/* 122 */
+    { "PushButtonInactiveText",		    0, kThemeTextColorPushButtonInactive, 0, 0 },		/* 123 */
+    { "PushButtonPressedText",		    0, kThemeTextColorPushButtonPressed, 0, 0 },		/* 124 */
+    { "BevelButtonActiveText",		    0, kThemeTextColorBevelButtonActive, 0, 0 },		/* 125 */
+    { "BevelButtonInactiveText",	    0, kThemeTextColorBevelButtonInactive, 0, 0 },		/* 126 */
+    { "BevelButtonPressedText",		    0, kThemeTextColorBevelButtonPressed, 0, 0 },		/* 127 */
+    { "PopupButtonActiveText",		    0, kThemeTextColorPopupButtonActive, 0, 0 },		/* 128 */
+    { "PopupButtonInactiveText",	    0, kThemeTextColorPopupButtonInactive, 0, 0 },		/* 129 */
+    { "PopupButtonPressedText",		    0, kThemeTextColorPopupButtonPressed, 0, 0 },		/* 130 */
+    { "IconLabelText",			    0, kThemeTextColorIconLabel, 0, 0 },			/* 131 */
+    { "ListViewText",			    0, kThemeTextColorListView, 0, 0 },				/* 132 */
+    { "DocumentWindowTitleActiveText",	    0, kThemeTextColorDocumentWindowTitleActive, 0, 0 },	/* 133 */
+    { "DocumentWindowTitleInactiveText",    0, kThemeTextColorDocumentWindowTitleInactive, 0, 0 },	/* 134 */
+    { "MovableModalWindowTitleActiveText",  0, kThemeTextColorMovableModalWindowTitleActive, 0, 0 },	/* 135 */
+    { "MovableModalWindowTitleInactiveText",0, kThemeTextColorMovableModalWindowTitleInactive, 0, 0 },	/* 136 */
+    { "UtilityWindowTitleActiveText",	    0, kThemeTextColorUtilityWindowTitleActive, 0, 0 },		/* 137 */
+    { "UtilityWindowTitleInactiveText",	    0, kThemeTextColorUtilityWindowTitleInactive, 0, 0 },	/* 138 */
+    { "PopupWindowTitleActiveText",	    0, kThemeTextColorPopupWindowTitleActive, 0, 0 },		/* 139 */
+    { "PopupWindowTitleInactiveText",	    0, kThemeTextColorPopupWindowTitleInactive, 0, 0 },		/* 140 */
+    { "RootMenuActiveText",		    0, kThemeTextColorRootMenuActive, 0, 0 },			/* 141 */
+    { "RootMenuSelectedText",		    0, kThemeTextColorRootMenuSelected, 0, 0 },			/* 142 */
+    { "RootMenuDisabledText",		    0, kThemeTextColorRootMenuDisabled, 0, 0 },			/* 143 */
+    { "MenuItemActiveText",		    0, kThemeTextColorMenuItemActive, 0, 0 },			/* 144 */
+    { "MenuItemSelectedText",		    0, kThemeTextColorMenuItemSelected, 0, 0 },			/* 145 */
+    { "MenuItemDisabledText",		    0, kThemeTextColorMenuItemDisabled, 0, 0 },			/* 146 */
+    { "PopupLabelActiveText",		    0, kThemeTextColorPopupLabelActive, 0, 0 },			/* 147 */
+    { "PopupLabelInactiveText",		    0, kThemeTextColorPopupLabelInactive, 0, 0 },		/* 148 */
+    { "TabFrontActiveText",		    0, kThemeTextColorTabFrontActive, 0, 0 },			/* 149 */
+    { "TabNonFrontActiveText",		    0, kThemeTextColorTabNonFrontActive, 0, 0 },		/* 150 */
+    { "TabNonFrontPressedText",		    0, kThemeTextColorTabNonFrontPressed, 0, 0 },		/* 151 */
+    { "TabFrontInactiveText",		    0, kThemeTextColorTabFrontInactive, 0, 0 },			/* 152 */
+    { "TabNonFrontInactiveText",	    0, kThemeTextColorTabNonFrontInactive, 0, 0 },		/* 153 */
+    { "IconLabelSelectedText",		    0, kThemeTextColorIconLabelSelected, 0, 0 },		/* 154 */
+    { "BevelButtonStickyActiveText",	    0, kThemeTextColorBevelButtonStickyActive, 0, 0 },		/* 155 */
+    { "BevelButtonStickyInactiveText",	    0, kThemeTextColorBevelButtonStickyInactive, 0, 0 },	/* 156 */
+    { "NotificationText",		    0, kThemeTextColorNotification, 0, 0 },			/* 157 */
+    { "SystemDetailText",		    0, kThemeTextColorSystemDetail, 0, 0 },			/* 158 */
+    { "WhiteText",			    0, kThemeTextColorWhite, 0, 0 },				/* 159 */
+    { "TabPaneBackground",		    0, 0, kThemeBackgroundTabPane, 0 },				/* 160 */
+    { "PlacardBackground",		    0, 0, kThemeBackgroundPlacard, 0 },				/* 161 */
+    { "WindowHeaderBackground",		    0, 0, kThemeBackgroundWindowHeader, 0 },			/* 162 */
+    { "ListViewWindowHeaderBackground",	    0, 0, kThemeBackgroundListViewWindowHeader, 0 },		/* 163 */
+    { "SecondaryGroupBoxBackground",	    0, 0, kThemeBackgroundSecondaryGroupBox, 0 },		/* 164 */
+    { "MetalBackground",		    0, 0, kThemeBackgroundMetal, 0 },				/* 165 */
+    { "TtkBackground",			    kThemeBrushModelessDialogBackgroundActive, 0, 0, 0 },	/* 166 */
+    { "TtkBackground1",			    0, 0, 0, 1 },						/* 167 */
+    { "TtkBackground2",			    0, 0, 0, 2 },						/* 168 */
+    { "TtkBackground3",			    0, 0, 0, 3 },						/* 169 */
+    { "TtkBackground4",			    0, 0, 0, 4 },						/* 170 */
+    { "TtkBackground5",			    0, 0, 0, 5 },						/* 171 */
+    { "TtkBackground6",			    0, 0, 0, 6 },						/* 172 */
+    { "TtkBackground7",			    0, 0, 0, 7 },						/* 173 */
+    { NULL,				    0, 0, 0, 0 }
 };
-#define MAX_PIXELCODE 165
+#define MAX_PIXELCODE 173
 
 /*
  *----------------------------------------------------------------------
@@ -193,21 +202,19 @@ static const struct SystemColorMapEntry systemColorMap[] = {
 static int
 GetThemeFromPixelCode(
     unsigned char code,
-    ThemeBrush *brush,
-    ThemeTextColor *textColor,
-    ThemeBackgroundKind *background)
+    struct SystemColorMapEntry *entry)
 {
+    bool zeroEntry = false;
     if (code >= MIN_PIXELCODE && code <= MAX_PIXELCODE) {
-	*brush = systemColorMap[code - MIN_PIXELCODE].brush;
-	*textColor = systemColorMap[code - MIN_PIXELCODE].textColor;
-	*background = systemColorMap[code - MIN_PIXELCODE].background;
+	*entry = systemColorMap[code - MIN_PIXELCODE];
     } else {
-	*brush = 0;
-	*textColor = 0;
-	*background = 0;
+	entry->brush=0;
+	entry->textColor=0;
+	entry->background=0;
+	entry->depth=0;
+	zeroEntry = true;
     }
-    if (!*brush && !*textColor && !*background && code != PIXEL_MAGIC &&
-	    code != TRANSPARENT_PIXEL) {
+    if (zeroEntry && code != PIXEL_MAGIC && code != TRANSPARENT_PIXEL) {
 	return false;
     } else {
 	return true;
@@ -233,39 +240,44 @@ GetThemeFromPixelCode(
 static OSStatus
 GetThemeColor(
     unsigned long pixel,
-    ThemeBrush brush,
-    ThemeTextColor textColor,
-    ThemeBackgroundKind background,
+    struct SystemColorMapEntry entry,
     CGColorRef *c)
 {
     OSStatus err = noErr;
+    static double RB1 = 0.8897365196078432;
+    static double G1 = 0.8936734068627451; 
+    static double DELTA = 0.031495098039215685;
 
-    if (brush) {
-	err = ChkErr(HIThemeBrushCreateCGColor, brush, c);
+    if (entry.brush) {
+	err = ChkErr(HIThemeBrushCreateCGColor, entry.brush, c);
     /*} else if (textColor) {
 	err = ChkErr(GetThemeTextColor, textColor, 32, true, c);*/
     } else {
 	CGFloat rgba[4] = {0, 0, 0, 1};
-
-	switch ((pixel >> 24) & 0xff) {
-	case PIXEL_MAGIC: {
-	    unsigned short red, green, blue;
-	    red		= (pixel >> 16) & 0xff;
-	    green	= (pixel >>  8) & 0xff;
-	    blue	= (pixel      ) & 0xff;
-	    red		|= red   << 8;
-	    green	|= green << 8;
-	    blue	|= blue  << 8;
-	    rgba[0]	= red	/ 65535.0;
-	    rgba[1]	= green / 65535.0;
-	    rgba[2]	= blue  / 65535.0;
-	    break;
+	if (entry.depth) {
+	    rgba[0] = RB1 - DELTA*(entry.depth - 1);
+	    rgba[1] = G1 - DELTA*(entry.depth - 1);
+	    rgba[2] = RB1 - DELTA*(entry.depth - 1);
+	} else {
+	    switch ((pixel >> 24) & 0xff) {
+	    case PIXEL_MAGIC: {
+		unsigned short red, green, blue;
+		red		= (pixel >> 16) & 0xff;
+		green	= (pixel >>  8) & 0xff;
+		blue	= (pixel      ) & 0xff;
+		red		|= red   << 8;
+		green	|= green << 8;
+		blue	|= blue  << 8;
+		rgba[0]	= red	/ 65535.0;
+		rgba[1]	= green / 65535.0;
+		rgba[2]	= blue  / 65535.0;
+		break;
+	    }
+	    case TRANSPARENT_PIXEL:
+		rgba[3]	= 0.0;
+		break;
 	    }
-	case TRANSPARENT_PIXEL:
-	    rgba[3]	= 0.0;
-	    break;
 	}
-
 	static CGColorSpaceRef deviceRGBSpace = NULL;
 	if (!deviceRGBSpace) {
 	    deviceRGBSpace = CGColorSpaceCreateDeviceRGB();
@@ -299,14 +311,10 @@ TkSetMacColor(
 {
     CGColorRef *color = (CGColorRef*)macColor;
     OSStatus err = -1;
-    ThemeBrush brush;
-    ThemeTextColor textColor;
-    ThemeBackgroundKind background;
+    struct SystemColorMapEntry entry;
 
-    if (GetThemeFromPixelCode((pixel >> 24) & 0xff, &brush, &textColor,
-	    &background)) {
-	err = ChkErr(GetThemeColor, pixel, brush, textColor, background,
-		color);
+    if (GetThemeFromPixelCode((pixel >> 24) & 0xff, &entry)) {
+	err = ChkErr(GetThemeColor, pixel, entry, color);
     }
     return (err == noErr);
 }
@@ -486,26 +494,23 @@ TkMacOSXSetColorInContext(
 {
     OSStatus err = -1;
     CGColorRef cgColor = CopyCachedColor(gc, pixel);
-    ThemeBrush brush;
-    ThemeTextColor textColor;
-    ThemeBackgroundKind background;
+    struct SystemColorMapEntry entry;
 
-    if (!cgColor && GetThemeFromPixelCode((pixel >> 24) & 0xff, &brush,
-	    &textColor, &background)) {
-	if (brush) {
-	    err = ChkErr(HIThemeSetFill, brush, NULL, context,
+    if (!cgColor && GetThemeFromPixelCode((pixel >> 24) & 0xff, &entry)) {
+	if (entry.brush) {
+	    err = ChkErr(HIThemeSetFill, entry.brush, NULL, context,
 		    kHIThemeOrientationNormal);
 	    if (err == noErr) {
-		err = ChkErr(HIThemeSetStroke, brush, NULL, context,
+		err = ChkErr(HIThemeSetStroke, entry.brush, NULL, context,
 			kHIThemeOrientationNormal);
 	    }
-	} else if (textColor) {
-	    err = ChkErr(HIThemeSetTextFill, textColor, NULL, context,
+	} else if (entry.textColor) {
+	    err = ChkErr(HIThemeSetTextFill, entry.textColor, NULL, context,
 		    kHIThemeOrientationNormal);
-	} else if (background) {
+	} else if (entry.background) {
 	    CGRect rect = CGContextGetClipBoundingBox(context);
 	    HIThemeBackgroundDrawInfo info = { 0, kThemeStateActive,
-		    background };
+		    entry.background };
 
 	    err = ChkErr(HIThemeApplyBackground, &rect, &info,
 		    context, kHIThemeOrientationNormal);
@@ -513,8 +518,7 @@ TkMacOSXSetColorInContext(
 	if (err == noErr) {
 	    return;
 	}
-	err = ChkErr(GetThemeColor, pixel, brush, textColor, background,
-		&cgColor);
+	err = ChkErr(GetThemeColor, pixel, entry, &cgColor);
 	if (err == noErr) {
 	    SetCachedColor(gc, pixel, cgColor);
 	}
@@ -572,11 +576,9 @@ TkpGetColor(
 	    OSStatus err;
 	    CGColorRef c;
 	    unsigned char pixelCode = idx + MIN_PIXELCODE;
-	    ThemeBrush brush = systemColorMap[idx].brush;
-	    ThemeTextColor textColor = systemColorMap[idx].textColor;
-	    ThemeBackgroundKind background = systemColorMap[idx].background;
+	    struct SystemColorMapEntry entry = systemColorMap[idx];
 
-	    err = ChkErr(GetThemeColor, 0, brush, textColor, background, &c);
+	    err = ChkErr(GetThemeColor, 0, entry, &c);
 	    if (err == noErr) {
 		const size_t n = CGColorGetNumberOfComponents(c);
 		const CGFloat *rgba = CGColorGetComponents(c);