From d6a3ec35c891f8b05099ec194b5ed4a6697dfb51 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Wed, 14 Jan 2009 16:10:02 +0000 Subject: [PATCH] don't crash if an item has a NULL ID git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/dataview/dataview.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index fe45436b30..239ca116fb 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -331,7 +331,7 @@ public: MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); // "MyMusic" also has no parent - if (node == m_root) + if (node == m_root || node == NULL) return wxDataViewItem(0); return wxDataViewItem( (void*) node->GetParent() ); @@ -409,7 +409,7 @@ public: memcpy( dest, buffer, strlen(buffer)+1 ); return true; } - + wxDataViewItem GetNinthItem() { return wxDataViewItem( m_ninth ); @@ -819,7 +819,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int SetMenuBar(menu_bar); CreateStatusBar(); - + wxPanel *panel = new wxPanel( this, -1 ); wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); @@ -1026,7 +1026,7 @@ void MyFrame::OnActivated( wxDataViewEvent &event ) wxString title = m_music_model->GetTitle( event.GetItem() ); wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s"), title ); - + if (m_musicCtrl->IsExpanded( event.GetItem() )) wxLogMessage(wxT("Item: %s is expanded"), title ); } -- 2.45.2