X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..023fff9ae0d4b7ace23fc5c070576c240a9f6915:/contrib/src/xrc/xh_toolb.cpp

diff --git a/contrib/src/xrc/xh_toolb.cpp b/contrib/src/xrc/xh_toolb.cpp
index 526a3a9377..6fe844c348 100644
--- a/contrib/src/xrc/xh_toolb.cpp
+++ b/contrib/src/xrc/xh_toolb.cpp
@@ -28,22 +28,20 @@
 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(),
-                           GetBitmap(wxT("bitmap")),
-                           GetBitmap(wxT("bitmap2")),
+                           GetBitmap(wxT("bitmap"), wxART_TOOLBAR),
+                           GetBitmap(wxT("bitmap2"), wxART_TOOLBAR),
                            GetBool(wxT("toggle")),
                            GetPosition().x,
                            GetPosition().y,
@@ -67,10 +65,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
         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(),
@@ -135,8 +130,6 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
     }
 }
 
-
-
 bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
 {
     return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) ||