merge trunkpspjuth_touch

6 files changed, 19 insertions, 31 deletions

diff --git a/generic/tkUtil.c b/generic/tkUtil.c
index acfba32..d89282f 100644
--- a/generic/tkUtil.c
+++ b/generic/tkUtil.c
@@ -1187,7 +1187,6 @@ TkSendVirtualEvent(
     event.general.xany.display = Tk_Display(target);
     event.virtual.name = Tk_GetUid(eventName);
     if (detail != NULL) {
-	Tcl_IncrRefCount(detail);
 	event.virtual.user_data = detail;
     }
 
diff --git a/win/makefile.vc b/win/makefile.vc
index ef0fa4d..6f61327 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -614,7 +614,9 @@ shell: setup $(WISH)
 !else

 	@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)

 !endif

-	$(DEBUGGER) $(WISH) $(SCRIPT)

+	$(DEBUGGER) $(WISH) <<

+	console show

+<<

 

 dbgshell: setup $(WISH)

 	@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)

diff --git a/win/tkWin.h b/win/tkWin.h
index f283daf..f682b28 100644
--- a/win/tkWin.h
+++ b/win/tkWin.h
@@ -18,15 +18,21 @@
  * the SystemParametersInfo API doesn't like to receive structures that
  * are larger than it expects which affects the font assignments.
  *
- * WINVER = 0x0500 means Windows 2000 and above
+ * NTDDI_VERSION = 0x0600 means Windows Vista and above
  */
 
+#ifndef NTDDI_VERSION
+#define NTDDI_VERSION 0x06010000
+#endif
 #ifndef WINVER
 #define WINVER 0x0601
 #endif
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0601
 #endif
+#ifndef _WIN32_IE
+#define _WIN32_IE 0x0601
+#endif
 
 #ifndef _TK
 #include <tk.h>
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 8e14669..0975633 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -3203,12 +3203,7 @@ SetDefaults(
     int pointSize;
     HFONT menuFont;
     /* See: [Bug #3239768] tk8.4.19 (and later) WIN32 menu font support */
-    struct {
-        NONCLIENTMETRICS metrics;
-#if (WINVER < 0x0600)
-        int padding;
-#endif
-    } nc;
+    NONCLIENTMETRICS metrics;
     OSVERSIONINFOW os;
 
     /*
@@ -3227,17 +3222,17 @@ SetDefaults(
     }
     Tcl_DStringInit(&menuFontDString);
 
-    nc.metrics.cbSize = sizeof(nc);
+    metrics.cbSize = sizeof(metrics);
 
     os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
     GetVersionExW(&os);
     if (os.dwMajorVersion < 6) {
-	nc.metrics.cbSize -= sizeof(int);
+	metrics.cbSize -= sizeof(int);
     }
 
-    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, nc.metrics.cbSize,
-	    &nc.metrics, 0);
-    menuFont = CreateFontIndirect(&nc.metrics.lfMenuFont);
+    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, metrics.cbSize,
+	    &metrics, 0);
+    menuFont = CreateFontIndirect(&metrics.lfMenuFont);
     SelectObject(scratchDC, menuFont);
     GetTextMetricsA(scratchDC, &tm);
     GetTextFaceA(scratchDC, LF_FACESIZE, faceName);
diff --git a/win/tkWinX.c b/win/tkWinX.c
index b0d638f..ebd4c22 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -13,16 +13,6 @@
 
 #include "tkWinInt.h"
 
-/*
- * The w32api 1.1 package (included in Mingw 1.1) does not define _WIN32_IE by
- * default. Define it here to gain access to the InitCommonControlsEx API in
- * commctrl.h.
- */
-
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0550 /* IE 5.5 */
-#endif
-
 #include <commctrl.h>
 #ifdef _MSC_VER
 #   pragma comment (lib, "comctl32.lib")
@@ -487,9 +477,9 @@ TkWinDisplayChanged(
     screen->width = GetDeviceCaps(dc, HORZRES);
     screen->height = GetDeviceCaps(dc, VERTRES);
     screen->mwidth = MulDiv(screen->width, 254,
-    	    GetDeviceCaps(dc, LOGPIXELSX) * 10);
+	    GetDeviceCaps(dc, LOGPIXELSX) * 10);
     screen->mheight = MulDiv(screen->height, 254,
-    	    GetDeviceCaps(dc, LOGPIXELSY) * 10);
+	    GetDeviceCaps(dc, LOGPIXELSY) * 10);
 
     /*
      * On windows, when creating a color bitmap, need two pieces of
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 3de1504..909660a 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -15,14 +15,12 @@
  *  	shellcc/platform/commctls/userex/refentry.asp >
  */
 
+#include <tkWinInt.h>
 #ifndef HAVE_UXTHEME_H
 /* Stub for platforms that lack the XP theme API headers: */
-#include <tkWinInt.h>
 int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) { return TCL_OK; }
 #else
 
-#define WINVER 0x0501	/* Requires Windows XP APIs */
-
 #include <windows.h>
 #include <uxtheme.h>
 #if defined(HAVE_VSSYM32_H) || _MSC_VER > 1500
@@ -31,8 +29,6 @@ int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) { return TCL_OK; }
 #   include <tmschema.h>
 #endif
 
-#include <tkWinInt.h>
-
 #include "ttk/ttkTheme.h"
 
 typedef HTHEME  (STDAPICALLTYPE OpenThemeDataProc)(HWND hwnd,