summaryrefslogtreecommitdiffstats
path: root/win/tkWinFont.c
diff options
context:
space:
mode:
Diffstat (limited to 'win/tkWinFont.c')
-rw-r--r--win/tkWinFont.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index 89b98a7..671bbcc 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.34 2007/10/23 09:23:54 patthoyts Exp $
+ * RCS: @(#) $Id: tkWinFont.c,v 1.35 2007/10/30 01:57:58 hobbs Exp $
*/
#include "tkWinInt.h"
@@ -397,18 +397,19 @@ TkWinSetupSystemFonts(TkMainInfo *mainPtr)
NONCLIENTMETRICS ncMetrics;
ICONMETRICS iconMetrics;
HFONT hFont;
-
+
interp = (Tcl_Interp *) mainPtr->interp;
tkwin = (Tk_Window) mainPtr->winPtr;
-
+
/* force this for now */
- if (((TkWindow *) tkwin)->mainPtr == NULL)
+ if (((TkWindow *) tkwin)->mainPtr == NULL) {
((TkWindow *) tkwin)->mainPtr = mainPtr;
-
+ }
+
ncMetrics.cbSize = sizeof(ncMetrics);
SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncMetrics),
&ncMetrics, 0);
-
+
CreateNamedSystemLogFont(interp, tkwin, "TkDefaultFont",
&ncMetrics.lfMessageFont);
CreateNamedSystemLogFont(interp, tkwin, "TkHeadingFont",
@@ -429,10 +430,10 @@ TkWinSetupSystemFonts(TkMainInfo *mainPtr)
&iconMetrics, 0);
CreateNamedSystemLogFont(interp, tkwin, "TkIconFont",
&iconMetrics.lfFont);
-
+
hFont = (HFONT)GetStockObject(ANSI_FIXED_FONT);
CreateNamedSystemFont(interp, tkwin, "TkFixedFont", hFont);
-
+
/*
* Setup the remaining standard Tk font names as named fonts.
*/