Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't assign NULL to wxUIntPtr, wxUIntPtr is not a pointer, closes #14811

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-11-08 17:47:16 +00:00
parent 5e1f70e13f
commit c0a2b7180e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/dataview.h
View File

@@ -939,7 +939,7 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
class WXDLLIMPEXP_ADV wxDataViewListStoreLine class WXDLLIMPEXP_ADV wxDataViewListStoreLine
{ {
public: public:
wxDataViewListStoreLine( wxUIntPtr data = NULL ) wxDataViewListStoreLine( wxUIntPtr data = 0 )
{ {
m_data = data; m_data = data;
} }
@@ -966,9 +966,9 @@ public:
void InsertColumn( unsigned int pos, const wxString &varianttype ); void InsertColumn( unsigned int pos, const wxString &varianttype );
void AppendColumn( const wxString &varianttype ); void AppendColumn( const wxString &varianttype );
void AppendItem( const wxVector<wxVariant> &values, wxUIntPtr data = NULL ); void AppendItem( const wxVector<wxVariant> &values, wxUIntPtr data = 0 );
void PrependItem( const wxVector<wxVariant> &values, wxUIntPtr data = NULL ); void PrependItem( const wxVector<wxVariant> &values, wxUIntPtr data = 0 );
void InsertItem( unsigned int row, const wxVector<wxVariant> &values, wxUIntPtr data = NULL ); void InsertItem( unsigned int row, const wxVector<wxVariant> &values, wxUIntPtr data = 0 );
void DeleteItem( unsigned int pos ); void DeleteItem( unsigned int pos );
void DeleteAllItems(); void DeleteAllItems();
@@ -1053,11 +1053,11 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE ); int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE );
void AppendItem( const wxVector<wxVariant> &values, wxUIntPtr data = NULL ) void AppendItem( const wxVector<wxVariant> &values, wxUIntPtr data = 0 )
{ GetStore()->AppendItem( values, data ); } { GetStore()->AppendItem( values, data ); }
void PrependItem( const wxVector<wxVariant> &values, wxUIntPtr data = NULL ) void PrependItem( const wxVector<wxVariant> &values, wxUIntPtr data = 0 )
{ GetStore()->PrependItem( values, data ); } { GetStore()->PrependItem( values, data ); }
void InsertItem( unsigned int row, const wxVector<wxVariant> &values, wxUIntPtr data = NULL ) void InsertItem( unsigned int row, const wxVector<wxVariant> &values, wxUIntPtr data = 0 )
{ GetStore()->InsertItem( row, values, data ); } { GetStore()->InsertItem( row, values, data ); }
void DeleteItem( unsigned row ) void DeleteItem( unsigned row )
{ GetStore()->DeleteItem( row ); } { GetStore()->DeleteItem( row ); }