diff options
| author | mistachkin <mistachkin@noemail.net> | 2011-04-04 20:19:53 (GMT) |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2011-04-04 20:19:53 (GMT) |
| commit | a0ad44c36d0eb8252ca890ed52cd314665c80f9c (patch) | |
| tree | 0f25bdc2d0e92daff618c06ee4b1501cd58ae054 | |
| parent | b9c6ad38af3b25dccde484e15dc95bb9a6df9305 (diff) | |
| download | tk-a0ad44c36d0eb8252ca890ed52cd314665c80f9c.zip tk-a0ad44c36d0eb8252ca890ed52cd314665c80f9c.tar.gz tk-a0ad44c36d0eb8252ca890ed52cd314665c80f9c.tar.bz2 | |
* win/tkWinDialog.c (FontchooserShowCmd): Change the CHOOSEFONT and LOGFONT used with sizeof to CHOOSEFONTA and LOGFONTA to match their local variable declarations (i.e. mismatch with -DUNICODE). This code is not present in 8.4 or 8.5.
FossilOrigin-Name: 462d7b569055e771acb742724cffde85c0d508e0
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | win/tkWinDialog.c | 6 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2011-04-04 Joe Mistachkin <joe@mistachkin.com> + + * win/tkWinDialog.c (FontchooserShowCmd): Change the CHOOSEFONT and + LOGFONT used with sizeof to CHOOSEFONTA and LOGFONTA to match their + local variable declarations (i.e. mismatch with -DUNICODE). This code + is not present in 8.4 or 8.5. + 2011-04-04 Peter Spjuth <peter.spjuth@gmail.com> * doc/labelframe.n: diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index 3c70a66..8e8c4eb 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -2356,10 +2356,10 @@ FontchooserShowCmd( Tk_MakeWindowExist(parent); - ZeroMemory(&cf, sizeof(CHOOSEFONT)); - ZeroMemory(&lf, sizeof(LOGFONT)); + ZeroMemory(&cf, sizeof(CHOOSEFONTA)); + ZeroMemory(&lf, sizeof(LOGFONTA)); lf.lfCharSet = DEFAULT_CHARSET; - cf.lStructSize = sizeof(CHOOSEFONT); + cf.lStructSize = sizeof(CHOOSEFONTA); cf.hwndOwner = Tk_GetHWND(Tk_WindowId(parent)); cf.lpLogFont = &lf; cf.nFontType = SCREEN_FONTTYPE; |