merge trunk

8 files changed, 103 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index 969ebc2..b55a6cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-17  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/makefile.vc: [Bug 3544932]: Visual studio compiler check fails
+
 2012-07-05  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* win/tkWinDialog.c (GetFileNameW): [Bug 3540127]: Better solution,
@@ -79,7 +83,8 @@
 	* generic/tkMain.c:   Implement TkCygwinMainEx for loading
 	* generic/tkWindow.c: Cygwin's Tk_MainEx from the Tk dll.
 	* generic/tkInt.decls:   Change XChangeWindowAttributes signature and
-	* generic/tkIntXlibDeclsDecls.h: many others to match Xorg, needed for Cygwin.
+	* generic/tkIntXlibDeclsDecls.h: many others to match Xorg, needed for
+	Cygwin.
 
 2012-06-06  Jan Nijtmans  <nijtmans@users.sf.net>
 
@@ -88,12 +93,12 @@
 
 2012-05-31  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* generic/tkWindow.c:    Simpify determination whether we are running on cygwin.
-	* generic/tkStubInit.c:  Export Tk_GetHINSTANCE, TkSetPixmapColormap and
-	* generic/tkInt.decls: 	 TkpPrintWindowId on the Cygwin dll, sync stub table
-	with Tk 8.6 win32 version.
+	* generic/tkWindow.c:	Simplify determination whether we are running
+	* generic/tkStubInit.c:	on cygwin.  Export Tk_GetHINSTANCE,
+	* generic/tkInt.decls:	TkSetPixmapColormap and TkpPrintWindowId on the
+	Cygwin dll, sync stub table with Tk 8.6 win32 version.
 	* generic/tk*Decls.h:    re-generated
-	* win/Makefile.in:       Fix "make genstubs" when cross-compiling on UNIX
+	* win/Makefile.in:       "make genstubs" when cross-compiling on UNIX
 
 	* win/stubs.c:           Implement XFlush and various others for win32 as stubs,
 	* win/tkWinPort.h:       so win32 extensions using those can run under CYGWIN as well.
@@ -107,13 +112,13 @@
 
 2012-05-28  Francois Vogel  <fvogelnew1@free.fr>
 
-	* doc/text.n:  [Bug 1630251]: Documentation for -endline option was wrong
+	* doc/text.n:  [Bug 1630251]: Doc for -endline option was wrong
 
 2012-05-28  Francois Vogel  <fvogelnew1@free.fr>
 
-	* generic/tkTextDisp.c:    [Bug 1630254]: missing scrolling of text widget
-	when from a -startline == -endline initial state it is configured to display
-	a non-empty part of it
+	* generic/tkTextDisp.c: [Bug 1630254]: missing scrolling of text widget
+	when from a -startline == -endline initial state it is configured to
+	display a non-empty part of it
 
 2012-05-24  Jan Nijtmans  <nijtmans@users.sf.net>
 
@@ -133,15 +138,16 @@
 2012-05-05  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* xlib/xcolors.c:      Single "const" addition
-	* generic/tkWindow.c:  If tk.dll loaded in cygwin, don't use the win32 file dialogs
+	* generic/tkWindow.c:  If tk.dll loaded in cygwin, don't use the
+	win32 file dialogs
 
 2012-05-04  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* library/menu.tcl:    [Bug 2768586]: Menu posting problem on dual monitors
+	* library/menu.tcl: [Bug 2768586]: Menu posting on dual monitors
 
 2012-04-29  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* library/tk.tcl:    [Bug 533519]: Window placement with multiple screens
+	* library/tk.tcl: [Bug 533519]: Window placement with multiple screens
 	* generic/tkBind.c:
 	* generic/tkFocus.c:
 	* generic/tkMenuDraw.c:
@@ -154,8 +160,8 @@
 
 2012-04-26  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* generic/tk.decls:      [Bug 3508771]: Implement TkClipBox, Tk*Region and
-	* generic/tkInt.decls:   Tk_GetHINSTANCE for Cygwin
+	* generic/tk.decls:	[Bug 3508771]: Implement TkClipBox, Tk*Region
+	* generic/tkInt.decls:	and Tk_GetHINSTANCE for Cygwin
 	* generic/tkPlatDecls.h:
 	* generic/tkintDecls.h:
 	* generic/tkStubInit.c:
@@ -262,6 +268,11 @@
 	Tkinter's handling of multiple filename results. Issue was reported
 	via StackOverflow: http://stackoverflow.com/q/9227859/301832
 
+2012-01-30  Joe English  <jenglish@users.sourceforge.net>
+
+	* library/ttk/combobox.tcl: [Bug 2925561] Don't take focus in
+	disabled state.
+
 2012-01-29  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* win/tkImgPhoto.c: [Bug 3480634]: PNG Images missing in menus on Mac
@@ -305,6 +316,11 @@
 	* generic/tkText.c: [Bug-3021557]: Moving the cursor in
 	* tests/text.test:  elided text freezes Tk
 
+2011-12-22  Don Porter  <dgp@users.sourceforge.net>
+
+	* win/tkWinMenu.c: [Bug 3235256] Keep menu entry IDs out of system
+	values. Thanks Colin McDonald. 
+
 2011-12-13  Donal K. Fellows  <dkf@users.sf.net>
 
 	* doc/getOpenFile.n: Make example follow best practices. Issue spotted
diff --git a/changes b/changes
index 84c46e9..929fe83 100644
--- a/changes
+++ b/changes
@@ -6946,3 +6946,53 @@ and -to (porter)
 2011-10-25 (bug fix)[3410609] AltGr keysyms on Swiss keyboard (tasser,kenny)
 
 --- Released 8.6b3, November 20, 2011 --- See ChangeLog for details ---
+
+2011-11-17 (bug fix)[3437816] return code of [canvas lower] (hirner,ferrieux)
+
+2011-12-22 (bug fix)[3235256] correct menu failure on Windows (mcdonald)
+
+2012-01-19 (bug fix)[3021557] cursor freeze in elided text (vogel)
+
+2012-01-22 (bug fix)[3476698] hang in [text mark prev/next] (vogel)
+
+2012-01-25 (bug fix)[3475627] Stop text-31.11 failure (vogel)
+
+2012-01-25 (bug fix)[1630271] hang/crash on mark before -startline (vogel)
+
+2012-01-26 (bug fix)[1754043,2321450] -blockcursor appearance (vogel)
+
+2012-01-27 (bug fix)[3480471] crash in [tk_getOpenFile] (nijtmans)
+
+2012-01-29 (bug fix)[3480634] PNG image in menus (nijtmans)
+
+2012-01-30 (bug fix)[2925561] disabled combobox don't take focus (english)
+
+2012-02-10 (bug fix) win dialog avoid shimmer that confuses Python (fellows)
+
+2012-02-15 (bug fix)[3486474] Correct color scaling (goth,nijtmans)
+
+2012-02-28 (bug fix)[1630262,1615425] [text] crash tags & -*line (vogel)
+
+2012-03-07 (bug fix)[3497848] consistent pixel rounding (fassel,fellows)
+
+2012-03-18 (enhancement)[3503317] XParseColor speedup (nijtmans)
+
+2012-04-07 (bug fix)[3176239] control-Mousewheel crash (couch,nijtmans)
+
+2012-04-22 (bug fix)[3520202] <MouseWheel> %k,%K,%N for Python (deily,fellows)
+
+2012-05-02 (bug fix)[533519] multiscreen window placement (nijtmans)
+
+2012-05-04 (bug fix)[2768586] multiscreen menu posting (nijtmans)
+
+2012-05-28 (bug fix)[1630254] text peer update on -startline reset (baker,vogel)
+
+2012-06-11 (bug fix)[3294450] ttk text element clipping (oehlmann,fellows)
+
+2012-07-02 (bug fix) Make sure all index tables are static (kirkham,english)
+
+2012-07-23 (bug fix)[3546073] DisplayString() -> DefaultDisplay() (english)
+
+Many revisions to better support a Cygwin environment (nijtmans)
+
+--- Released 8.5.12, July 27, 2012 --- See ChangeLog for details ---
diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c
index 94e8d7c..604fa98 100644
--- a/generic/tkClipboard.c
+++ b/generic/tkClipboard.c
@@ -649,11 +649,8 @@ TkClipInit(
      * and set up an event handler for it.
      */
 
-    dispPtr->clipWindow = Tk_CreateWindow(interp, NULL, "_clip",
-	    DisplayString(dispPtr->display));
-    if (dispPtr->clipWindow == NULL) {
-	return TCL_ERROR;
-    }
+    dispPtr->clipWindow = (Tk_Window) TkAllocWindow(dispPtr,
+	DefaultScreen(dispPtr->display), NULL);
     Tcl_Preserve(dispPtr->clipWindow);
     atts.override_redirect = True;
     Tk_ChangeWindowAttributes(dispPtr->clipWindow, CWOverrideRedirect, &atts);
diff --git a/unix/install-sh b/unix/install-sh
index 5975819..7c34c3f 100644
--- a/unix/install-sh
+++ b/unix/install-sh
@@ -120,7 +120,7 @@ Options:
   -m MODE       $chmodprog installed files to MODE.
   -o USER       $chownprog installed files to USER.
   -s            $stripprog installed files.
-  -S $stripprog installed files.
+  -S            $stripprog installed files.
   -t DIRECTORY  install into DIRECTORY.
   -T            report an error if DSTFILE is a directory.
 
@@ -156,8 +156,8 @@ while test $# -ne 0; do
 
     -s) stripcmd=$stripprog;;
 
--S) stripcmd="$stripprog $2" 
-         shift;; 
+    -S) stripcmd="$stripprog $2"
+	shift;;
 
     -t) dst_arg=$2
 	shift;;
diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c
index 3bd1c1b..e2d1e39 100644
--- a/unix/tkUnixSend.c
+++ b/unix/tkUnixSend.c
@@ -1353,11 +1353,8 @@ SendInit(
      * for it.
      */
 
-    dispPtr->commTkwin = Tk_CreateWindow(interp, (Tk_Window) NULL,
-	    "_comm", DisplayString(dispPtr->display));
-    if (dispPtr->commTkwin == NULL) {
-	Tcl_Panic("Tk_CreateWindow failed in SendInit!");
-    }
+    dispPtr->commTkwin = (Tk_Window) TkAllocWindow(dispPtr,
+    	DefaultScreen(dispPtr->display), NULL);
     Tcl_Preserve(dispPtr->commTkwin);
     atts.override_redirect = True;
     Tk_ChangeWindowAttributes(dispPtr->commTkwin,
diff --git a/win/configure b/win/configure
index ad99837..67bff85 100755
--- a/win/configure
+++ b/win/configure
@@ -840,11 +840,11 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-threads        build with threads
-  --enable-shared         build and link with shared libraries --enable-shared
+  --enable-threads        build with threads (default: on)
+  --enable-shared         build and link with shared libraries (default: on)
   --enable-64bit          enable 64bit support (where applicable)
   --enable-wince          enable Win/CE support (where applicable)
-  --enable-symbols        build with debugging symbols --disable-symbols
+  --enable-symbols        build with debugging symbols (default: off)
   --enable-embedded-manifest
                           embed manifest if possible (default: yes)
 
@@ -3051,8 +3051,8 @@ else
 fi;
 
     if test "$tcl_ok" = "yes"; then
-	echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	echo "$as_me:$LINENO: result: yes (default)" >&5
+echo "${ECHO_T}yes (default)" >&6
 	TCL_THREADS=1
 	cat >>confdefs.h <<\_ACEOF
 #define TCL_THREADS 1
@@ -3650,8 +3650,8 @@ echo $ECHO_N "checking compiler flags... $ECHO_C" >&6
 	MAKE_EXE="\${CC} -o \$@"
 	LIBPREFIX="lib"
 
-	extra_ldflags="$extra_ldflags -pipe"
 	extra_cflags="$extra_cflags -pipe"
+	extra_ldflags="$extra_ldflags -pipe"
 
 	if test "${SHARED_BUILD}" = "0" ; then
 	    # static
diff --git a/win/makefile.vc b/win/makefile.vc
index 14dc2d0..7bacfd3 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,10 +13,9 @@
 # Copyright (c) 2003-2008 Pat Thoyts.
 #------------------------------------------------------------------------------
 
-# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
-# or with the MS Platform SDK (MSSDK). Visual Studio .NET 2003 and 2005 define
-# VCINSTALLDIR instead.
-!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(MSSDK) && !defined(VCINSTALLDIR)
+# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
+# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
+!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCINSTALLDIR) && !defined(MSSDK) && !defined(WINDOWSSDKDIR)
 MSG = ^
 You need to run vcvars32.bat from Developer Studio or setenv.bat from the^
 Platform SDK first to setup the environment.  Jump to this line to read^
diff --git a/win/tcl.m4 b/win/tcl.m4
index bbea9a3..5e8e135 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -211,7 +211,7 @@ AC_DEFUN([SC_LOAD_TKCONFIG], [
 AC_DEFUN([SC_ENABLE_SHARED], [
     AC_MSG_CHECKING([how to build libraries])
     AC_ARG_ENABLE(shared,
-	[  --enable-shared         build and link with shared libraries [--enable-shared]],
+	[  --enable-shared         build and link with shared libraries (default: on)],
     [tcl_ok=$enableval], [tcl_ok=yes])
 
     if test "${enable_shared+set}" = set; then
@@ -250,11 +250,11 @@ AC_DEFUN([SC_ENABLE_SHARED], [
 
 AC_DEFUN([SC_ENABLE_THREADS], [
     AC_MSG_CHECKING(for building with threads)
-    AC_ARG_ENABLE(threads, [  --enable-threads        build with threads],
+    AC_ARG_ENABLE(threads, [  --enable-threads        build with threads (default: on)],
 	[tcl_ok=$enableval], [tcl_ok=yes])
 
     if test "$tcl_ok" = "yes"; then
-	AC_MSG_RESULT(yes)
+	AC_MSG_RESULT([yes (default)])
 	TCL_THREADS=1
 	AC_DEFINE(TCL_THREADS)
 	# USE_THREAD_ALLOC tells us to try the special thread-based
@@ -297,7 +297,7 @@ AC_DEFUN([SC_ENABLE_THREADS], [
 
 AC_DEFUN([SC_ENABLE_SYMBOLS], [
     AC_MSG_CHECKING([for build with symbols])
-    AC_ARG_ENABLE(symbols, [  --enable-symbols        build with debugging symbols [--disable-symbols]],    [tcl_ok=$enableval], [tcl_ok=no])
+    AC_ARG_ENABLE(symbols, [  --enable-symbols        build with debugging symbols (default: off)],    [tcl_ok=$enableval], [tcl_ok=no])
 # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
@@ -533,8 +533,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	MAKE_EXE="\${CC} -o \[$]@"
 	LIBPREFIX="lib"
 
-	extra_ldflags="$extra_ldflags -pipe"
 	extra_cflags="$extra_cflags -pipe"
+	extra_ldflags="$extra_ldflags -pipe"
 
 	if test "${SHARED_BUILD}" = "0" ; then
 	    # static
@@ -1071,7 +1071,7 @@ AC_DEFUN([SC_BUILD_TCLSH], [
 #--------------------------------------------------------------------
 
 AC_DEFUN([SC_TCL_CFG_ENCODING], [
-    AC_ARG_WITH(encoding, [  --with-encoding              encoding for configuration values], with_tcencoding=${withval})
+    AC_ARG_WITH(encoding, [  --with-encoding         encoding for configuration values], with_tcencoding=${withval})
 
     if test x"${with_tcencoding}" != x ; then
 	AC_DEFINE_UNQUOTED(TCL_CFGVAL_ENCODING,"${with_tcencoding}")