added references to XML classes

[wxWidgets.git] / src / msw / cursor.cpp

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 41120c1fc37725bddc5b0859e432bf663366b289..cdc7992e51cd0ac52a5143c88024f8293b436977 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "cursor.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,18 +24,20 @@
     #pragma hdrstop
 #endif
 
+#include "wx/cursor.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h" // IDC_HAND
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"
     #include "wx/icon.h"
-    #include "wx/cursor.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
+    #include "wx/image.h"
+    #include "wx/module.h"
 #endif
 
-#include "wx/module.h"
-#include "wx/image.h"
 #include "wx/msw/private.h"
 
 // define functions missing in MicroWin
@@ -211,11 +209,15 @@ wxCursor::wxCursor(const wxImage& image)
     HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized),
                                          hotSpotX, hotSpotY );
 
+#if wxUSE_WXDIB
     if ( !hcursor )
     {
         wxLogWarning(_("Failed to create cursor."));
         return;
     }
+#else
+    HCURSOR hcursor = 0;
+#endif
 
     m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
 }
@@ -311,10 +313,15 @@ wxCursor::wxCursor(int idCursor)
         { false, _T("WXCURSOR_RIGHT_ARROW")  }, // wxCURSOR_RIGHT_ARROW
         { false, _T("WXCURSOR_BULLSEYE")     }, // wxCURSOR_BULLSEYE
         {  true, IDC_ARROW                   }, // WXCURSOR_CHAR
+
         // 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
+
+        // See special handling below for wxCURSOR_HAND
+//        { false, _T("WXCURSOR_HAND")         }, // wxCURSOR_HAND
+        {  true, IDC_HAND                    }, // wxCURSOR_HAND
+
         {  true, IDC_IBEAM                   }, // WXCURSOR_IBEAM
         {  true, IDC_ARROW                   }, // WXCURSOR_LEFT_BUTTON
         { false, _T("WXCURSOR_MAGNIFIER")    }, // wxCURSOR_MAGNIFIER
@@ -347,18 +354,25 @@ wxCursor::wxCursor(int idCursor)
                  _T("invalid cursor id in wxCursor() ctor") );
 
     const StdCursor& stdCursor = stdCursors[idCursor];
+    bool deleteLater = !stdCursor.isStd;
 
     HCURSOR hcursor = ::LoadCursor(stdCursor.isStd ? NULL : wxGetInstance(),
                                    stdCursor.name);
 
+    // IDC_HAND may not be available on some versions of Windows.
+    if ( !hcursor && idCursor == wxCURSOR_HAND)
+    {
+        hcursor = ::LoadCursor(wxGetInstance(), _T("WXCURSOR_HAND"));
+        deleteLater = true;
+    }
+
     if ( !hcursor )
     {
         wxLogLastError(_T("LoadCursor"));
     }
     else
     {
-        m_refData = new wxCursorRefData(hcursor,
-                                        !stdCursor.isStd /* delete it later */);
+        m_refData = new wxCursorRefData(hcursor, deleteLater);
     }
 }
 
@@ -406,5 +420,3 @@ void wxSetCursor(const wxCursor& cursor)
             *gs_globalCursor = cursor;
     }
 }
-
-