If we are using appearance, don't set ANY of the menu colors. This gets the menu foregrounds right with Kaliedoscope and the Architect theme.

1 files changed, 15 insertions, 4 deletions

diff --git a/mac/tkMacColor.c b/mac/tkMacColor.c
index d7ee825..f5286de 100644
--- a/mac/tkMacColor.c
+++ b/mac/tkMacColor.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacColor.c,v 1.3 1998/11/11 17:29:57 jingham Exp $
+ * RCS: @(#) $Id: tkMacColor.c,v 1.3.2.1 1999/03/22 06:43:25 jingham Exp $
  */
 
 #include <tkColor.h>
@@ -88,8 +88,7 @@ TkSetMacColor(
 	case MENU_BACKGROUND_PIXEL:
 	case MENU_DISABLED_PIXEL:
 	case MENU_TEXT_PIXEL:
-	    GetMenuPartColor((pixel >> 24), macColor);
-	    return true;
+	    return GetMenuPartColor((pixel >> 24), macColor);
 	case APPEARANCE_PIXEL:
 	    return false;
 	case PIXEL_MAGIC:
@@ -431,8 +430,19 @@ GetMenuPartColor(
     RGBColor backColor, foreColor;
     GDHandle maxDevice;
     Rect globalRect;
-    MCEntryPtr mcEntryPtr = GetMCEntry(0, 0);
+    MCEntryPtr mcEntryPtr;
     
+    /* Under Appearance, we don't want to set any menu colors when we
+       are asked for the standard menu colors.  So we return false (which
+       means don't use this color... */
+       
+    if (TkMacHaveAppearance() > 1) {
+        macColor->red = 0xFFFF;
+        macColor->green = 0;
+        macColor->blue = 0;
+        return 0;
+    } else {
+        mcEntryPtr = GetMCEntry(0, 0);
     switch (pixel) {
     	case MENU_ACTIVE_PIXEL:
     	    if (mcEntryPtr == NULL) {
@@ -491,3 +501,4 @@ GetMenuPartColor(
     }
     return 0;
 }
+}