Fixed apparent typo in wxGridCellAttr::MergeWith, hopefully fixing

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

diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 526a3a937712b99bad667ad9a60049d16c5a29e0..6fe844c348122b9e4628d5f0777475d8d635d644 100644 (file)
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -28,22 +28,20 @@
 wxToolBarXmlHandler::wxToolBarXmlHandler() 
 : wxXmlResourceHandler(), m_isInside(FALSE), m_toolbar(NULL)
 {
 wxToolBarXmlHandler::wxToolBarXmlHandler() 
 : wxXmlResourceHandler(), m_isInside(FALSE), m_toolbar(NULL)
 {

-    ADD_STYLE(wxTB_FLAT);
-    ADD_STYLE(wxTB_DOCKABLE);
-    ADD_STYLE(wxTB_VERTICAL);
-    ADD_STYLE(wxTB_HORIZONTAL);
+    XRC_ADD_STYLE(wxTB_FLAT);
+    XRC_ADD_STYLE(wxTB_DOCKABLE);
+    XRC_ADD_STYLE(wxTB_VERTICAL);
+    XRC_ADD_STYLE(wxTB_HORIZONTAL);

 }
 
 }
 

-
-

 wxObject *wxToolBarXmlHandler::DoCreateResource()
 { 
     if (m_class == wxT("tool"))
     {
         wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: tool not within a toolbar!"));
         m_toolbar->AddTool(GetID(),
 wxObject *wxToolBarXmlHandler::DoCreateResource()
 { 
     if (m_class == wxT("tool"))
     {
         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")),
+                           GetBitmap(wxT("bitmap"), wxART_TOOLBAR),
+                           GetBitmap(wxT("bitmap2"), wxART_TOOLBAR),

                            GetBool(wxT("toggle")),
                            GetPosition().x,
                            GetPosition().y,
                            GetBool(wxT("toggle")),
                            GetPosition().x,
                            GetPosition().y,


@@ -67,10 +65,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
         if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
 #endif
 
         if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
 #endif
 

-        wxToolBar *toolbar = wxStaticCast(m_instance, wxToolBar);
- 
-        if ( !toolbar )
-            toolbar = new wxToolBar;
+        XRC_MAKE_INSTANCE(toolbar, wxToolBar)

  
         toolbar->Create(m_parentAsWindow,
                          GetID(),
  
         toolbar->Create(m_parentAsWindow,
                          GetID(),


@@ -135,8 +130,6 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
     }
 }
 
     }
 }
 

-
-

 bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
 {
     return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) ||
 bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
 {
     return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) ||