summaryrefslogtreecommitdiffstats
path: root/generic/tkMenu.c
diff options
context:
space:
mode:
authorericm <ericm>2000-11-22 01:49:37 (GMT)
committerericm <ericm>2000-11-22 01:49:37 (GMT)
commit31e9ab3d0310055f094cbcfa64af7e6834555cb5 (patch)
treeb3d9ff19b6b8294780db27da55671e4ef2f9fd75 /generic/tkMenu.c
parent5fb60902d139dbaa22360245c548fbdbfa0e28fa (diff)
downloadtk-31e9ab3d0310055f094cbcfa64af7e6834555cb5.zip
tk-31e9ab3d0310055f094cbcfa64af7e6834555cb5.tar.gz
tk-31e9ab3d0310055f094cbcfa64af7e6834555cb5.tar.bz2
Overall change: Implemented TIP 5, which exports
TkClassProcs/TkSetClassProcs as Tk_ClassProcs/Tk_SetClassProcs, adding a size field to Tk_ClassProcs to allow for future expansion, and renaming the geometryProc to worldChangedProc, which is more in keeping with the actual use of the callback. See ChangeLog for details.
Diffstat (limited to 'generic/tkMenu.c')
-rw-r--r--generic/tkMenu.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 0aac47e..b539186 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -12,7 +12,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.c,v 1.8 2000/08/03 20:36:16 ericm Exp $
+ * RCS: @(#) $Id: tkMenu.c,v 1.9 2000/11/22 01:49:38 ericm Exp $
*/
/*
@@ -363,15 +363,15 @@ static void UnhookCascadeEntry _ANSI_ARGS_((TkMenuEntry *mePtr));
* the geometry proc to be called.
*/
-static TkClassProcs menuClass = {
- NULL, /* createProc. */
- MenuWorldChanged /* geometryProc. */
+static Tk_ClassProcs menuClass = {
+ sizeof(Tk_ClassProcs), /* size */
+ MenuWorldChanged /* worldChangedProc */
};
/*
*--------------------------------------------------------------
*
- * Tk_CreateMenuCmd --
+ * TkCreateMenuCmd --
*
* Called by Tk at initialization time to create the menu
* command.
@@ -523,7 +523,7 @@ MenuCmd(clientData, interp, objc, objv)
TkMenuInitializeDrawingFields(menuPtr);
Tk_SetClass(menuPtr->tkwin, "Menu");
- TkSetClassProcs(menuPtr->tkwin, &menuClass, (ClientData) menuPtr);
+ Tk_SetClassProcs(menuPtr->tkwin, &menuClass, (ClientData) menuPtr);
if (Tk_InitOptions(interp, (char *) menuPtr,
menuPtr->optionTablesPtr->menuOptionTable, menuPtr->tkwin)
!= TCL_OK) {