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

Use wxCHECK_MSG() instead of wxLogError in wxDataViewTreeStore

Browse Source 
This is a check for a programming error and should never be shown to the
user, so assert that the items being compared in wxDataViewTreeStore are
under the same parent instead of using wxLogError.
This commit is contained in:
Vadim Zeitlin
2018-02-03 20:19:14 +01:00
parent bb0a2952b1
commit 342388a456
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/datavcmn.cpp
View File

@@ -2770,16 +2770,11 @@ int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewI
if (!node1 || !node2)
return 0;
wxDataViewTreeStoreContainerNode* parent1 =
wxDataViewTreeStoreContainerNode* const parent =
(wxDataViewTreeStoreContainerNode*) node1->GetParent();
wxDataViewTreeStoreContainerNode* parent2 =
(wxDataViewTreeStoreContainerNode*) node2->GetParent();
if (parent1 != parent2)
{
wxLogError( wxT("Comparing items with different parent.") );
return 0;
}
wxCHECK_MSG( node2->GetParent() == parent, 0
wxS("Comparing items with different parent.") );
if (node1->IsContainer() && !node2->IsContainer())
return -1;