Added alpha blending in prep for FreeType text to canvas.

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

diff --git a/contrib/src/xml/xh_toolb.cpp b/contrib/src/xml/xh_toolb.cpp
index d4c2887621f29e2b9579488db825ad196fc68f6a..927642e64155b3cda0f26dc2d9d0bbe042b9b500 100644 (file)
--- a/contrib/src/xml/xh_toolb.cpp
+++ b/contrib/src/xml/xh_toolb.cpp
@@ -41,7 +41,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
     if (m_Node->GetName() == _T("tool"))
     {
         wxCHECK_MSG(m_Toolbar, NULL, _T("Incorrect syntax of XML resource: tool not within a toolbar!"));
-        m_Toolbar->AddTool(GetID(), 
+        m_Toolbar->AddTool(GetID(),
                            GetBitmap(_T("bitmap")),
                            GetBitmap(_T("bitmap2")),
                            GetBool(_T("toggle")),
@@ -62,12 +62,16 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
     
     else /*<toolbar>*/
     {
+        int style = GetStyle(_T("style"), wxNO_BORDER | wxTB_HORIZONTAL);
+#ifdef __WXMSW__
+        if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
+#endif
         wxToolBar *toolbar = new wxToolBar(m_ParentAsWindow,
-                                           GetID(),
-                                           GetPosition(),
-                                           GetSize(),
-                                           GetStyle(),
-                                           GetName());
+                                    GetID(),
+                                    GetPosition(),
+                                    GetSize(),
+                                    style,
+                                    GetName());
 
         wxSize bmpsize = GetSize(_T("bitmapsize"));
         if (!(bmpsize == wxDefaultSize))
@@ -82,7 +86,6 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
         if (separation != -1)
             toolbar->SetToolSeparation(separation);
 
-
         wxXmlNode *children_node = GetParamNode(_T("children"));
         if (children_node == NULL) return toolbar;