diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | win/tkWinMenu.c | 4 |
2 files changed, 14 insertions, 10 deletions
@@ -1,3 +1,7 @@ +1999-09-14 Jeff Hobbs <hobbs@scriptics.com> + + * win/tkWinMenu.c: fix for stack overrun in GetTextFace [Bug: 909] + 1999-09-01 Jeff Hobbs <hobbs@scriptics.com> * win/tkWinDraw.c: @@ -5,8 +9,6 @@ * generic/tkCanvas.c: fixed GC error (bg <> fg) in tkCanvas.c (from code added to support TkpDrawHighlightBorder) [Bug: 2676] * unix/aclocal.m4: added -bnoentry to the AIX-* flags - * generic/tkCursor.c: fixed equality error in GetCursorFromObj - [Bug: 2562] * library/msgbox.tcl: changed the behavior of tk_messageBox on Unix to be more Windows like in handling of <Return> and the default button @@ -40,14 +42,16 @@ * generic/tkCursor.c: fixed bug in GetCursorFromObj that caused panic [Bug: 2562] - + + * TK 8.2.0 RELEASED + 1999-08-13 Jim Ingham <jingham@cygnus.com> - * mac/tkMacMenu.c: Tk_DrawChars ends up setting the menu background - wrong. There is no clean way to stop it, so I use lower level routines - here to draw the text. - * mac/tkMacProjects.sea.hqx: Rearrange the projects so that the build - directory is separate from the sources. Much more convenient! + * mac/tkMacMenu.c: Tk_DrawChars ends up setting the menu background + wrong. There is no clean way to stop it, so I use lower level routines + here to draw the text. + * mac/tkMacProjects.sea.hqx: Rearrange the projects so that the build + directory is separate from the sources. Much more convenient! 1999-08-10 Jeff Hobbs <hobbs@scriptics.com> diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index b39d584..92c017f 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.5 1999/04/16 01:51:52 stanton Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.6 1999/09/15 22:35:42 hobbs Exp $ */ #define OEMRESOURCE @@ -2716,7 +2716,7 @@ SetDefaults( } SelectObject(scratchDC, menuFont); GetTextMetrics(scratchDC, &tm); - GetTextFace(scratchDC, sizeof(menuFontDString), faceName); + GetTextFace(scratchDC, LF_FACESIZE, faceName); pointSize = MulDiv(tm.tmHeight - tm.tmInternalLeading, 72, GetDeviceCaps(scratchDC, LOGPIXELSY)); if (tm.tmWeight >= 700) { |