summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-10-10 11:51:28 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-10-10 11:51:28 (GMT)
commit312fb62c15399a1a2a71ceecd510d67d65b741fd (patch)
treea4594463d45761e78384728878abdfff2cea98f1 /win
parent351e69ec020aae77619cd10fea873347cf2b731c (diff)
downloadtk-312fb62c15399a1a2a71ceecd510d67d65b741fd.zip
tk-312fb62c15399a1a2a71ceecd510d67d65b741fd.tar.gz
tk-312fb62c15399a1a2a71ceecd510d67d65b741fd.tar.bz2
correct -DUNICODE handling for tk_chooseColor dialog
Diffstat (limited to 'win')
-rw-r--r--win/tkWinDialog.c6
1 files 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);
/*