From: Paul Cornett <paulcor@bullseye.com>
Date: Thu, 31 May 2012 16:29:30 +0000 (+0000)
Subject: silence warning about converting NULL to wxUIntPtr
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4c5fc80a69d7b8520ade203ede0e0c938e687621

silence warning about converting NULL to wxUIntPtr

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 1ac5c1d16f..1dcf8a1005 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -1777,7 +1777,7 @@ void wxDataViewListStore::SetItemData( const wxDataViewItem& item, wxUIntPtr dat
 wxUIntPtr wxDataViewListStore::GetItemData( const wxDataViewItem& item ) const
 {
     wxDataViewListStoreLine* line = m_data[wxPtrToUInt( item.GetID() ) - 1];
-    if (!line) return NULL;
+    if (!line) return static_cast<wxUIntPtr>(NULL);
 
     return line->GetData();
 }