textctrl.cpp: Removed assert from CanRedo/CanUndo since the best behaviour is
to return FALSE (Redo/Undo functions are unimplemented) treectrlg.cpp: in InsertItem, allow previous item to be null in order to insert at first position of possibly-empty child list dcclient.cpp: allow setting of null font (common espec. on Windows) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1246,9 +1246,13 @@ wxTreeItemId wxGenericTreeCtrl::InsertItem(const wxTreeItemId& parentId,
|
||||
return AddRoot(text, image, selImage, data);
|
||||
}
|
||||
|
||||
int index = parent->GetChildren().Index((wxGenericTreeItem*) idPrevious.m_pItem);
|
||||
wxASSERT_MSG( index != wxNOT_FOUND,
|
||||
wxT("previous item in wxGenericTreeCtrl::InsertItem() is not a sibling") );
|
||||
int index = -1;
|
||||
if (idPrevious.IsOk())
|
||||
{
|
||||
index = parent->GetChildren().Index((wxGenericTreeItem*) idPrevious.m_pItem);
|
||||
wxASSERT_MSG( index != wxNOT_FOUND,
|
||||
wxT("previous item in wxGenericTreeCtrl::InsertItem() is not a sibling") );
|
||||
}
|
||||
|
||||
return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
|
||||
}
|
||||
|
Reference in New Issue
Block a user