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

don't crash if an item has a NULL ID

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-14 16:10:02 +00:00
parent 07a971eeff
commit d6a3ec35c8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/dataview/dataview.cpp
View File

@@ -331,7 +331,7 @@ public:
MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); MyMusicModelNode *node = (MyMusicModelNode*) item.GetID();
// "MyMusic" also has no parent // "MyMusic" also has no parent
if (node == m_root) if (node == m_root || node == NULL)
return wxDataViewItem(0); return wxDataViewItem(0);
return wxDataViewItem( (void*) node->GetParent() ); return wxDataViewItem( (void*) node->GetParent() );
@@ -409,7 +409,7 @@ public:
memcpy( dest, buffer, strlen(buffer)+1 ); memcpy( dest, buffer, strlen(buffer)+1 );
return true; return true;
} }
wxDataViewItem GetNinthItem() wxDataViewItem GetNinthItem()
{ {
return wxDataViewItem( m_ninth ); 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); SetMenuBar(menu_bar);
CreateStatusBar(); CreateStatusBar();
wxPanel *panel = new wxPanel( this, -1 ); wxPanel *panel = new wxPanel( this, -1 );
wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
@@ -1026,7 +1026,7 @@ void MyFrame::OnActivated( wxDataViewEvent &event )
wxString title = m_music_model->GetTitle( event.GetItem() ); wxString title = m_music_model->GetTitle( event.GetItem() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s"), title ); wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s"), title );
if (m_musicCtrl->IsExpanded( event.GetItem() )) if (m_musicCtrl->IsExpanded( event.GetItem() ))
wxLogMessage(wxT("Item: %s is expanded"), title ); wxLogMessage(wxT("Item: %s is expanded"), title );
} }