summaryrefslogtreecommitdiffstats
path: root/generic/tkMenu.h
diff options
context:
space:
mode:
authorvincentdarley <vincentdarley>2003-07-15 13:59:05 (GMT)
committervincentdarley <vincentdarley>2003-07-15 13:59:05 (GMT)
commit809c5a269834bf1dc30edbba8d1d813dfd56f08d (patch)
treefc758135ae55e7de4390f758cfc9f85b9fe64560 /generic/tkMenu.h
parentc23f527d3060e379f4dc461df50d4181fadea10a (diff)
downloadtk-809c5a269834bf1dc30edbba8d1d813dfd56f08d.zip
tk-809c5a269834bf1dc30edbba8d1d813dfd56f08d.tar.gz
tk-809c5a269834bf1dc30edbba8d1d813dfd56f08d.tar.bz2
menu clone cleanup bug fix
Diffstat (limited to 'generic/tkMenu.h')
-rw-r--r--generic/tkMenu.h22
1 files changed, 13 insertions, 9 deletions
diff --git a/generic/tkMenu.h b/generic/tkMenu.h
index 9553bc0..f007bce 100644
--- a/generic/tkMenu.h
+++ b/generic/tkMenu.h
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMenu.h,v 1.6 2001/10/12 13:30:31 tmh Exp $
+ * RCS: @(#) $Id: tkMenu.h,v 1.6.4.1 2003/07/15 13:59:06 vincentdarley Exp $
*/
#ifndef _TKMENU
@@ -451,17 +451,21 @@ typedef struct TkMenuOptionTables {
* RESIZE_PENDING: Non-zero means a call to ComputeMenuGeometry
* has already been scheduled.
* MENU_DELETION_PENDING Non-zero means that we are currently destroying
- * this menu. This is useful when we are in the
- * middle of cleaning this master menu's chain of
- * menus up when TkDestroyMenu was called again on
- * this menu (via a destroy binding or somesuch).
+ * this menu's internal structures. This is useful
+ * when we are in the middle of cleaning
+ * this master menu's chain of menus up when
+ * TkDestroyMenu was called again on this
+ * menu (via a destroy binding or somesuch).
+ * MENU_WIN_DESTRUCTION_PENDING Non-zero means we are in the middle of
+ * destroying this menu's Tk_Window.
* MENU_PLATFORM_FLAG1... Reserved for use by the platform-specific menu
* code.
*/
-#define REDRAW_PENDING 1
-#define RESIZE_PENDING 2
-#define MENU_DELETION_PENDING 4
+#define REDRAW_PENDING 1
+#define RESIZE_PENDING 2
+#define MENU_DELETION_PENDING 4
+#define MENU_WIN_DESTRUCTION_PENDING 8
#define MENU_PLATFORM_FLAG1 (1 << 30)
#define MENU_PLATFORM_FLAG2 (1 << 29)
#define MENU_PLATFORM_FLAG3 (1 << 28)
@@ -511,7 +515,7 @@ EXTERN TkMenuReferences *
EXTERN TkMenuReferences *
TkFindMenuReferencesObj _ANSI_ARGS_((
Tcl_Interp *interp, Tcl_Obj *namePtr));
-EXTERN void TkFreeMenuReferences _ANSI_ARGS_((
+EXTERN int TkFreeMenuReferences _ANSI_ARGS_((
TkMenuReferences *menuRefPtr));
EXTERN Tcl_HashTable * TkGetMenuHashTable _ANSI_ARGS_((Tcl_Interp *interp));
EXTERN int TkGetMenuIndex _ANSI_ARGS_((Tcl_Interp *interp,