X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa8dca8dd1ba0d6ee9b2c5919a3a944ecde68a50..b9a958e66f1feed21c4a0b92b16c6d963198c982:/src/msw/dragimag.cpp diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index fcad2efdfd..9249d8c35c 100644 --- a/src/msw/dragimag.cpp +++ b/src/msw/dragimag.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dragimag.cpp +// Name: src/msw/dragimag.cpp // Purpose: wxDragImage // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ -#pragma implementation "dragimag.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,11 +26,8 @@ #if wxUSE_DRAGIMAGE -#if defined(__WIN95__) - #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/window.h" #include "wx/dcclient.h" #include "wx/dcscreen.h" @@ -51,8 +44,17 @@ #include "wx/msw/dragimag.h" #include "wx/msw/private.h" -#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) -#include +#ifdef __WXWINCE__ // for SM_CXCURSOR and SM_CYCURSOR +#include "wx/msw/wince/missing.h" +#endif // __WXWINCE__ + +// include "properly" +#include "wx/msw/wrapcctl.h" + +// 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 // ---------------------------------------------------------------------------- @@ -93,7 +95,7 @@ void wxDragImage::Init() m_hCursorImageList = 0; #endif m_window = (wxWindow*) NULL; - m_fullScreen = FALSE; + m_fullScreen = false; } // Attributes @@ -110,7 +112,10 @@ bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor) ImageList_Destroy(GetHimageList()); m_hImageList = 0; - UINT flags = 0 ; +#ifdef __WXWINCE__ + UINT flags = ILC_COLOR; +#else + UINT flags wxDUMMY_INITIALIZE(0) ; if (image.GetDepth() <= 4) flags = ILC_COLOR4; else if (image.GetDepth() <= 8) @@ -121,10 +126,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); @@ -159,7 +169,10 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor) ImageList_Destroy(GetHimageList()); m_hImageList = 0; - UINT flags = 0 ; +#ifdef __WXWINCE__ + UINT flags = ILC_COLOR; +#else + UINT flags wxDUMMY_INITIALIZE(0) ; if (image.GetDepth() <= 4) flags = ILC_COLOR4; else if (image.GetDepth() <= 8) @@ -170,7 +183,8 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor) flags = ILC_COLOR24; else flags = ILC_COLOR32; - bool mask = TRUE; +#endif + bool mask = true; if ( mask ) flags |= ILC_MASK; @@ -192,9 +206,9 @@ 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; + long w = 0, h = 0; wxScreenDC dc; dc.SetFont(font); dc.GetTextExtent(str, & w, & h); @@ -221,23 +235,29 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor) dc2.SelectObject(wxNullBitmap); +#if wxUSE_WXDIB // 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); +#else + return false; +#endif } +#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,8 +266,9 @@ bool wxDragImage::Create(const wxListCtrl& listCtrl, long id) POINT pt; pt.x = 0; pt.y = 0; m_hImageList = (WXHIMAGELIST) ListView_CreateDragImage((HWND) listCtrl.GetHWND(), id, & pt); - return TRUE; + return true; } +#endif // Begin drag bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen, wxRect* rect) @@ -265,20 +286,20 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS { wxFAIL_MSG( _T("BeginDrag failed.") ); - return FALSE; + return false; } if (m_cursor.Ok()) { #if wxUSE_SIMPLER_DRAGIMAGE - m_oldCursor = window->GetCursor(); - window->SetCursor(m_cursor); + m_oldCursor = window->GetCursor(); + window->SetCursor(m_cursor); #else if (!m_hCursorImageList) - { - int cxCursor = GetSystemMetrics(SM_CXCURSOR); - int cyCursor = GetSystemMetrics(SM_CYCURSOR); - + { + int cxCursor = ::GetSystemMetrics(SM_CXCURSOR); + int cyCursor = ::GetSystemMetrics(SM_CYCURSOR); + m_hCursorImageList = (WXHIMAGELIST) ImageList_Create(cxCursor, cyCursor, ILC_MASK, 1, 1); } @@ -322,7 +343,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS ::SetCapture(GetHwndOf(window)); - return TRUE; + return true; } // Begin drag. hotspot is the location of the drag position relative to the upper-left @@ -334,7 +355,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow* int x = fullScreenRect->GetPosition().x; int y = fullScreenRect->GetPosition().y; - + wxSize sz = fullScreenRect->GetSize(); if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame))) @@ -343,7 +364,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow* rect.x = x; rect.y = y; rect.width = sz.x; rect.height = sz.y; - return BeginDrag(hotspot, window, TRUE, & rect); + return BeginDrag(hotspot, window, true, & rect); } // End drag @@ -360,14 +381,14 @@ bool wxDragImage::EndDrag() #if wxUSE_SIMPLER_DRAGIMAGE if (m_cursor.Ok() && m_oldCursor.Ok()) - m_window->SetCursor(m_oldCursor); + m_window->SetCursor(m_oldCursor); #else ::ShowCursor(TRUE); #endif m_window = (wxWindow*) NULL; - return TRUE; + return true; } // Move the image: call from OnMouseMove. Pt is in window client coordinates if window @@ -432,7 +453,4 @@ bool wxDragImage::Hide() return ret; } -#endif - // __WIN95__ - #endif // wxUSE_DRAGIMAGE