#if wxUSE_DRAGIMAGE
#ifndef WX_PRECOMP
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include <stdio.h>
#include "wx/window.h"
#include "wx/dcclient.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/frame.h"
-#include "wx/image.h"
#include "wx/msw/dragimag.h"
#include "wx/msw/private.h"
#include "wx/msw/wince/missing.h"
#endif // __WXWINCE__
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
// Wine doesn't have this yet
#ifndef ListView_CreateDragImage
#define ListView_CreateDragImage(hwnd, i, lpptUpLeft) \
#if !wxUSE_SIMPLER_DRAGIMAGE
m_hCursorImageList = 0;
#endif
- m_window = (wxWindow*) NULL;
+ m_window = NULL;
m_fullScreen = false;
}
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);
{
wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- long w = 0, h = 0;
+ wxCoord w = 0, h = 0;
wxScreenDC dc;
dc.SetFont(font);
dc.GetTextExtent(str, & w, & h);
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);
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
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
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();
}
#if !wxUSE_SIMPLER_DRAGIMAGE
- if (m_cursor.Ok())
+ if (m_cursor.IsOk())
::ShowCursor(FALSE);
#endif
}
#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;
}