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

diff --git a/contrib/src/xrc/xh_toolb.cpp b/contrib/src/xrc/xh_toolb.cpp
index e8c125341f2de6a2b7bee81cf31ba778413b0d35..c86e521763025fd608b92cb13610b5247d120644 100644 (file)
--- 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);
             {
                 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);
             }
                     control != NULL)
                     toolbar->AddControl(control);
             }

diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index e8c125341f2de6a2b7bee81cf31ba778413b0d35..c86e521763025fd608b92cb13610b5247d120644 100644 (file)
--- 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);
             {
                 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);
             }
                     control != NULL)
                     toolbar->AddControl(control);
             }