From a42aa5d7be12e5bb24aa0488892574c01cae5a5b Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 25 Aug 2001 19:51:55 +0000 Subject: [PATCH] fixed a canonical example of Stupid Bug(tm) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xh_toolb.cpp | 4 ++-- src/xrc/xh_toolb.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/src/xrc/xh_toolb.cpp b/contrib/src/xrc/xh_toolb.cpp index e8c125341f..c86e521763 100644 --- a/contrib/src/xrc/xh_toolb.cpp +++ b/contrib/src/xrc/xh_toolb.cpp @@ -101,8 +101,8 @@ wxObject *wxToolBarXmlHandler::DoCreateResource() { wxObject *created = CreateResFromNode(n, toolbar, NULL); wxControl *control = wxDynamicCast(created, wxControl); - if (IsOfClass(n, wxT("tool")) && - IsOfClass(n, wxT("separator")) && + if (!IsOfClass(n, wxT("tool")) && + !IsOfClass(n, wxT("separator")) && control != NULL) toolbar->AddControl(control); } diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp index e8c125341f..c86e521763 100644 --- a/src/xrc/xh_toolb.cpp +++ b/src/xrc/xh_toolb.cpp @@ -101,8 +101,8 @@ wxObject *wxToolBarXmlHandler::DoCreateResource() { wxObject *created = CreateResFromNode(n, toolbar, NULL); wxControl *control = wxDynamicCast(created, wxControl); - if (IsOfClass(n, wxT("tool")) && - IsOfClass(n, wxT("separator")) && + if (!IsOfClass(n, wxT("tool")) && + !IsOfClass(n, wxT("separator")) && control != NULL) toolbar->AddControl(control); } -- 2.45.2