summaryrefslogtreecommitdiffstats
path: root/win/tkWinCursor.c
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-10-06 14:33:29 (GMT)
committernijtmans <nijtmans>2010-10-06 14:33:29 (GMT)
commitdf03a929f3a0282f0668f932f3a45729b667c9f7 (patch)
tree79bdff6580cc1cbf0e6d8a3dc5d5a58fbcb4c0e0 /win/tkWinCursor.c
parent98aad13185edb779119cf4546b08580e0c9cb6ec (diff)
downloadtk-df03a929f3a0282f0668f932f3a45729b667c9f7.zip
tk-df03a929f3a0282f0668f932f3a45729b667c9f7.tar.gz
tk-df03a929f3a0282f0668f932f3a45729b667c9f7.tar.bz2
[FRQ 2965056]: Windows build with -DUNICODE
Diffstat (limited to 'win/tkWinCursor.c')
-rw-r--r--win/tkWinCursor.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/win/tkWinCursor.c b/win/tkWinCursor.c
index a8df6a3..2a44196 100644
--- a/win/tkWinCursor.c
+++ b/win/tkWinCursor.c
@@ -8,15 +8,9 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinCursor.c,v 1.19 2010/09/10 08:59:25 nijtmans Exp $
+ * RCS: @(#) $Id: tkWinCursor.c,v 1.20 2010/10/06 14:33:29 nijtmans Exp $
*/
-/* TODO: This file does not compile in UNICODE mode.
- * See [Freq 2965056]: Windows build with -DUNICODE
- */
-#undef UNICODE
-#undef _UNICODE
-
#include "tkWinInt.h"
/*
@@ -145,7 +139,7 @@ TkGetCursorByName(
ckfree((char *) cursorPtr);
return NULL;
}
- cursorPtr->winCursor = LoadCursorFromFile(&(argv[0][1]));
+ cursorPtr->winCursor = LoadCursorFromFileA(&(argv[0][1]));
} else {
/*
* Check for the cursor in the system cursor set.
@@ -164,7 +158,7 @@ TkGetCursorByName(
* one of our application resources.
*/
- cursorPtr->winCursor = LoadCursor(Tk_GetHINSTANCE(), argv[0]);
+ cursorPtr->winCursor = LoadCursorA(Tk_GetHINSTANCE(), argv[0]);
} else {
cursorPtr->system = 1;
}