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

diff --git a/include/wx/msw/cross.cur b/include/wx/msw/cross.cur
new file mode 100644 (file)
index 0000000..5b8f463
Binary files /dev/null and b/include/wx/msw/cross.cur differ

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 619a188d6fb235ad4d095f91b0cfab252b81efcc..62c850d6b1b92ac8a31c9577d9dcf1194fdee43a 100644 (file)
--- 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_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 23495af1aa1d2bf746ccabddde3879046251d7f4..4dee125894752eae54b4ed9b8dcfcecbaaf7bac1 100644 (file)
--- 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
         { 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
         { false, _T("WXCURSOR_HAND")         }, // wxCURSOR_HAND
         {  true, IDC_IBEAM                   }, // WXCURSOR_IBEAM
         {  true, IDC_ARROW                   }, // WXCURSOR_LEFT_BUTTON