Added tooltips to the buttons in the wxEditableListBox

[wxWidgets.git] / contrib / src / xrc / xh_toolb.cpp

diff --git a/contrib/src/xrc/xh_toolb.cpp b/contrib/src/xrc/xh_toolb.cpp
index e8c125341f2de6a2b7bee81cf31ba778413b0d35..3cddf6f6b271a348eb825728a3da50122982fc65 100644 (file)
--- a/contrib/src/xrc/xh_toolb.cpp
+++ b/contrib/src/xrc/xh_toolb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_toolb.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_toolb.cpp

-// Purpose:     XML resource for wxBoxSizer
+// Purpose:     XRC resource for wxBoxSizer

 // Author:      Vaclav Slavik
 // Created:     2000/08/11
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     2000/08/11
 // RCS-ID:      $Id$


@@ -40,7 +40,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
 { 
     if (m_class == wxT("tool"))
     {
 { 
     if (m_class == wxT("tool"))
     {

-        wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XML resource: tool not within a toolbar!"));
+        wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: tool not within a toolbar!"));

         m_toolbar->AddTool(GetID(),
                            GetBitmap(wxT("bitmap")),
                            GetBitmap(wxT("bitmap2")),
         m_toolbar->AddTool(GetID(),
                            GetBitmap(wxT("bitmap")),
                            GetBitmap(wxT("bitmap2")),


@@ -55,7 +55,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
     
     else if (m_class == wxT("separator"))
     {
     
     else if (m_class == wxT("separator"))
     {

-        wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XML resource: separator not within a toolbar!"));
+        wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: separator not within a toolbar!"));

         m_toolbar->AddSeparator();
         return m_toolbar; // must return non-NULL
     }
         m_toolbar->AddSeparator();
         return m_toolbar; // must return non-NULL
     }


@@ -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);
             }