* Merged changes from 8.1.0 branch

17 files changed, 168 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index e45e044..f6b63ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+1999-04-30    <stanton@scriptics.com>
+
+	* Merged changes from 8.1.0 branch:
+
+	* generic/tkDecls.h: 
+	* generic/tkIntDecls.h: 
+	* generic/tkIntPlatDecls.h: 
+	* generic/tkIntXlibDecls.h: 
+	* generic/tkPlatDecls.h: 
+	* generic/tkStubInit.c: Changed to avoid the need for forward
+	declarations in stub initializers.  Added extern "C" blocks around
+	stub table pointer declarations so the stubs can be used from C++
+	code. [Bug: 1934]
+
+	* generic/tkInt.decls: Added TkClipBox, XDrawSegments, and
+	XForceScreenSaver to stubs.
+
+	* generic/tkStubLib.c: Reordered declarations to avoid
+	circularities and forward references.
+
+	* generic/tkStubInit.c: Added includes for Mac.
+
+	* generic/tkMenubutton.c: lint
+
+	* generic/tkEntry.c: Fixed bad option table entry.
+
+	* generic/tkImgBmap.c:
+	* generic/tkImgPPM.c:
+	* generic/tkImgPhoto.c: Set the -translation and -encoding options
+	to binary for image files. (reported by Marco Gazzetta)
+	
 1999-04-23    <stanton@scriptics.com>
 
 	* generic/tkInt.decls: Added TkClipBox, XDrawSegments, and
@@ -18,7 +49,7 @@
 	* generic/tkImgPPM.c:
 	* generic/tkImgPhoto.c: Set the -translation and -encoding options
 	to binary for image files. (reported by Marco Gazzetta)
-	
+
 1999-04-20    <redman@scriptics.com>
 
 	* xlib/X11/Xlib.h: changed definition of Status type to use a
diff --git a/changes b/changes
index 4c7d01e..6cea620 100644
--- a/changes
+++ b/changes
@@ -2,7 +2,7 @@ This file summarizes all changes made to Tk since version 1.0 was
 released on March 13, 1991.  Changes that aren't backward compatible
 are marked specially.
 
-RCS: @(#) $Id: changes,v 1.32 1999/04/16 01:51:07 stanton Exp $
+RCS: @(#) $Id: changes,v 1.33 1999/04/30 22:49:54 stanton Exp $
 
 3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from
 the interpreter when the main window is deleted (otherwise there will
@@ -4582,3 +4582,16 @@ selection instead of the widget contents, which can be different if the
 
 --------------- Released 8.1b3, April 6, 1999 ----------------------
 
+4/20/99 (compiler fix) changed definition of Status type to use a
+typedef instead of a #define to avoid conflicting with the cygwin win32
+headers. (redman)
+
+4/22/99 (bug fix) Set the -translation and -encoding options to binary
+for image files. (redman)
+
+4/27 (bug fix) Changed to avoid the need for forward declarations in
+stub initializers.  Added extern "C" blocks around stub table pointer
+declarations so the stubs can be used from C++ code. (stanton)
+
+--------------- Released 8.1 final, April 29, 1999 ----------------------
+
diff --git a/doc/InitStubs.3 b/doc/InitStubs.3
new file mode 100644
index 0000000..7a28662
--- /dev/null
+++ b/doc/InitStubs.3
@@ -0,0 +1,77 @@
+'\"
+'\" Copyright (c) 1999 Scriptics Corportation
+'\"
+'\" See the file "license.terms" for information on usage and redistribution
+'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+'\" 
+'\" RCS: @(#) $Id: InitStubs.3,v 1.2 1999/04/30 22:49:54 stanton Exp $
+'\" 
+.so man.macros
+.TH Tk_InitStubs 3 8.1 Tk "Tk Library Procedures"
+.BS
+.SH NAME
+Tk_InitStubs \- initialize the Tk stubs mechanism
+.SH SYNOPSIS
+.nf
+\fB#include <tk.h>\fR
+.sp
+char *
+\fBTk_InitStubs\fR(\fIinterp, version, exact\fR)
+.SH ARGUMENTS
+.AS Tcl_Interp *interp in
+.AP Tcl_Interp *interp in
+Tcl interpreter handle.
+.AP char *version in
+A version string consisting of one or more decimal numbers
+separated by dots.
+.AP int exact in
+Non-zero means that only the particular Tk version specified by
+\fIversion\fR is acceptable.
+Zero means that versions newer than \fIversion\fR are also
+acceptable as long as they have the same major version number
+as \fIversion\fR.
+.BE
+.SH INTRODUCTION
+.PP
+The Tcl stubs mechanism defines a way to dynamically bind
+extensions to a particular Tcl implementation at run time.
+the stubs mechanism requires no changes to applications
+incoporating Tcl/Tk interpreters.  Only developers creating
+C-based Tcl/Tk extensions need to take steps to use the
+stubs mechanism with their extensions.
+See the \fBTcl_InitStubs\fR page for more information.
+.PP
+Enabling the stubs mechanism for a Tcl/Tk extension requires the following
+steps:
+.IP 1) 5
+Call \fBTcl_InitStubs\fR in the extension before calling any other
+Tcl functions.
+.IP 2) 5
+Call \fBTk_InitStubs\fR if the extension before calling any other
+Tk functions.
+.IP 2) 5
+Define the USE_TCL_STUBS symbol.  Typically, you would include the
+-DUSE_TCL_STUBS flag when compiling the extension.
+.IP 3) 5
+Link the extension with the Tcl and Tk stubs libraries instead of
+the standard Tcl and Tk libraries.  On Unix platforms, the library
+names are \fIlibtclstub8.1.a\fR and \fIlibtkstub8.1.a\fR; on Windows
+platforms, the library names are
+\fItclstub81.lib\fR and \fItkstub81.lib\fR.
+.SH DESCRIPTION
+\fBTk_InitStubs\fR attempts to initialize the Tk stub table pointers
+and ensure that the correct version of Tk is loaded.  In addition
+to an interpreter handle, it accepts as arguments a version number
+and a Boolean flag indicating whether the extension requires
+an exact version match or not.  If \fIexact\fR is 0, then the
+extension is indicating that newer versions of Tk are acceptable
+as long as they have the same major version number as \fIversion\fR;
+non-zero means that only the specified \fIversion\fR is acceptable.
+\fBTcl_InitStubs\fR returns a string containing the actual version
+of Tk satisfying the request, or NULL if the Tk version is not
+acceptable, does not support the stubs mechansim, or any other
+error condition occurred.
+.SH "SEE ALSO"
+\fBTcl_InitStubs\fR
+.SH KEYWORDS
+stubs
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 8051955..c017771 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkDecls.h,v 1.4 1999/04/28 18:18:06 redman Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.5 1999/04/30 22:49:54 stanton Exp $
  */
 
 #ifndef _TKDECLS
@@ -979,7 +979,13 @@ typedef struct TkStubs {
     int (*tk_CreateConsoleWindow) _ANSI_ARGS_((Tcl_Interp * interp)); /* 216 */
 } TkStubs;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern TkStubs *tkStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index ce49c94..38996ed 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -15,7 +15,7 @@
  *	   Department of Computer Science,
  *	   Australian National University.
  *
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.7 1999/04/24 01:50:48 stanton Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.8 1999/04/30 22:49:55 stanton Exp $
  */
 
 #include "tkInt.h"
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 7d8fc3d..f46e7c2 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -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: tkIntDecls.h,v 1.4 1999/04/24 01:50:48 stanton Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.5 1999/04/30 22:49:55 stanton Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -621,7 +621,13 @@ typedef struct TkIntStubs {
 #endif /* MAC_TCL */
 } TkIntStubs;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern TkIntStubs *tkIntStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 7a1c1be..f1111ec 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.4 1999/04/24 01:50:49 stanton Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.5 1999/04/30 22:49:55 stanton Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -429,7 +429,13 @@ typedef struct TkIntPlatStubs {
 #endif /* MAC_TCL */
 } TkIntPlatStubs;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern TkIntPlatStubs *tkIntPlatStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 54a68ca..ae23707 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.6 1999/04/24 01:50:49 stanton Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.7 1999/04/30 22:49:55 stanton Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -799,7 +799,13 @@ typedef struct TkIntXlibStubs {
 #endif /* MAC_TCL */
 } TkIntXlibStubs;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern TkIntXlibStubs *tkIntXlibStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index e0dd331..a074241 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPlatDecls.h,v 1.3 1999/04/16 01:51:21 stanton Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.4 1999/04/30 22:49:55 stanton Exp $
  */
 
 #ifndef _TKPLATDECLS
@@ -111,7 +111,13 @@ typedef struct TkPlatStubs {
 #endif /* MAC_TCL */
 } TkPlatStubs;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern TkPlatStubs *tkPlatStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
diff --git a/library/images/pwrdLogo100.gif b/library/images/pwrdLogo100.gif
index eea4fba..d2f8cbb 100644
--- a/library/images/pwrdLogo100.gif
+++ b/library/images/pwrdLogo100.gif
diff --git a/library/images/pwrdLogo150.gif b/library/images/pwrdLogo150.gif
index bf62548..89eec7c 100644
--- a/library/images/pwrdLogo150.gif
+++ b/library/images/pwrdLogo150.gif
diff --git a/library/images/pwrdLogo175.gif b/library/images/pwrdLogo175.gif
index 7733fdd..02dcd92 100644
--- a/library/images/pwrdLogo175.gif
+++ b/library/images/pwrdLogo175.gif
diff --git a/library/images/pwrdLogo200.gif b/library/images/pwrdLogo200.gif
index 965cb4b..66426bf 100644
--- a/library/images/pwrdLogo200.gif
+++ b/library/images/pwrdLogo200.gif
diff --git a/library/images/pwrdLogo75.gif b/library/images/pwrdLogo75.gif
index 3a2b16e..e75925c 100644
--- a/library/images/pwrdLogo75.gif
+++ b/library/images/pwrdLogo75.gif
diff --git a/unix/configure.in b/unix/configure.in
index baf20e1..b5b31cf 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,12 +3,12 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tk.h)
-# RCS: @(#) $Id: configure.in,v 1.31 1999/04/21 21:53:31 rjohnson Exp $
+# RCS: @(#) $Id: configure.in,v 1.32 1999/04/30 22:49:57 stanton Exp $
 
 TK_VERSION=8.1
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=1
-TK_PATCH_LEVEL=0
+TK_PATCH_LEVEL=
 VERSION=${TK_VERSION}
 
 if test "${prefix}" = "NONE"; then
diff --git a/win/rc/tk.rc b/win/rc/tk.rc
index 3960c3e..dacd4fb 100644
--- a/win/rc/tk.rc
+++ b/win/rc/tk.rc
@@ -1,4 +1,4 @@
-// RCS: @(#) $Id: tk.rc,v 1.3 1999/04/16 01:51:55 stanton Exp $
+// RCS: @(#) $Id: tk.rc,v 1.4 1999/04/30 22:49:57 stanton Exp $
 //
 // Version
 //
@@ -25,9 +25,9 @@ BEGIN
         BEGIN
             VALUE "FileDescription", "Tk DLL\0"
             VALUE "OriginalFilename", "tk" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) ".dll\0"
-            VALUE "CompanyName", "Sun Microsystems, Inc.\0"
+            VALUE "CompanyName", "Scriptics Corporation\0"
             VALUE "FileVersion", TK_PATCH_LEVEL
-            VALUE "LegalCopyright", "Copyright \251 1995-1996\0"
+            VALUE "LegalCopyright", "Copyright \251 1999 by Scriptics Corporation\0"
             VALUE "ProductName", "Tk " TK_VERSION " for Windows\0"
             VALUE "ProductVersion", TK_PATCH_LEVEL
         END
diff --git a/win/rc/wish.rc b/win/rc/wish.rc
index 54e71e7..6b209e9 100644
--- a/win/rc/wish.rc
+++ b/win/rc/wish.rc
@@ -1,7 +1,8 @@
-// RCS: @(#) $Id: wish.rc,v 1.2 1998/09/14 18:24:02 stanton Exp $
+// RCS: @(#) $Id: wish.rc,v 1.3 1999/04/30 22:49:57 stanton Exp $
 //
 // Version
 //
+#include <windows.h>
 
 #define RESOURCE_INCLUDED
 #include <tk.h>
@@ -24,9 +25,9 @@ BEGIN
         BEGIN
             VALUE "FileDescription", "Wish Application\0"
             VALUE "OriginalFilename", "wish" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) ".exe\0"
-            VALUE "CompanyName", "Sun Microsystems, Inc.\0"
+            VALUE "CompanyName", "Scriptics Corporation\0"
             VALUE "FileVersion", TK_PATCH_LEVEL
-            VALUE "LegalCopyright", "Copyright \251 1995-1996\0"
+            VALUE "LegalCopyright", "Copyright \251 1999 by Scriptics Corporation\0"
             VALUE "ProductName", "Tk " TK_VERSION " for Windows\0"
             VALUE "ProductVersion", TK_PATCH_LEVEL
         END