summaryrefslogtreecommitdiffstats
path: root/generic/tkMenubutton.h
diff options
context:
space:
mode:
authortmh <tmh>2001-10-12 13:30:31 (GMT)
committertmh <tmh>2001-10-12 13:30:31 (GMT)
commit343a12a735abd601b4cd5c087be337a51851adb6 (patch)
treef0a41bc451b44d520db4074ba5b826c8c8d8b723 /generic/tkMenubutton.h
parent93e8dfc4adffc6846037794671ceec5d52fda96c (diff)
downloadtk-343a12a735abd601b4cd5c087be337a51851adb6.zip
tk-343a12a735abd601b4cd5c087be337a51851adb6.tar.gz
tk-343a12a735abd601b4cd5c087be337a51851adb6.tar.bz2
implementation of TIP 63 (accepted) -compound option to menu items.macosx_8_4_branchpoint
Diffstat (limited to 'generic/tkMenubutton.h')
-rw-r--r--generic/tkMenubutton.h17
1 files changed, 6 insertions, 11 deletions
diff --git a/generic/tkMenubutton.h b/generic/tkMenubutton.h
index a4a8a05..332d770 100644
--- a/generic/tkMenubutton.h
+++ b/generic/tkMenubutton.h
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMenubutton.h,v 1.7 2001/05/21 14:07:33 tmh Exp $
+ * RCS: @(#) $Id: tkMenubutton.h,v 1.8 2001/10/12 13:30:31 tmh Exp $
*/
#ifndef _TKMENUBUTTON
@@ -19,21 +19,16 @@
#include "tkInt.h"
#endif
+#ifndef _TKMENU
+#include "tkMenu.h"
+#endif
+
#ifdef BUILD_tk
# undef TCL_STORAGE_CLASS
# define TCL_STORAGE_CLASS DLLEXPORT
#endif
/*
- * Legal values for the "compound" field of TkButton records.
- */
-
-enum compound {
- COMPOUND_BOTTOM, COMPOUND_CENTER, COMPOUND_LEFT, COMPOUND_NONE,
- COMPOUND_RIGHT, COMPOUND_TOP
-};
-
-/*
* Legal values for the "orient" field of TkMenubutton records.
*/
@@ -172,7 +167,7 @@ typedef struct {
*/
int compound; /* Value of -compound option; specifies whether
- * the button should show both an image and
+ * the menubutton should show both an image and
* text, and, if so, how. */
enum direction direction; /* Direction for where to pop the menu.