diff options
| author | ericm <ericm> | 2000-11-22 01:49:37 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-11-22 01:49:37 (GMT) |
| commit | 31e9ab3d0310055f094cbcfa64af7e6834555cb5 (patch) | |
| tree | b3d9ff19b6b8294780db27da55671e4ef2f9fd75 /mac | |
| parent | 5fb60902d139dbaa22360245c548fbdbfa0e28fa (diff) | |
| download | tk-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 'mac')
| -rw-r--r-- | mac/tkMacButton.c | 9 | ||||
| -rw-r--r-- | mac/tkMacMenubutton.c | 9 | ||||
| -rw-r--r-- | mac/tkMacScrlbr.c | 12 |
3 files changed, 14 insertions, 16 deletions
diff --git a/mac/tkMacButton.c b/mac/tkMacButton.c index 1eb4231..d308ddd 100644 --- a/mac/tkMacButton.c +++ b/mac/tkMacButton.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacButton.c,v 1.13 2000/05/17 21:17:21 ericm Exp $ + * RCS: @(#) $Id: tkMacButton.c,v 1.14 2000/11/22 01:49:38 ericm Exp $ */ #include "tkButton.h" @@ -104,10 +104,9 @@ static void ButtonExitProc _ANSI_ARGS_((ClientData clientData)); * The class procedure table for the button widgets. */ -TkClassProcs tkpButtonProcs = { - NULL, /* createProc. */ - TkButtonWorldChanged, /* geometryProc. */ - NULL /* modalProc. */ +Tk_ClassProcs tkpButtonProcs = { + sizeof(Tk_ClassProcs), /* size */ + TkButtonWorldChanged, /* worldChangedProc */ }; /* diff --git a/mac/tkMacMenubutton.c b/mac/tkMacMenubutton.c index 41dc954..4c274e6 100644 --- a/mac/tkMacMenubutton.c +++ b/mac/tkMacMenubutton.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacMenubutton.c,v 1.6 1999/09/21 06:42:33 hobbs Exp $ + * RCS: @(#) $Id: tkMacMenubutton.c,v 1.7 2000/11/22 01:49:38 ericm Exp $ */ #include "tkMenubutton.h" @@ -34,10 +34,9 @@ typedef struct MacMenuButton { * procedures that can be invoked from generic window code. */ -TkClassProcs tkpMenubuttonClass = { - NULL, /* createProc. */ - TkMenuButtonWorldChanged, /* geometryProc. */ - NULL /* modalProc. */ +Tk_ClassProcs tkpMenubuttonClass = { + sizeof(Tk_ClassProcs), /* size */ + TkMenuButtonWorldChanged, /* worldChangedProc */ }; /* diff --git a/mac/tkMacScrlbr.c b/mac/tkMacScrlbr.c index df030e0..1a3f82d 100644 --- a/mac/tkMacScrlbr.c +++ b/mac/tkMacScrlbr.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: tkMacScrlbr.c,v 1.4 2000/02/10 08:56:12 jingham Exp $ + * RCS: @(#) $Id: tkMacScrlbr.c,v 1.5 2000/11/22 01:49:38 ericm Exp $ */ #include "tkScrollbar.h" @@ -113,13 +113,13 @@ static pascal void ThumbActionProc _ANSI_ARGS_((void)); static void UpdateControlValues _ANSI_ARGS_((MacScrollbar *macScrollPtr)); /* - * The class procedure table for the scrollbar widget. + * The class procedure table for the scrollbar widget. Leave the proc fields + * initialized to NULL, which should happen automatically because of the scope + * at which the variable is declared. */ -TkClassProcs tkpScrollbarProcs = { - NULL, /* createProc. */ - NULL, /* geometryProc. */ - NULL /* modalProc */ +Tk_ClassProcs tkpScrollbarProcs = { + sizeof(Tk_ClassProcs) /* size */ }; /* |