X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..404b319a85dadd7decf7a5a5331020520031a41c:/src/msw/dragimag.cpp diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index f604cad75f..067d67608d 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: @@ -21,28 +21,26 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #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" -#include "wx/dcmemory.h" -#include "wx/settings.h" + #include "wx/msw/wrapcctl.h" // include "properly" + #include + #include "wx/window.h" + #include "wx/dcclient.h" + #include "wx/dcscreen.h" + #include "wx/dcmemory.h" + #include "wx/settings.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/image.h" #endif #include "wx/msw/private.h" -#include "wx/log.h" -#include "wx/intl.h" -#include "wx/frame.h" -#include "wx/image.h" #include "wx/msw/dragimag.h" #include "wx/msw/private.h" @@ -51,10 +49,6 @@ #include "wx/msw/wince/missing.h" #endif // __WXWINCE__ -#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) \ @@ -98,10 +92,48 @@ void wxDragImage::Init() #if !wxUSE_SIMPLER_DRAGIMAGE m_hCursorImageList = 0; #endif - m_window = (wxWindow*) NULL; + m_window = NULL; m_fullScreen = false; } +#if WXWIN_COMPATIBILITY_2_8 +wxDragImage::wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + Init(); + + Create(image, cursor); +} + +wxDragImage::wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + Init(); + + Create(image, cursor); +} + +wxDragImage::wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + Init(); + + Create(str, cursor); +} + +bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + return Create(image, cursor); +} + +bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + return Create(image, cursor); +} + +bool wxDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) +{ + return Create(str, cursor); +} +#endif // WXWIN_COMPATIBILITY_2_8 + // Attributes //////////////////////////////////////////////////////////////////////////// @@ -188,9 +220,8 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor) else flags = ILC_COLOR32; #endif - bool mask = true; - if ( mask ) - flags |= ILC_MASK; + + flags |= ILC_MASK; m_hImageList = (WXHIMAGELIST) ImageList_Create(image.GetWidth(), image.GetHeight(), flags, 1, 1); @@ -212,7 +243,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor) { wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - long w, h; + wxCoord w = 0, h = 0; wxScreenDC dc; dc.SetFont(font); dc.GetTextExtent(str, & w, & h); @@ -225,7 +256,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor) dc2.SetBackground(* wxWHITE_BRUSH); dc2.Clear(); - dc2.SetBackgroundMode(wxTRANSPARENT); + dc2.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); dc2.SetTextForeground(* wxLIGHT_GREY); dc2.DrawText(str, 0, 0); dc2.DrawText(str, 1, 0); @@ -239,10 +270,14 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor) dc2.SelectObject(wxNullBitmap); +#if wxUSE_WXDIB // Make the bitmap masked wxImage image = bitmap.ConvertToImage(); image.SetMaskColour(255, 255, 255); return Create(wxBitmap(image), cursor); +#else + return false; +#endif } #if wxUSE_TREECTRL @@ -253,7 +288,13 @@ bool wxDragImage::Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id) ImageList_Destroy(GetHimageList()); m_hImageList = (WXHIMAGELIST) TreeView_CreateDragImage(GetHwndOf(&treeCtrl), (HTREEITEM) id.m_pItem); - return m_hImageList != 0; + if ( !m_hImageList ) + { + // fall back on just the item text if there is no image + return Create(treeCtrl.GetItemText(id)); + } + + return true; } #endif @@ -264,8 +305,17 @@ bool wxDragImage::Create(const wxListCtrl& listCtrl, long id) if ( m_hImageList ) ImageList_Destroy(GetHimageList()); POINT pt; - pt.x = 0; pt.y = 0; - m_hImageList = (WXHIMAGELIST) ListView_CreateDragImage((HWND) listCtrl.GetHWND(), id, & pt); + pt.x = + pt.y = 0; + m_hImageList = (WXHIMAGELIST) + ListView_CreateDragImage(GetHwndOf(&listCtrl), id, &pt); + + if ( !m_hImageList ) + { + // as for wxTreeCtrl, fall back on dragging just the item text + return Create(listCtrl.GetItemText(id)); + } + return true; } #endif @@ -284,12 +334,12 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS if (!ret) { - wxFAIL_MSG( _T("BeginDrag failed.") ); + wxFAIL_MSG( wxT("BeginDrag failed.") ); return false; } - if (m_cursor.Ok()) + if (m_cursor.IsOk()) { #if wxUSE_SIMPLER_DRAGIMAGE m_oldCursor = window->GetCursor(); @@ -297,9 +347,14 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS #else if (!m_hCursorImageList) { +#ifndef SM_CXCURSOR + // Smartphone may not have these metric symbol + int cxCursor = 16; + int cyCursor = 16; +#else int cxCursor = ::GetSystemMetrics(SM_CXCURSOR); int cyCursor = ::GetSystemMetrics(SM_CYCURSOR); - +#endif m_hCursorImageList = (WXHIMAGELIST) ImageList_Create(cxCursor, cyCursor, ILC_MASK, 1, 1); } @@ -335,7 +390,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS } #if !wxUSE_SIMPLER_DRAGIMAGE - if (m_cursor.Ok()) + if (m_cursor.IsOk()) ::ShowCursor(FALSE); #endif @@ -358,7 +413,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow* wxSize sz = fullScreenRect->GetSize(); - if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame))) + if (fullScreenRect->GetParent() && !wxDynamicCast(fullScreenRect, wxFrame)) fullScreenRect->GetParent()->ClientToScreen(& x, & y); rect.x = x; rect.y = y; @@ -380,13 +435,13 @@ bool wxDragImage::EndDrag() } #if wxUSE_SIMPLER_DRAGIMAGE - if (m_cursor.Ok() && m_oldCursor.Ok()) + if (m_cursor.IsOk() && m_oldCursor.IsOk()) m_window->SetCursor(m_oldCursor); #else ::ShowCursor(TRUE); #endif - m_window = (wxWindow*) NULL; + m_window = NULL; return true; } @@ -453,7 +508,4 @@ bool wxDragImage::Hide() return ret; } -#endif - // __WIN95__ - #endif // wxUSE_DRAGIMAGE