summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/tkWinFont.c3
-rw-r--r--win/tkWinMenu.c6
2 files changed, 5 insertions, 4 deletions
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)