don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -69,13 +69,13 @@ void wxGenericDragImage::Init()
|
||||
{
|
||||
m_isDirty = false;
|
||||
m_isShown = false;
|
||||
m_windowDC = (wxDC*) NULL;
|
||||
m_window = (wxWindow*) NULL;
|
||||
m_windowDC = NULL;
|
||||
m_window = NULL;
|
||||
m_fullScreen = false;
|
||||
#ifdef wxHAS_NATIVE_OVERLAY
|
||||
m_dcOverlay = NULL;
|
||||
#else
|
||||
m_pBackingBitmap = (wxBitmap*) NULL;
|
||||
m_pBackingBitmap = NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -359,7 +359,7 @@ bool wxGenericDragImage::EndDrag()
|
||||
m_windowDC->DestroyClippingRegion();
|
||||
#endif
|
||||
delete m_windowDC;
|
||||
m_windowDC = (wxDC*) NULL;
|
||||
m_windowDC = NULL;
|
||||
}
|
||||
|
||||
#ifndef wxHAS_NATIVE_OVERLAY
|
||||
@@ -373,7 +373,7 @@ bool wxGenericDragImage::EndDrag()
|
||||
// is non-NULL, or in screen coordinates if NULL.
|
||||
bool wxGenericDragImage::Move(const wxPoint& pt)
|
||||
{
|
||||
wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Move()") );
|
||||
wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Move()") );
|
||||
|
||||
wxPoint pt2(pt);
|
||||
if (m_fullScreen)
|
||||
@@ -397,7 +397,7 @@ bool wxGenericDragImage::Move(const wxPoint& pt)
|
||||
|
||||
bool wxGenericDragImage::Show()
|
||||
{
|
||||
wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Show()") );
|
||||
wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Show()") );
|
||||
|
||||
// Show at the current position
|
||||
|
||||
@@ -435,7 +435,7 @@ bool wxGenericDragImage::UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& des
|
||||
|
||||
bool wxGenericDragImage::Hide()
|
||||
{
|
||||
wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Hide()") );
|
||||
wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Hide()") );
|
||||
|
||||
// Repair the old position
|
||||
|
||||
|
Reference in New Issue
Block a user