Get rid of the CVS merge characters that have worked their way into this causing...

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

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 10cedac42b117190d941e8e715fc0ab1c2b1676c..f8c1580476d0dfbfdfd33cc388db44f953480e89 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -102,7 +102,7 @@ void wxDragImage::Init()
 ////////////////////////////////////////////////////////////////////////////
 
 // Create a drag image from a bitmap and optional cursor
 ////////////////////////////////////////////////////////////////////////////
 
 // Create a drag image from a bitmap and optional cursor

-bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot)
+bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor)

 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());


@@ -146,13 +146,12 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor, const wx
         wxLogError(_("Couldn't add an image to the image list."));
     }
     m_cursor = cursor; // Can only combine with drag image after calling BeginDrag.
         wxLogError(_("Couldn't add an image to the image list."));
     }
     m_cursor = cursor; // Can only combine with drag image after calling BeginDrag.

-    m_cursorHotspot = cursorHotspot;

 
     return (index != -1) ;
 }
 
 // Create a drag image from an icon and optional cursor
 
     return (index != -1) ;
 }
 
 // Create a drag image from an icon and optional cursor

-bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot)
+bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor)

 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
 {
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());


@@ -184,13 +183,12 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPo
     }
 
     m_cursor = cursor; // Can only combine with drag image after calling BeginDrag.
     }
 
     m_cursor = cursor; // Can only combine with drag image after calling BeginDrag.

-    m_cursorHotspot = cursorHotspot;

 
     return (index != -1) ;
 }
 
 // Create a drag image from a string and optional cursor
 
     return (index != -1) ;
 }
 
 // Create a drag image from a string and optional cursor

-bool wxDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot)
+bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)

 {
     wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
 
 {
     wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
 


@@ -226,7 +224,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPo
     image.SetMaskColour(255, 255, 255);
     bitmap = image.ConvertToBitmap();
 
     image.SetMaskColour(255, 255, 255);
     bitmap = image.ConvertToBitmap();
 

-    return Create(bitmap, cursor, cursorHotspot);
+    return Create(bitmap, cursor);

 }
 
 // Create a drag image for the given tree control item
 }
 
 // Create a drag image for the given tree control item


@@ -282,6 +280,24 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
             m_hCursorImageList = (WXHIMAGELIST) ImageList_Create(cxCursor, cyCursor, ILC_MASK, 1, 1);
         }
 
             m_hCursorImageList = (WXHIMAGELIST) ImageList_Create(cxCursor, cyCursor, ILC_MASK, 1, 1);
         }
 

+        // 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)
+        {
+            curHotSpot.x -= iconInfo.xHotspot;
+            curHotSpot.y -= iconInfo.yHotspot;
+        }
+#endif
+        //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();
         int cursorIndex = ImageList_AddIcon((HIMAGELIST) m_hCursorImageList, (HICON) hCursor);
         // First add the cursor to the image list
         HCURSOR hCursor = (HCURSOR) m_cursor.GetHCURSOR();
         int cursorIndex = ImageList_AddIcon((HIMAGELIST) m_hCursorImageList, (HICON) hCursor);


@@ -290,18 +306,18 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
 
         if (cursorIndex != -1)
         {
 
         if (cursorIndex != -1)
         {

-            ImageList_SetDragCursorImage((HIMAGELIST) m_hCursorImageList, cursorIndex, m_cursorHotspot.x, m_cursorHotspot.y);
+            ImageList_SetDragCursorImage((HIMAGELIST) m_hCursorImageList, cursorIndex, curHotSpot.x, curHotSpot.y);

         }
 #endif
     }
 
         }
 #endif
     }
 

-    m_window = window;
-

 #if !wxUSE_SIMPLER_DRAGIMAGE
     if (m_cursor.Ok())
         ::ShowCursor(FALSE);
 #endif
 
 #if !wxUSE_SIMPLER_DRAGIMAGE
     if (m_cursor.Ok())
         ::ShowCursor(FALSE);
 #endif
 

+    m_window = window;
+

     ::SetCapture(GetHwndOf(window));
 
     return TRUE;
     ::SetCapture(GetHwndOf(window));
 
     return TRUE;


@@ -376,6 +392,10 @@ bool wxDragImage::Move(const wxPoint& pt)
         // Subtract the (negative) values, i.e. add a small increment
         pt2.x -= rect.left; pt2.y -= rect.top;
     }
         // Subtract the (negative) values, i.e. add a small increment
         pt2.x -= rect.left; pt2.y -= rect.top;
     }

+    else if (m_window && m_fullScreen)
+    {
+        pt2 = m_window->ClientToScreen(pt2);
+    }

 
     bool ret = (ImageList_DragMove( pt2.x, pt2.y ) != 0);
 
 
     bool ret = (ImageList_DragMove( pt2.x, pt2.y ) != 0);