More asserts and stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
b6caf397b3
commit
23aa4f09d2
@ -172,11 +172,11 @@ bool wxDragImage::Create(const wxListCtrl& listCtrl, long id)
|
|||||||
// Begin drag
|
// Begin drag
|
||||||
bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* WXUNUSED(window))
|
bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* WXUNUSED(window))
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( (m_hImageList != 0), "Image list must not be null in BeginDrag.");
|
wxASSERT_MSG( (m_hImageList != 0), _T("Image list must not be null in BeginDrag."));
|
||||||
|
|
||||||
bool ret = (ImageList_BeginDrag((HIMAGELIST) m_hImageList, 0, hotspot.x, hotspot.y) != 0);
|
bool ret = (ImageList_BeginDrag((HIMAGELIST) m_hImageList, 0, hotspot.x, hotspot.y) != 0);
|
||||||
|
|
||||||
wxASSERT_MSG( (ret), "BeginDrag failed.");
|
wxASSERT_MSG( (ret), _T("BeginDrag failed."));
|
||||||
|
|
||||||
if (!ret)
|
if (!ret)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@ -186,7 +186,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* WXUNUSED(window))
|
|||||||
// First add the cursor to the image list
|
// First add the cursor to the image list
|
||||||
int cursorIndex = ImageList_AddIcon((HIMAGELIST) m_hImageList, (HICON) m_cursor.GetHCURSOR());
|
int cursorIndex = ImageList_AddIcon((HIMAGELIST) m_hImageList, (HICON) m_cursor.GetHCURSOR());
|
||||||
|
|
||||||
wxASSERT_MSG( (cursorIndex != -1), "ImageList_AddIcon failed in BeginDrag.");
|
wxASSERT_MSG( (cursorIndex != -1), _T("ImageList_AddIcon failed in BeginDrag."));
|
||||||
|
|
||||||
if (cursorIndex != -1)
|
if (cursorIndex != -1)
|
||||||
{
|
{
|
||||||
@ -202,7 +202,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* WXUNUSED(window))
|
|||||||
// End drag
|
// End drag
|
||||||
bool wxDragImage::EndDrag(wxWindow* WXUNUSED(window))
|
bool wxDragImage::EndDrag(wxWindow* WXUNUSED(window))
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( (m_hImageList != 0), "Image list must not be null in EndDrag.");
|
wxASSERT_MSG( (m_hImageList != 0), _T("Image list must not be null in EndDrag."));
|
||||||
|
|
||||||
ImageList_EndDrag();
|
ImageList_EndDrag();
|
||||||
|
|
||||||
@ -215,7 +215,7 @@ bool wxDragImage::EndDrag(wxWindow* WXUNUSED(window))
|
|||||||
// is non-NULL, or in screen coordinates if NULL.
|
// is non-NULL, or in screen coordinates if NULL.
|
||||||
bool wxDragImage::Move(const wxPoint& pt, wxWindow* window)
|
bool wxDragImage::Move(const wxPoint& pt, wxWindow* window)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( (m_hImageList != 0), "Image list must not be null in Move.");
|
wxASSERT_MSG( (m_hImageList != 0), _T("Image list must not be null in Move."));
|
||||||
|
|
||||||
// TODO: what coordinates are these in: window, client, or screen?
|
// TODO: what coordinates are these in: window, client, or screen?
|
||||||
bool ret = (ImageList_DragMove( pt.x, pt.y ) != 0);
|
bool ret = (ImageList_DragMove( pt.x, pt.y ) != 0);
|
||||||
@ -227,7 +227,7 @@ bool wxDragImage::Move(const wxPoint& pt, wxWindow* window)
|
|||||||
|
|
||||||
bool wxDragImage::Show(wxWindow* window)
|
bool wxDragImage::Show(wxWindow* window)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( (m_hImageList != 0), "Image list must not be null in Show.");
|
wxASSERT_MSG( (m_hImageList != 0), _T("Image list must not be null in Show."));
|
||||||
|
|
||||||
HWND hWnd = 0;
|
HWND hWnd = 0;
|
||||||
if (window)
|
if (window)
|
||||||
@ -240,7 +240,7 @@ bool wxDragImage::Show(wxWindow* window)
|
|||||||
|
|
||||||
bool wxDragImage::Hide(wxWindow* window)
|
bool wxDragImage::Hide(wxWindow* window)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( (m_hImageList != 0), "Image list must not be null in Hide.");
|
wxASSERT_MSG( (m_hImageList != 0), _T("Image list must not be null in Hide."));
|
||||||
|
|
||||||
HWND hWnd = 0;
|
HWND hWnd = 0;
|
||||||
if (window)
|
if (window)
|
||||||
|
Loading…
Reference in New Issue
Block a user