diff options
| author | vincentdarley <vincentdarley> | 2003-05-30 11:02:59 (GMT) |
|---|---|---|
| committer | vincentdarley <vincentdarley> | 2003-05-30 11:02:59 (GMT) |
| commit | 24839c15c8135eabb6a5677b921fe2d0c10133a2 (patch) | |
| tree | 5bcdc3e30cddc5248bcf66ead0d432266088c277 /generic/tkMenu.h | |
| parent | 832f9729ac21786cdadcc61ddbde382febc5def9 (diff) | |
| download | tk-24839c15c8135eabb6a5677b921fe2d0c10133a2.zip tk-24839c15c8135eabb6a5677b921fe2d0c10133a2.tar.gz tk-24839c15c8135eabb6a5677b921fe2d0c10133a2.tar.bz2 | |
fix to menu clone deletion bug
Diffstat (limited to 'generic/tkMenu.h')
| -rw-r--r-- | generic/tkMenu.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/generic/tkMenu.h b/generic/tkMenu.h index 9553bc0..42a6719 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.7 2003/05/30 11:03:00 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, |