removed useless assert from wxArray::Alloc

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

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index bff7fab2658d6f7ed54eed914cad6cd32f3bcc09..f8c1580476d0dfbfdfd33cc388db44f953480e89 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -258,7 +258,6 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
         m_boundingRect = * rect;
 
     bool ret = (ImageList_BeginDrag(GetHimageList(), 0, hotspot.x, hotspot.y) != 0);
         m_boundingRect = * rect;
 
     bool ret = (ImageList_BeginDrag(GetHimageList(), 0, hotspot.x, hotspot.y) != 0);

-    //bool ret = (ImageList_BeginDrag(GetHimageList(), 0, 0, 0) != 0);

 
     if (!ret)
     {
 
     if (!ret)
     {


@@ -284,6 +283,9 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
         // See if we can find the cursor hotspot
         wxPoint curHotSpot(hotspot);
 
         // See if we can find the cursor hotspot
         wxPoint curHotSpot(hotspot);
 

+        // Although it seems to produce the right position, when the hotspot goeos
+        // negative it has strange effects on the image.
+        // How do we stop the cursor jumping right and below of where it should be?

 #if 0
         ICONINFO iconInfo;
         if (::GetIconInfo((HICON) (HCURSOR) m_cursor.GetHCURSOR(), & iconInfo) != 0)
 #if 0
         ICONINFO iconInfo;
         if (::GetIconInfo((HICON) (HCURSOR) m_cursor.GetHCURSOR(), & iconInfo) != 0)


@@ -292,9 +294,9 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
             curHotSpot.y -= iconInfo.yHotspot;
         }
 #endif
             curHotSpot.y -= iconInfo.yHotspot;
         }
 #endif

-        wxString msg;
-        msg.Printf("Hotspot = %d, %d", curHotSpot.x, curHotSpot.y);
-        wxLogDebug(msg);
+        //wxString msg;
+        //msg.Printf("Hotspot = %d, %d", curHotSpot.x, curHotSpot.y);
+        //wxLogDebug(msg);

 
         // First add the cursor to the image list
         HCURSOR hCursor = (HCURSOR) m_cursor.GetHCURSOR();
 
         // First add the cursor to the image list
         HCURSOR hCursor = (HCURSOR) m_cursor.GetHCURSOR();