diff options
| author | hobbs <hobbs@noemail.net> | 2007-10-30 01:57:54 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2007-10-30 01:57:54 (GMT) |
| commit | b5aea91905ed6bbee610a1fb514c22deaf62fdbb (patch) | |
| tree | 7041a42b48870bc050d2aea2eaee9195e8291e9e /win/tkWinFont.c | |
| parent | 68878f8a6e32c0889785c17e3ee8dba881678391 (diff) | |
| download | tk-b5aea91905ed6bbee610a1fb514c22deaf62fdbb.zip tk-b5aea91905ed6bbee610a1fb514c22deaf62fdbb.tar.gz tk-b5aea91905ed6bbee610a1fb514c22deaf62fdbb.tar.bz2 | |
* tests/listbox.test, tests/panedwindow.test, tests/scrollbar.test:
* library/bgerror.tcl, library/dialog.tcl, library/listbox.tcl:
* library/msgbox.tcl, library/optMenu.tcl, library/tclIndex:
* library/tkfbox.tcl, library/demos/floor.tcl, library/demos/rmt:
* library/demos/tcolor, library/demos/text.tcl:
* library/demos/twind.tcl, library/demos/widget: Buh-bye Motif look
* library/ttk/fonts.tcl: Update of Tk default look in 8.5
* macosx/tkMacOSXDefault.h: Trims border sizes, cleaner X11 look
* unix/tkUnixDefault.h: with minor modifications for Win32/Aqua.
* win/tkWinDefault.h: Uses Tk*Font definitions throughout for
* win/tkWinFont.c: classic widgets. [Bug #1820344]
* library/obsolete.tcl (::tk::classic::restore): This restores
changes made to defaults in 8.5 using the 'option' command,
segmented into logical groups.
FossilOrigin-Name: f108de53ea5bbca88ddb0d911bbc8a30fd9a894f
Diffstat (limited to 'win/tkWinFont.c')
| -rw-r--r-- | win/tkWinFont.c | 17 |
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. */ |