merge stable branch onto HEAD

29 files changed, 30 insertions, 30 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 67d2b84..61b577c 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.76 2007/10/30 10:13:51 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.77 2007/12/13 15:28:52 dgp Exp $
 
 TCLVERSION		= @TCL_VERSION@
 TCLPATCHL		= @TCL_PATCH_LEVEL@
diff --git a/win/configure b/win/configure
index 9321f19..c742249 100755
--- a/win/configure
+++ b/win/configure
@@ -1309,7 +1309,7 @@ SHELL=/bin/sh
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="b3"
+TK_PATCH_LEVEL=".0"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index b49e1cb..f1618da 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tk installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.73 2007/12/09 20:44:08 dkf Exp $
+# RCS: @(#) $Id: configure.in,v 1.74 2007/12/13 15:28:52 dgp Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.59)
@@ -16,7 +16,7 @@ SHELL=/bin/sh
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="b3"
+TK_PATCH_LEVEL=".0"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/makefile.vc b/win/makefile.vc
index b4e470d..9cec5ff 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001-2004 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.114 2007/11/28 02:05:24 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.115 2007/12/13 15:28:52 dgp Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index f0168ac..ff1905b 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -11,7 +11,7 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * ----------------------------------------------------------------------------
- * RCS: @(#) $Id: nmakehlp.c,v 1.9 2007/10/12 14:14:54 patthoyts Exp $
+ * RCS: @(#) $Id: nmakehlp.c,v 1.10 2007/12/13 15:28:52 dgp Exp $
  * ----------------------------------------------------------------------------
  */
 
diff --git a/win/rules.vc b/win/rules.vc
index 68ae0cf..0084520 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -11,7 +11,7 @@
 # Copyright (c) 2003-2007 Patrick Thoyts
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.20 2007/12/10 11:57:38 patthoyts Exp $
+# RCS: @(#) $Id: rules.vc,v 1.21 2007/12/13 15:28:52 dgp Exp $
 #------------------------------------------------------------------------------
 
 !ifndef _RULES_VC
diff --git a/win/tkWin.h b/win/tkWin.h
index bd1c931..f58c97f 100644
--- a/win/tkWin.h
+++ b/win/tkWin.h
@@ -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: tkWin.h,v 1.14 2007/12/10 12:10:09 patthoyts Exp $
+ * RCS: @(#) $Id: tkWin.h,v 1.15 2007/12/13 15:28:52 dgp Exp $
  */
 
 #ifndef _TKWIN
diff --git a/win/tkWinButton.c b/win/tkWinButton.c
index 63ccf24..f9721ea 100644
--- a/win/tkWinButton.c
+++ b/win/tkWinButton.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: tkWinButton.c,v 1.32 2007/12/05 19:08:00 hobbs Exp $
+ * RCS: @(#) $Id: tkWinButton.c,v 1.33 2007/12/13 15:28:52 dgp Exp $
  */
 
 #define OEMRESOURCE
diff --git a/win/tkWinConfig.c b/win/tkWinConfig.c
index c80200b..73e20f9 100644
--- a/win/tkWinConfig.c
+++ b/win/tkWinConfig.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: tkWinConfig.c,v 1.5 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkWinConfig.c,v 1.6 2007/12/13 15:28:53 dgp Exp $
  */
 
 #include "tkWinInt.h"
diff --git a/win/tkWinCursor.c b/win/tkWinCursor.c
index 825340c..e22a1c7 100644
--- a/win/tkWinCursor.c
+++ b/win/tkWinCursor.c
@@ -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: tkWinCursor.c,v 1.14 2007/09/08 16:13:45 dkf Exp $
+ * RCS: @(#) $Id: tkWinCursor.c,v 1.15 2007/12/13 15:28:55 dgp Exp $
  */
 
 #include "tkWinInt.h"
diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h
index 03e5819..f5dacae 100644
--- a/win/tkWinDefault.h
+++ b/win/tkWinDefault.h
@@ -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: tkWinDefault.h,v 1.23 2007/10/30 01:57:58 hobbs Exp $
+ * RCS: @(#) $Id: tkWinDefault.h,v 1.24 2007/12/13 15:28:55 dgp Exp $
  */
 
 #ifndef _TKWINDEFAULT
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 20029b0..8635951 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -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: tkWinDialog.c,v 1.48 2007/12/05 19:08:00 hobbs Exp $
+ * RCS: @(#) $Id: tkWinDialog.c,v 1.49 2007/12/13 15:28:55 dgp Exp $
  *
  */
 
diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c
index d1be3e1..35762d4 100644
--- a/win/tkWinDraw.c
+++ b/win/tkWinDraw.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: tkWinDraw.c,v 1.19 2007/10/24 01:03:37 patthoyts Exp $
+ * RCS: @(#) $Id: tkWinDraw.c,v 1.20 2007/12/13 15:28:55 dgp Exp $
  */
 
 #include "tkWinInt.h"
diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c
index 7322c7c..63e837a 100644
--- a/win/tkWinEmbed.c
+++ b/win/tkWinEmbed.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: tkWinEmbed.c,v 1.32 2007/09/08 16:13:45 dkf Exp $
+ * RCS: @(#) $Id: tkWinEmbed.c,v 1.33 2007/12/13 15:28:55 dgp Exp $
  */
 
 #include "tkWinInt.h"
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index 383cdf3..29e5fff 100644
--- a/win/tkWinFont.c
+++ b/win/tkWinFont.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: tkWinFont.c,v 1.37 2007/12/10 12:10:10 patthoyts Exp $
+ * RCS: @(#) $Id: tkWinFont.c,v 1.38 2007/12/13 15:28:55 dgp Exp $
  */
 
 #include "tkWinInt.h"
diff --git a/win/tkWinInit.c b/win/tkWinInit.c
index cd187f7..1a7f2be 100644
--- a/win/tkWinInit.c
+++ b/win/tkWinInit.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: tkWinInit.c,v 1.13 2007/09/06 19:34:02 dgp Exp $
+ * RCS: @(#) $Id: tkWinInit.c,v 1.14 2007/12/13 15:28:55 dgp Exp $
  */
 
 #include "tkWinInt.h"
diff --git a/win/tkWinInt.h b/win/tkWinInt.h
index 17fdb0e..8d72db2 100644
--- a/win/tkWinInt.h
+++ b/win/tkWinInt.h
@@ -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: tkWinInt.h,v 1.29 2007/12/05 19:01:48 hobbs Exp $
+ * RCS: @(#) $Id: tkWinInt.h,v 1.30 2007/12/13 15:28:55 dgp Exp $
  */
 
 #ifndef _TKWININT
diff --git a/win/tkWinKey.c b/win/tkWinKey.c
index f748a15..caa8cfb 100644
--- a/win/tkWinKey.c
+++ b/win/tkWinKey.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: tkWinKey.c,v 1.18 2007/09/08 16:13:45 dkf Exp $
+ * RCS: @(#) $Id: tkWinKey.c,v 1.19 2007/12/13 15:28:55 dgp Exp $
  */
 
 #include "tkWinInt.h"
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 8ca2be4..2e077b8 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.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: tkWinMenu.c,v 1.58 2007/09/08 16:13:45 dkf Exp $
+ * RCS: @(#) $Id: tkWinMenu.c,v 1.59 2007/12/13 15:28:56 dgp Exp $
  */
 
 #define OEMRESOURCE
diff --git a/win/tkWinScrlbr.c b/win/tkWinScrlbr.c
index 12bd505..ff6b56e 100644
--- a/win/tkWinScrlbr.c
+++ b/win/tkWinScrlbr.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: tkWinScrlbr.c,v 1.13 2007/12/05 19:08:00 hobbs Exp $
+ * RCS: @(#) $Id: tkWinScrlbr.c,v 1.14 2007/12/13 15:28:56 dgp Exp $
  */
 
 #include "tkWinInt.h"
diff --git a/win/tkWinSend.c b/win/tkWinSend.c
index 0901d07..086d55e 100644
--- a/win/tkWinSend.c
+++ b/win/tkWinSend.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: tkWinSend.c,v 1.14 2007/09/08 16:13:45 dkf Exp $
+ * RCS: @(#) $Id: tkWinSend.c,v 1.15 2007/12/13 15:28:56 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/win/tkWinSendCom.c b/win/tkWinSendCom.c
index c9188ba..b71b63a 100644
--- a/win/tkWinSendCom.c
+++ b/win/tkWinSendCom.c
@@ -18,7 +18,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinSendCom.c,v 1.7 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkWinSendCom.c,v 1.8 2007/12/13 15:28:56 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/win/tkWinTest.c b/win/tkWinTest.c
index da9b24b..57792ec 100644
--- a/win/tkWinTest.c
+++ b/win/tkWinTest.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: tkWinTest.c,v 1.13 2007/08/01 09:02:54 patthoyts Exp $
+ * RCS: @(#) $Id: tkWinTest.c,v 1.14 2007/12/13 15:28:56 dgp Exp $
  */
 
 #include "tkWinInt.h"
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index a1293dd..f647c08 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.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: tkWinWm.c,v 1.122 2007/12/09 20:44:08 dkf Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.123 2007/12/13 15:28:56 dgp Exp $
  */
 
 #include "tkWinInt.h"
diff --git a/win/tkWinX.c b/win/tkWinX.c
index d4e817c..e5e9e7b 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.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: tkWinX.c,v 1.56 2007/12/05 19:01:49 hobbs Exp $
+ * RCS: @(#) $Id: tkWinX.c,v 1.57 2007/12/13 15:28:56 dgp Exp $
  */
 
 /*
diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c
index 8be32e4..2753518 100644
--- a/win/ttkWinMonitor.c
+++ b/win/ttkWinMonitor.c
@@ -1,4 +1,4 @@
-/* $Id: ttkWinMonitor.c,v 1.15 2007/12/10 12:03:55 patthoyts Exp $
+/* $Id: ttkWinMonitor.c,v 1.16 2007/12/13 15:28:56 dgp Exp $
  */
 
 #ifdef _MSC_VER
diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c
index 2e29f46..80899f8 100644
--- a/win/ttkWinTheme.c
+++ b/win/ttkWinTheme.c
@@ -1,6 +1,6 @@
 /* winTheme.c - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net>
  *
- * $Id: ttkWinTheme.c,v 1.11 2007/12/10 12:03:55 patthoyts Exp $
+ * $Id: ttkWinTheme.c,v 1.12 2007/12/13 15:28:56 dgp Exp $
  */
 
 #ifdef _MSC_VER
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 7cd7f48..11a8269 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkWinXPTheme.c,v 1.17 2007/12/10 12:03:55 patthoyts Exp $
+ * $Id: ttkWinXPTheme.c,v 1.18 2007/12/13 15:28:56 dgp Exp $
  *
  * Tk theme engine which uses the Windows XP "Visual Styles" API
  * Adapted from Georgios Petasis' XP theme patch.
diff --git a/win/winMain.c b/win/winMain.c
index 558d0ac..254d194 100644
--- a/win/winMain.c
+++ b/win/winMain.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: winMain.c,v 1.25 2007/10/12 01:39:15 davygrvy Exp $
+ * RCS: @(#) $Id: winMain.c,v 1.26 2007/12/13 15:28:56 dgp Exp $
  */
 
 #include "tkInt.h"