work around g++ 4.3 warning about possibly ambiguous else

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 9d842d79e3b3b7eb1a672788755e9ae0449ab1aa..68a660db66a03625700ddb9eae08a345aedaed62 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -640,9 +640,7 @@ wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);

-
-    if (iter != NULL)
-        g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0);
+    g_return_val_if_fail ( !iter || wxtree_model->stamp == iter->stamp, 0);

 
     return wxtree_model->internal->iter_n_children( iter );
 }
 
     return wxtree_model->internal->iter_n_children( iter );
 }