From 312fb62c15399a1a2a71ceecd510d67d65b741fd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 10 Oct 2011 11:51:28 +0000
Subject: correct -DUNICODE handling for tk_chooseColor dialog

---
 win/tkWinDialog.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 51d918f..eaaf3b5 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -311,7 +311,7 @@ Tk_ChooseColorObjCmd(
     Tk_Window tkwin = clientData, parent;
     HWND hWnd;
     int i, oldMode, winCode, result;
-    CHOOSECOLORA chooseColor;
+    CHOOSECOLOR chooseColor;
     static int inited = 0;
     static COLORREF dwCustColors[16];
     static long oldColor;		/* the color selected last time */
@@ -347,7 +347,7 @@ Tk_ChooseColorObjCmd(
     chooseColor.Flags		= CC_RGBINIT | CC_FULLOPEN | CC_ENABLEHOOK;
     chooseColor.lCustData	= (LPARAM) NULL;
     chooseColor.lpfnHook	= (LPOFNHOOKPROC) ColorDlgHookProc;
-    chooseColor.lpTemplateName	= (LPSTR) interp;
+    chooseColor.lpTemplateName	= (LPTSTR) interp;
 
     for (i = 1; i < objc; i += 2) {
 	int index;
@@ -399,7 +399,7 @@ Tk_ChooseColorObjCmd(
     chooseColor.hwndOwner = hWnd;
 
     oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
-    winCode = ChooseColorA(&chooseColor);
+    winCode = ChooseColor(&chooseColor);
     (void) Tcl_SetServiceMode(oldMode);
 
     /*
-- 
cgit v0.12