X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ea5c52d2931b2ea24962a6c3e4d0033e3c43eda..23d2edff3505385801313910ece449bdb959f0f1:/src/msw/dragimag.cpp

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index acffef371a..ae349c83fd 100644
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -23,12 +23,13 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include "wx/msw/private.h"
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
+#if wxUSE_DRAGIMAGE
+
 #if defined(__WIN95__)
 
 #ifndef WX_PRECOMP
@@ -41,6 +42,7 @@
 #include "wx/settings.h"
 #endif
 
+#include "wx/msw/private.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/frame.h"
@@ -49,10 +51,16 @@
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
 #include <commctrl.h>
 #endif
 
+// Wine doesn't have this yet
+#ifndef ListView_CreateDragImage
+#define ListView_CreateDragImage(hwnd, i, lpptUpLeft) \
+    (HIMAGELIST)SNDMSG((hwnd), LVM_CREATEDRAGIMAGE, (WPARAM)(int)(i), (LPARAM)(LPPOINT)(lpptUpLeft))
+#endif
+
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
@@ -102,7 +110,7 @@ void wxDragImage::Init()
 ////////////////////////////////////////////////////////////////////////////
 
 // 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());
@@ -121,8 +129,12 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor, const wx
         flags = ILC_COLOR32;
 
     bool mask = (image.GetMask() != 0);
-    if ( mask )
-        flags |= ILC_MASK;
+
+    // Curiously, even if the image doesn't have a mask,
+    // we still have to use ILC_MASK or the image won't show
+    // up when dragged.
+//    if ( mask )
+    flags |= ILC_MASK;
 
     m_hImageList = (WXHIMAGELIST) ImageList_Create(image.GetWidth(), image.GetHeight(), flags, 1, 1);
 
@@ -146,13 +158,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.
-    m_cursorHotspot = cursorHotspot;
 
     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());
@@ -184,15 +195,14 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPo
     }
 
     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
-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::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     long w, h;
     wxScreenDC dc;
@@ -222,11 +232,9 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPo
     dc2.SelectObject(wxNullBitmap);
 
     // Make the bitmap masked
-    wxImage image(bitmap);
+    wxImage image = bitmap.ConvertToImage();
     image.SetMaskColour(255, 255, 255);
-    bitmap = image.ConvertToBitmap();
-
-    return Create(bitmap, cursor, cursorHotspot);
+    return Create(wxBitmap(image), cursor);
 }
 
 // Create a drag image for the given tree control item
@@ -282,6 +290,24 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
             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);
@@ -290,18 +316,18 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
 
         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
     }
 
-    m_window = window;
-
 #if !wxUSE_SIMPLER_DRAGIMAGE
     if (m_cursor.Ok())
         ::ShowCursor(FALSE);
 #endif
 
+    m_window = window;
+
     ::SetCapture(GetHwndOf(window));
 
     return TRUE;
@@ -361,7 +387,7 @@ bool wxDragImage::Move(const wxPoint& pt)
     // These are in window, not client coordinates.
     // So need to convert to client coordinates.
     wxPoint pt2(pt);
-    if (m_window)
+    if (m_window && !m_fullScreen)
     {
         RECT rect;
         rect.left = 0; rect.top = 0;
@@ -376,10 +402,14 @@ bool wxDragImage::Move(const wxPoint& pt)
         // 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);
 
-    m_position = pt;
+    m_position = pt2;
 
     return ret;
 }
@@ -413,3 +443,4 @@ bool wxDragImage::Hide()
 #endif
     // __WIN95__
 
+#endif // wxUSE_DRAGIMAGE