From c0a2b7180ed91d89b785d4a0269e698fffa7c532 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 8 Nov 2012 17:47:16 +0000 Subject: [PATCH] don't assign NULL to wxUIntPtr, wxUIntPtr is not a pointer, closes #14811 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dataview.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wx/dataview.h b/include/wx/dataview.h index f393e0384f..dbef9d872a 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -939,7 +939,7 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&); class WXDLLIMPEXP_ADV wxDataViewListStoreLine { public: - wxDataViewListStoreLine( wxUIntPtr data = NULL ) + wxDataViewListStoreLine( wxUIntPtr data = 0 ) { m_data = data; } @@ -966,9 +966,9 @@ public: void InsertColumn( unsigned int pos, const wxString &varianttype ); void AppendColumn( const wxString &varianttype ); - void AppendItem( const wxVector &values, wxUIntPtr data = NULL ); - void PrependItem( const wxVector &values, wxUIntPtr data = NULL ); - void InsertItem( unsigned int row, const wxVector &values, wxUIntPtr data = NULL ); + void AppendItem( const wxVector &values, wxUIntPtr data = 0 ); + void PrependItem( const wxVector &values, wxUIntPtr data = 0 ); + void InsertItem( unsigned int row, const wxVector &values, wxUIntPtr data = 0 ); void DeleteItem( unsigned int pos ); void DeleteAllItems(); @@ -1053,11 +1053,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE ); - void AppendItem( const wxVector &values, wxUIntPtr data = NULL ) + void AppendItem( const wxVector &values, wxUIntPtr data = 0 ) { GetStore()->AppendItem( values, data ); } - void PrependItem( const wxVector &values, wxUIntPtr data = NULL ) + void PrependItem( const wxVector &values, wxUIntPtr data = 0 ) { GetStore()->PrependItem( values, data ); } - void InsertItem( unsigned int row, const wxVector &values, wxUIntPtr data = NULL ) + void InsertItem( unsigned int row, const wxVector &values, wxUIntPtr data = 0 ) { GetStore()->InsertItem( row, values, data ); } void DeleteItem( unsigned row ) { GetStore()->DeleteItem( row ); } -- 2.45.2