From 27e7e85984a212f98548d3b2c05ac1195e1b9216 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 3 Apr 2005 11:36:31 +0000
Subject: [PATCH] Cross-hair cursor appears as an I-beam on WinXP for some
 reason; use cursor file instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/cross.cur | Bin 0 -> 326 bytes
 include/wx/msw/wx.rc     |   1 +
 src/msw/cursor.cpp       |   4 +++-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 include/wx/msw/cross.cur

diff --git a/include/wx/msw/cross.cur b/include/wx/msw/cross.cur
new file mode 100644
index 0000000000000000000000000000000000000000..5b8f4632f9574aa0a22ca0e6838c414918cd4822
GIT binary patch
literal 326
zcmZQzU}9ioP*7lC;AaqEFkob05My9q&;Vkf5Q75{GXfzPKq&|ZLH_^$AHf+Q7SIi-
W;2)4nB>up_AWy7XusT$mz&rrdPk^rg

literal 0
HcmV?d00001

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 619a188d6f..62c850d6b1 100644
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -75,6 +75,7 @@ WXCURSOR_PRIGHT         CURSOR  DISCARDABLE     "wx/msw/pntright.cur"
 WXCURSOR_QARROW         CURSOR  DISCARDABLE     "wx/msw/query.cur"
 WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
 WXCURSOR_RIGHT_ARROW    CURSOR  DISCARDABLE     "wx/msw/rightarr.cur"
+WXCURSOR_CROSS          CURSOR  DISCARDABLE     "wx/msw/cross.cur"
 
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 23495af1aa..4dee125894 100644
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -311,7 +311,9 @@ wxCursor::wxCursor(int idCursor)
         { false, _T("WXCURSOR_RIGHT_ARROW")  }, // wxCURSOR_RIGHT_ARROW
         { false, _T("WXCURSOR_BULLSEYE")     }, // wxCURSOR_BULLSEYE
         {  true, IDC_ARROW                   }, // WXCURSOR_CHAR
-        {  true, IDC_CROSS                   }, // WXCURSOR_CROSS
+        // Displays as an I-beam on XP, so use a cursor file
+//        {  true, IDC_CROSS                   }, // WXCURSOR_CROSS
+        {  false, _T("WXCURSOR_CROSS")       }, // WXCURSOR_CROSS
         { false, _T("WXCURSOR_HAND")         }, // wxCURSOR_HAND
         {  true, IDC_IBEAM                   }, // WXCURSOR_IBEAM
         {  true, IDC_ARROW                   }, // WXCURSOR_LEFT_BUTTON
-- 
2.50.0