summaryrefslogtreecommitdiffstats
path: root/macosx
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 /macosx
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 'macosx')
-rw-r--r--macosx/tkMacOSXButton.c6
-rw-r--r--macosx/tkMacOSXMenubutton.c11
-rw-r--r--macosx/tkMacOSXScrlbr.c9
3 files changed, 11 insertions, 15 deletions
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index ab1d01e..5f26135 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXButton.c,v 1.35 2009/07/06 20:29:21 dkf Exp $
+ * RCS: @(#) $Id: tkMacOSXButton.c,v 1.36 2010/01/13 23:08:12 nijtmans Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -78,9 +78,11 @@ static void ComputeUnixButtonGeometry(TkButton *butPtr);
* The class procedure table for the button widgets.
*/
-Tk_ClassProcs tkpButtonProcs = {
+const Tk_ClassProcs tkpButtonProcs = {
sizeof(Tk_ClassProcs), /* size */
TkButtonWorldChanged, /* worldChangedProc */
+ NULL, /* createProc */
+ NULL /* modalProc */
};
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index e17d452..4b0e0be 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.22 2009/07/06 20:29:21 dkf Exp $
+ * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.23 2010/01/13 23:08:13 nijtmans Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -68,15 +68,6 @@ static const BoundsFix boundsFixes[] = {
static void MenuButtonEventProc(ClientData clientData, XEvent *eventPtr);
-/*
- * The structure below defines menubutton class behavior by means of functions
- * that can be invoked from generic window code.
- */
-
-Tk_ClassProcs tkpMenubuttonClass = {
- sizeof(Tk_ClassProcs), /* size */
- TkMenuButtonWorldChanged, /* worldChangedProc */
-};
/*
*----------------------------------------------------------------------
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 2b1a74e..fffc058 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.31 2009/07/06 20:29:21 dkf Exp $
+ * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.32 2010/01/13 23:08:12 nijtmans Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -63,8 +63,11 @@ static void ScrollbarEventProc(ClientData clientData,
* The class procedure table for the scrollbar widget.
*/
-Tk_ClassProcs tkpScrollbarProcs = {
- sizeof(Tk_ClassProcs) /* size */
+const Tk_ClassProcs tkpScrollbarProcs = {
+ sizeof(Tk_ClassProcs), /* size */
+ NULL, /* worldChangedProc */
+ NULL, /* createProc */
+ NULL /* modalProc */
};
#pragma mark TKApplication(TKScrlbr)