From aefa2a80a74a6233ca64090a607df9819a54d5e1 Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Tue, 29 Aug 2000 21:00:12 +0000
Subject: * win/tkWinMenu.c (DrawWindowsSystemBitmap): Use scratchDC for
 determining the source's logical coordinates.  Patch from [Bug: 6134 (Markus
 Oberhumer)].

* win/tkWinMenu.c (SetDefaults): Compute the indicatorDimensions[]
under Windows NT/2000 in the same way as under Windows 95/98.
Patch from [Bug: 6134 (Markus Oberhumer)].

* win/tkWinFont.c (GetScreenFont): Added a memset() to
pacify memory checkers.  Patch from [Bug: 6134 (Markus Oberhumer)].
---
 ChangeLog       | 11 +++++++++++
 win/tkWinFont.c |  3 ++-
 win/tkWinMenu.c |  6 +++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89c03cc..9ab3a45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2000-08-29  Eric Melski  <ericm@ajubasolutions.com>
 
+	* win/tkWinMenu.c (DrawWindowsSystemBitmap): Use scratchDC
+	for determining the source's logical coordinates.  Patch from 
+	[Bug: 6134 (Markus Oberhumer)].
+
+	* win/tkWinMenu.c (SetDefaults): Compute the indicatorDimensions[]
+	under Windows NT/2000 in the same way as under Windows 95/98.
+	Patch from [Bug: 6134 (Markus Oberhumer)].
+
+	* win/tkWinFont.c (GetScreenFont): Added a memset() to
+	pacify memory checkers.  Patch from [Bug: 6134 (Markus Oberhumer)].
+
 	* library/tkfbox.tcl (::tk::dialog::file::Update): Corrected
 	handling of multi-pattern filters (eg, "* *.*"), which was broken
 	by the getOpenFile performance patches applied earlier.
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index a99d965..b84c836 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.11 2000/05/13 00:02:25 hobbs Exp $
+ * RCS: @(#) $Id: tkWinFont.c,v 1.12 2000/08/29 21:00:13 ericm Exp $
  */
 
 #include "tkWinInt.h"
@@ -1931,6 +1931,7 @@ GetScreenFont(
     HFONT hFont;
     LOGFONTW lf;
 
+    memset(&lf, 0, sizeof(lf));
     lf.lfHeight		= -pixelSize;
     lf.lfWidth		= 0;
     lf.lfEscapement	= 0;
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 54d6c1e..3fb0102 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.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: tkWinMenu.c,v 1.12 2000/07/28 17:37:24 ericm Exp $
+ * RCS: @(#) $Id: tkWinMenu.c,v 1.13 2000/08/29 21:00:13 ericm Exp $
  */
 
 #define OEMRESOURCE
@@ -1449,7 +1449,7 @@ DrawWindowsSystemBitmap(display, drawable, gc, rectPtr, bitmapID, alignFlags)
     DPtoLP(hdc, &ptSize, 1);
 
     ptOrg.y = ptOrg.x = 0;
-    DPtoLP(hdc, &ptOrg, 1);
+    DPtoLP(scratchDC, &ptOrg, 1);
 
     if (alignFlags & ALIGN_BITMAP_TOP) {
 	topOffset = 0;
@@ -2715,7 +2715,7 @@ SetDefaults(
      * documented.
      */
 
-    if (TkWinGetPlatformId() == VER_PLATFORM_WIN32_WINDOWS) {
+    if (TkWinGetPlatformId() >= VER_PLATFORM_WIN32_WINDOWS) {
 	indicatorDimensions[0] = GetSystemMetrics(SM_CYMENUCHECK);
 	indicatorDimensions[1] = ((GetSystemMetrics(SM_CXFIXEDFRAME) +
 		GetSystemMetrics(SM_CXBORDER) 
-- 
cgit v0.12