WinCE fixes (in case a WinCE-friendly backend gets written one day)

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 23495af1aa1d2bf746ccabddde3879046251d7f4..3a6a3e9e80849b49cae25b425bf97ef49f171915 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -40,7 +36,9 @@
 
 #include "wx/module.h"
 #include "wx/image.h"
 
 #include "wx/module.h"
 #include "wx/image.h"

+

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

+#include "wx/msw/missing.h" // IDC_HAND

 
 // define functions missing in MicroWin
 #ifdef __WXMICROWIN__
 
 // define functions missing in MicroWin
 #ifdef __WXMICROWIN__


@@ -202,20 +200,24 @@ wxCursor::wxCursor(const wxImage& image)
     }
     else if ((w != image_w) || (h != image_h))
     {
     }
     else if ((w != image_w) || (h != image_h))
     {

-        hotSpotX = int(hotSpotX * double(w) / double(image_w)); 
-        hotSpotY = int(hotSpotY * double(h) / double(image_h)); 
+        hotSpotX = int(hotSpotX * double(w) / double(image_w));
+        hotSpotY = int(hotSpotY * double(h) / double(image_h));

 
         imageSized = image.Scale(w, h);
     }
 
 
         imageSized = image.Scale(w, h);
     }
 

-    HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized), 
+    HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized),

                                          hotSpotX, hotSpotY );
 
                                          hotSpotX, hotSpotY );
 

+#if wxUSE_WXDIB

     if ( !hcursor )
     {
         wxLogWarning(_("Failed to create cursor."));
         return;
     }
     if ( !hcursor )
     {
         wxLogWarning(_("Failed to create cursor."));
         return;
     }

+#else
+    HCURSOR hcursor = 0;
+#endif                                         

 
     m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
 }
 
     m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
 }


@@ -311,8 +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
         { false, _T("WXCURSOR_RIGHT_ARROW")  }, // wxCURSOR_RIGHT_ARROW
         { false, _T("WXCURSOR_BULLSEYE")     }, // wxCURSOR_BULLSEYE
         {  true, IDC_ARROW                   }, // WXCURSOR_CHAR

-        {  true, IDC_CROSS                   }, // WXCURSOR_CROSS
-        { false, _T("WXCURSOR_HAND")         }, // wxCURSOR_HAND
+        
+        // Displays as an I-beam on XP, so use a cursor file
+//        {  true, IDC_CROSS                   }, // WXCURSOR_CROSS
+        {  false, _T("WXCURSOR_CROSS")       }, // WXCURSOR_CROSS
+
+        // 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
         {  true, IDC_IBEAM                   }, // WXCURSOR_IBEAM
         {  true, IDC_ARROW                   }, // WXCURSOR_LEFT_BUTTON
         { false, _T("WXCURSOR_MAGNIFIER")    }, // wxCURSOR_MAGNIFIER


@@ -331,7 +340,7 @@ wxCursor::wxCursor(int idCursor)
         {  true, IDC_SIZEALL                 }, // WXCURSOR_SIZING
         { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_SPRAYCAN
         {  true, IDC_WAIT                    }, // WXCURSOR_WAIT
         {  true, IDC_SIZEALL                 }, // WXCURSOR_SIZING
         { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_SPRAYCAN
         {  true, IDC_WAIT                    }, // WXCURSOR_WAIT

-        { false, _T("WXCURSOR_WATCH")        }, // WXCURSOR_WATCH
+        {  true, IDC_WAIT                    }, // WXCURSOR_WATCH

         { false, _T("WXCURSOR_BLANK")        }, // wxCURSOR_BLANK
         {  true, IDC_APPSTARTING             }, // wxCURSOR_ARROWWAIT
 
         { false, _T("WXCURSOR_BLANK")        }, // wxCURSOR_BLANK
         {  true, IDC_APPSTARTING             }, // wxCURSOR_ARROWWAIT
 


@@ -345,17 +354,25 @@ wxCursor::wxCursor(int idCursor)
                  _T("invalid cursor id in wxCursor() ctor") );
 
     const StdCursor& stdCursor = stdCursors[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);
 
 
     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
     {
     if ( !hcursor )
     {
         wxLogLastError(_T("LoadCursor"));
     }
     else
     {

-        m_refData = new wxCursorRefData(hcursor);
+        m_refData = new wxCursorRefData(hcursor, deleteLater);

     }
 }
 
     }
 }