// 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
#include "wx/settings.h"
#endif
+#include "wx/msw/private.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/frame.h"
#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
// ----------------------------------------------------------------------------
{
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;
}
////////////////////////////////////////////////////////////////////////////
// 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());
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);
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());
}
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;
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, hotspot);
+ return Create(wxBitmap(image), cursor);
}
// Create a drag image for the given tree control item
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);
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);
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));
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;
{
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;
}
#endif
// __WIN95__
+#endif // wxUSE_DRAGIMAGE
projects / wxWidgets.git / blobdiff