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.

4 files changed, 18 insertions, 16 deletions

diff --git a/unix/mkLinks b/unix/mkLinks
index cbbf2f9..79155ea 100644
--- a/unix/mkLinks
+++ b/unix/mkLinks
@@ -28,6 +28,10 @@ if test "$x" != "xyzzyTestingAVeryLongFileName.foo"; then
     exit
 fi
 
+if test -r SetClassProcs.3; then
+    rm -f Tk_SetClassProcs.3
+    ln SetClassProcs.3 Tk_SetClassProcs.3
+fi
 if test -r 3DBorder.3; then
     rm -f Tk_Alloc3DBorderFromObj.3
     rm -f Tk_Get3DBorder.3
diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c
index 92dc8ea..46dff22 100644
--- a/unix/tkUnixButton.c
+++ b/unix/tkUnixButton.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: tkUnixButton.c,v 1.7 2000/07/29 01:08:54 ericm Exp $
+ * RCS: @(#) $Id: tkUnixButton.c,v 1.8 2000/11/22 01:49:38 ericm Exp $
  */
 
 #include "tkButton.h"
@@ -26,10 +26,9 @@ typedef struct UnixButton {
  * 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/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c
index de2693f..8e46f46 100644
--- a/unix/tkUnixMenubu.c
+++ b/unix/tkUnixMenubu.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: tkUnixMenubu.c,v 1.4 1999/09/21 06:43:01 hobbs Exp $
+ * RCS: @(#) $Id: tkUnixMenubu.c,v 1.5 2000/11/22 01:49:38 ericm Exp $
  */
 
 #include "tkMenubutton.h"
@@ -19,10 +19,9 @@
  * 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/unix/tkUnixScrlbr.c b/unix/tkUnixScrlbr.c
index 4821653..fc3e7f8 100644
--- a/unix/tkUnixScrlbr.c
+++ b/unix/tkUnixScrlbr.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: tkUnixScrlbr.c,v 1.2 1998/09/14 18:23:57 stanton Exp $
+ * RCS: @(#) $Id: tkUnixScrlbr.c,v 1.3 2000/11/22 01:49:38 ericm Exp $
  */
 
 #include "tkScrollbar.h"
@@ -32,13 +32,13 @@ typedef struct UnixScrollbar {
 } UnixScrollbar;
 
 /*
- * The class procedure table for the scrollbar widget.
+ * The class procedure table for the scrollbar widget.  All fields except
+ * size are left initialized to NULL, which should happen automatically
+ * since the variable is declared at this scope.
  */
 
-TkClassProcs tkpScrollbarProcs = { 
-    NULL,			/* createProc. */
-    NULL,			/* geometryProc. */
-    NULL			/* modalProc. */
+Tk_ClassProcs tkpScrollbarProcs = {
+    sizeof(Tk_ClassProcs)	/* size */
 };