X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68be9f090f422450d333385cf62c9b4d350674be..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/msw/dragimag.cpp diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index b5aca15c51..ababd9e7cd 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,7 +51,7 @@ #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 #endif @@ -78,14 +80,18 @@ wxDragImage::~wxDragImage() { if ( m_hImageList ) ImageList_Destroy(GetHimageList()); +#if !wxUSE_SIMPLER_DRAGIMAGE if ( m_hCursorImageList ) ImageList_Destroy((HIMAGELIST) m_hCursorImageList); +#endif } void wxDragImage::Init() { m_hImageList = 0; +#if !wxUSE_SIMPLER_DRAGIMAGE m_hCursorImageList = 0; +#endif m_window = (wxWindow*) NULL; m_fullScreen = FALSE; } @@ -98,7 +104,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& hotspot) +bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor) { if ( m_hImageList ) ImageList_Destroy(GetHimageList()); @@ -142,13 +148,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_hotspot = hotspot; return (index != -1) ; } // Create a drag image from an icon and optional cursor -bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& hotspot) +bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor) { if ( m_hImageList ) ImageList_Destroy(GetHimageList()); @@ -180,15 +185,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_hotspot = hotspot; return (index != -1) ; } // Create a drag image from a string and optional cursor -bool wxDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPoint& hotspot) +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,7 +226,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPo image.SetMaskColour(255, 255, 255); bitmap = image.ConvertToBitmap(); - return Create(bitmap, cursor, hotspot); + return Create(bitmap, cursor); } // Create a drag image for the given tree control item @@ -266,6 +270,10 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS if (m_cursor.Ok()) { +#if wxUSE_SIMPLER_DRAGIMAGE + m_oldCursor = window->GetCursor(); + window->SetCursor(m_cursor); +#else if (!m_hCursorImageList) { int cxCursor = GetSystemMetrics(SM_CXCURSOR); @@ -274,6 +282,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); @@ -282,12 +308,17 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS if (cursorIndex != -1) { - ImageList_SetDragCursorImage((HIMAGELIST) m_hCursorImageList, cursorIndex, m_hotspot.x, m_hotspot.y); + ImageList_SetDragCursorImage((HIMAGELIST) m_hCursorImageList, cursorIndex, curHotSpot.x, curHotSpot.y); } +#endif } +#if !wxUSE_SIMPLER_DRAGIMAGE + if (m_cursor.Ok()) + ::ShowCursor(FALSE); +#endif + m_window = window; - ::ShowCursor(FALSE); ::SetCapture(GetHwndOf(window)); @@ -324,10 +355,16 @@ bool wxDragImage::EndDrag() if ( !::ReleaseCapture() ) { - wxLogLastError("ReleaseCapture"); + wxLogLastError(wxT("ReleaseCapture")); } +#if wxUSE_SIMPLER_DRAGIMAGE + if (m_cursor.Ok() && m_oldCursor.Ok()) + m_window->SetCursor(m_oldCursor); +#else ::ShowCursor(TRUE); +#endif + m_window = (wxWindow*) NULL; return TRUE; @@ -339,10 +376,32 @@ bool wxDragImage::Move(const wxPoint& pt) { wxASSERT_MSG( (m_hImageList != 0), wxT("Image list must not be null in Move.")); - // TODO: what coordinates are these in: window, client, or screen? - bool ret = (ImageList_DragMove( pt.x, pt.y ) != 0); + // These are in window, not client coordinates. + // So need to convert to client coordinates. + wxPoint pt2(pt); + if (m_window && !m_fullScreen) + { + RECT rect; + rect.left = 0; rect.top = 0; + rect.right = 0; rect.bottom = 0; + DWORD style = ::GetWindowLong((HWND) m_window->GetHWND(), GWL_STYLE); +#ifdef __WIN32__ + DWORD exStyle = ::GetWindowLong((HWND) m_window->GetHWND(), GWL_EXSTYLE); + ::AdjustWindowRectEx(& rect, style, FALSE, exStyle); +#else + ::AdjustWindowRect(& rect, style, FALSE); +#endif + // 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; } @@ -376,3 +435,4 @@ bool wxDragImage::Hide() #endif // __WIN95__ +#endif // wxUSE_DRAGIMAGE