X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa2d25a57aa4ae113e369ea8e08e5da4888e1b66..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/dragimag.cpp?ds=sidebyside diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index bff7fab265..de1e7b088e 100644 --- a/src/msw/dragimag.cpp +++ b/src/msw/dragimag.cpp @@ -17,18 +17,19 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dragimag.h" #endif // 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(__CYGWIN10__)) #include #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 // ---------------------------------------------------------------------------- @@ -109,6 +117,9 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor) m_hImageList = 0; UINT flags = 0 ; +#ifdef __WXWINCE__ + flags = ILC_COLOR; +#else if (image.GetDepth() <= 4) flags = ILC_COLOR4; else if (image.GetDepth() <= 8) @@ -119,10 +130,15 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor) flags = ILC_COLOR24; else flags = ILC_COLOR32; +#endif 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); @@ -158,6 +174,9 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor) m_hImageList = 0; UINT flags = 0 ; +#ifdef __WXWINCE__ + flags = ILC_COLOR; +#else if (image.GetDepth() <= 4) flags = ILC_COLOR4; else if (image.GetDepth() <= 8) @@ -168,6 +187,7 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor) flags = ILC_COLOR24; else flags = ILC_COLOR32; +#endif bool mask = TRUE; if ( mask ) flags |= ILC_MASK; @@ -190,7 +210,7 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor) // Create a drag image from a string and optional cursor 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; @@ -220,22 +240,24 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor) 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); + return Create(wxBitmap(image), cursor); } +#if wxUSE_TREECTRL // Create a drag image for the given tree control item bool wxDragImage::Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id) { if ( m_hImageList ) ImageList_Destroy(GetHimageList()); - m_hImageList = (WXHIMAGELIST) TreeView_CreateDragImage((HWND) treeCtrl.GetHWND(), (HTREEITEM) (WXHTREEITEM) id); - return TRUE; + m_hImageList = (WXHIMAGELIST) + TreeView_CreateDragImage(GetHwndOf(&treeCtrl), (HTREEITEM) id.m_pItem); + return m_hImageList != 0; } +#endif +#if wxUSE_LISTCTRL // Create a drag image for the given list control item bool wxDragImage::Create(const wxListCtrl& listCtrl, long id) { @@ -246,6 +268,7 @@ bool wxDragImage::Create(const wxListCtrl& listCtrl, long id) m_hImageList = (WXHIMAGELIST) ListView_CreateDragImage((HWND) listCtrl.GetHWND(), id, & pt); return TRUE; } +#endif // Begin drag bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen, wxRect* rect) @@ -258,7 +281,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); - //bool ret = (ImageList_BeginDrag(GetHimageList(), 0, 0, 0) != 0); if (!ret) { @@ -284,6 +306,9 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS // 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) @@ -292,9 +317,9 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS 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(); @@ -431,3 +456,4 @@ bool wxDragImage::Hide() #endif // __WIN95__ +#endif // wxUSE_DRAGIMAGE