diff options
| author | nijtmans <nijtmans> | 2010-01-13 23:08:06 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-01-13 23:08:06 (GMT) |
| commit | 353d7693729fb7a45a35be7158fc4b94db079735 (patch) | |
| tree | 1f472912658d183c50de332bc66a33540b44f060 /carbon | |
| parent | 15e42ed5b2cbc9b9a5802d75268d97f302ac23c0 (diff) | |
| download | tk-353d7693729fb7a45a35be7158fc4b94db079735.zip tk-353d7693729fb7a45a35be7158fc4b94db079735.tar.gz tk-353d7693729fb7a45a35be7158fc4b94db079735.tar.bz2 | |
Eliminate tkpMenubuttonClass
make tkpButtonProcs CONST
fix gcc warnings: missing initializer
Diffstat (limited to 'carbon')
| -rw-r--r-- | carbon/tkMacOSXButton.c | 6 | ||||
| -rw-r--r-- | carbon/tkMacOSXMenubutton.c | 12 | ||||
| -rw-r--r-- | carbon/tkMacOSXScrlbr.c | 9 |
3 files changed, 11 insertions, 16 deletions
diff --git a/carbon/tkMacOSXButton.c b/carbon/tkMacOSXButton.c index bae2a88..4bd2cbe 100644 --- a/carbon/tkMacOSXButton.c +++ b/carbon/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.2 2009/06/29 14:35:01 das Exp $ + * RCS: @(#) $Id: tkMacOSXButton.c,v 1.3 2010/01/13 23:08:12 nijtmans Exp $ */ #include "tkMacOSXPrivate.h" @@ -116,9 +116,11 @@ static void SetupBevelButton(MacButton *butPtr, ControlRef controlHandle, * 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 */ }; static int bCount; diff --git a/carbon/tkMacOSXMenubutton.c b/carbon/tkMacOSXMenubutton.c index 7eb513e..7891760 100644 --- a/carbon/tkMacOSXMenubutton.c +++ b/carbon/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.1 2009/06/26 01:42:47 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.2 2010/01/13 23:08:12 nijtmans Exp $ */ #include "tkMacOSXPrivate.h" @@ -88,16 +88,6 @@ static void ComputeControlTitleParams(TkMenuButton *mbPtr, static void CompareControlTitleParams(ControlTitleParams *p1Ptr, ControlTitleParams *p2Ptr, int *titleChanged, int *styleChanged); -/* - * The structure below defines menubutton class behavior by means of - * procedures that can be invoked from generic window code. - */ - -Tk_ClassProcs tkpMenubuttonClass = { - sizeof(Tk_ClassProcs), /* size */ - TkMenuButtonWorldChanged, /* worldChangedProc */ -}; - /* *---------------------------------------------------------------------- diff --git a/carbon/tkMacOSXScrlbr.c b/carbon/tkMacOSXScrlbr.c index ff5ce92..6a9f5a1 100644 --- a/carbon/tkMacOSXScrlbr.c +++ b/carbon/tkMacOSXScrlbr.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: tkMacOSXScrlbr.c,v 1.1 2009/06/26 01:42:47 das Exp $ + * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.2 2010/01/13 23:08:12 nijtmans Exp $ */ #include "tkMacOSXPrivate.h" @@ -97,8 +97,11 @@ static void UpdateControlValues(MacScrollbar *macScrollPtr); * at which the variable is declared. */ -Tk_ClassProcs tkpScrollbarProcs = { - sizeof(Tk_ClassProcs) /* size */ +const Tk_ClassProcs tkpScrollbarProcs = { + sizeof(Tk_ClassProcs), /* size */ + NULL, /* worldChangedProc */ + NULL, /* createProc */ + NULL /* modalProc */ }; /* |