summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--macosx/tkMacOSXDefault.h9
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d5fc18b..feab7f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2004-07-24 Jim Ingham <jingham@apple.com>
+ macosx/tkMacOSXDefault.h: Change the default -tearoff value
+ to 0. It doesn't work at present, so it is silly to make
+ it the default.
+
Mac OS X: Complete the implementation of the CG version of
the X drawing emulation layer.
diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h
index 13a05ce..b888961 100644
--- a/macosx/tkMacOSXDefault.h
+++ b/macosx/tkMacOSXDefault.h
@@ -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: tkMacOSXDefault.h,v 1.2 2002/08/31 06:12:29 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDefault.h,v 1.2.2.1 2004/07/25 02:29:24 wolfsuit Exp $
*/
#ifndef _TKMACDEFAULT
@@ -294,7 +294,12 @@
#define DEF_MENU_SELECT_COLOR "SystemMenuActive"
#define DEF_MENU_SELECT_MONO BLACK
#define DEF_MENU_TAKE_FOCUS "0"
-#define DEF_MENU_TEAROFF "1"
+
+/*
+ * FIXME: Turn the default back to 1 when we make tearoff menus work again.
+ */
+
+#define DEF_MENU_TEAROFF "0"
#define DEF_MENU_TEAROFF_CMD (char *) NULL
#define DEF_MENU_TITLE ""
#define DEF_MENU_TYPE "normal"