* 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.

2 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 8554de6..1540c1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;