From 4c5fc80a69d7b8520ade203ede0e0c938e687621 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 31 May 2012 16:29:30 +0000 Subject: [PATCH] silence warning about converting NULL to wxUIntPtr git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/datavcmn.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(NULL); return line->GetData(); } -- 2.45.2