summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2003-07-24 02:10:00 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2003-07-24 02:10:00 (GMT)
commit2fab9c5ce3ffe59d4a8a918fd02e4596f482fe6e (patch)
treedafd3e35e28dc766211bf5fcbc33afc7b10a1dac /win
parentc1eed5a406d7570cf976f9b93374c84ba2975d14 (diff)
downloadtk-2fab9c5ce3ffe59d4a8a918fd02e4596f482fe6e.zip
tk-2fab9c5ce3ffe59d4a8a918fd02e4596f482fe6e.tar.gz
tk-2fab9c5ce3ffe59d4a8a918fd02e4596f482fe6e.tar.bz2
* win/tkWinCursor.c: Fix for bug #776646 for a native hand2 and
fleur (move) cursor under win. * tests/cursor.test: Check that documented cursors are available.
Diffstat (limited to 'win')
-rw-r--r--win/tkWinCursor.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/win/tkWinCursor.c b/win/tkWinCursor.c
index b54bc2d..73ae25c 100644
--- a/win/tkWinCursor.c
+++ b/win/tkWinCursor.c
@@ -8,7 +8,7 @@
* 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.11 2003/07/18 23:55:13 patthoyts Exp $
+ * RCS: @(#) $Id: tkWinCursor.c,v 1.12 2003/07/24 02:10:01 patthoyts Exp $
*/
#include "tkWinInt.h"
@@ -25,6 +25,14 @@ typedef struct {
} TkWinCursor;
/*
+ * The HAND cursor is only present when WINVER >= 0x0500. If this is
+ * not available at runtime, it will default to the unix-style cursor.
+ */
+#ifndef IDC_HAND
+#define IDC_HAND MAKEINTRESOURCE(32649)
+#endif
+
+/*
* The table below is used to map from the name of a predefined cursor
* to its resource identifier.
*/
@@ -38,7 +46,7 @@ static struct CursorName {
{"ibeam", IDC_IBEAM},
{"icon", IDC_ICON},
{"no", IDC_NO},
- {"size", IDC_SIZE},
+ {"size", IDC_SIZEALL},
{"size_ne_sw", IDC_SIZENESW},
{"size_ns", IDC_SIZENS},
{"size_nw_se", IDC_SIZENWSE},
@@ -46,12 +54,13 @@ static struct CursorName {
{"uparrow", IDC_UPARROW},
{"wait", IDC_WAIT},
{"crosshair", IDC_CROSS},
- {"fleur", IDC_SIZE},
+ {"fleur", IDC_SIZEALL},
{"sb_v_double_arrow", IDC_SIZENS},
{"sb_h_double_arrow", IDC_SIZEWE},
{"center_ptr", IDC_UPARROW},
{"watch", IDC_WAIT},
{"xterm", IDC_IBEAM},
+ {"hand2", IDC_HAND},
{NULL, 0}
};