Applied patch [ 1212020 ] MediaCtrl DirectShow drawing and sample

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 4dee125894752eae54b4ed9b8dcfcecbaaf7bac1..41120c1fc37725bddc5b0859e432bf663366b289 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -202,13 +202,13 @@ wxCursor::wxCursor(const wxImage& image)
     }
     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);
     }
 
-    HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized), 
+    HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized),
                                          hotSpotX, hotSpotY );
 
     if ( !hcursor )
@@ -333,7 +333,7 @@ wxCursor::wxCursor(int idCursor)
         {  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
 
@@ -357,7 +357,8 @@ wxCursor::wxCursor(int idCursor)
     }
     else
     {
-        m_refData = new wxCursorRefData(hcursor);
+        m_refData = new wxCursorRefData(hcursor,
+                                        !stdCursor.isStd /* delete it later */);
     }
 }