X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3a8b1b68e98ea169e72c97778418440a43f52db..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/msw/dragimag.cpp diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index 4f42ad81d9..7e06613e36 100644 --- a/src/msw/dragimag.cpp +++ b/src/msw/dragimag.cpp @@ -92,7 +92,7 @@ void wxDragImage::Init() #if !wxUSE_SIMPLER_DRAGIMAGE m_hCursorImageList = 0; #endif - m_window = (wxWindow*) NULL; + m_window = NULL; m_fullScreen = false; } @@ -218,7 +218,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); @@ -250,7 +250,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 @@ -261,8 +267,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 @@ -281,12 +296,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(); @@ -337,7 +352,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 @@ -382,13 +397,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; }