summaryrefslogtreecommitdiffstats
path: root/generic/tkMenubutton.c
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-01-13 23:08:06 (GMT)
committernijtmans <nijtmans>2010-01-13 23:08:06 (GMT)
commit353d7693729fb7a45a35be7158fc4b94db079735 (patch)
tree1f472912658d183c50de332bc66a33540b44f060 /generic/tkMenubutton.c
parent15e42ed5b2cbc9b9a5802d75268d97f302ac23c0 (diff)
downloadtk-353d7693729fb7a45a35be7158fc4b94db079735.zip
tk-353d7693729fb7a45a35be7158fc4b94db079735.tar.gz
tk-353d7693729fb7a45a35be7158fc4b94db079735.tar.bz2
Eliminate tkpMenubuttonClass
make tkpButtonProcs CONST fix gcc warnings: missing initializer
Diffstat (limited to 'generic/tkMenubutton.c')
-rw-r--r--generic/tkMenubutton.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c
index e94fdd1..a4c42ed 100644
--- a/generic/tkMenubutton.c
+++ b/generic/tkMenubutton.c
@@ -10,7 +10,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.c,v 1.26 2010/01/02 22:52:38 dkf Exp $
+ * RCS: @(#) $Id: tkMenubutton.c,v 1.27 2010/01/13 23:08:07 nijtmans Exp $
*/
#include "tkInt.h"
@@ -18,6 +18,18 @@
#include "default.h"
/*
+ * The structure below defines menubutton class behavior by means of
+ * procedures that can be invoked from generic window code.
+ */
+
+static const Tk_ClassProcs menubuttonClass = {
+ sizeof(Tk_ClassProcs), /* size */
+ TkMenuButtonWorldChanged, /* worldChangedProc */
+ NULL, /* createProc */
+ NULL /* modalProc */
+};
+
+/*
* The following table defines the legal values for the -direction option. It
* is used together with the "enum direction" declaration in tkMenubutton.h.
*/
@@ -236,7 +248,7 @@ Tk_MenubuttonObjCmd(
Tk_SetClass(tkwin, "Menubutton");
mbPtr = TkpCreateMenuButton(tkwin);
- Tk_SetClassProcs(tkwin, &tkpMenubuttonClass, mbPtr);
+ Tk_SetClassProcs(tkwin, &menubuttonClass, mbPtr);
/*
* Initialize the data structure for the button.