check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 83b7a6758460b3c89ae9d65ba51159731bc231fe..7e78d22156bbb41661c4f75597740613b6f894b6 100644 (file)
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -40,6 +40,12 @@ wxToolBarXmlHandler::wxToolBarXmlHandler()
     XRC_ADD_STYLE(wxTB_NOALIGN);
     XRC_ADD_STYLE(wxTB_HORZ_LAYOUT);
     XRC_ADD_STYLE(wxTB_HORZ_TEXT);
     XRC_ADD_STYLE(wxTB_NOALIGN);
     XRC_ADD_STYLE(wxTB_HORZ_LAYOUT);
     XRC_ADD_STYLE(wxTB_HORZ_TEXT);

+
+    XRC_ADD_STYLE(wxTB_TOP);
+    XRC_ADD_STYLE(wxTB_LEFT);
+    XRC_ADD_STYLE(wxTB_RIGHT);
+    XRC_ADD_STYLE(wxTB_BOTTOM);
+

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 


@@ -69,7 +75,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
             if (GetBool(wxT("toggle")))
             {
                 wxASSERT_MSG( kind == wxITEM_NORMAL,
             if (GetBool(wxT("toggle")))
             {
                 wxASSERT_MSG( kind == wxITEM_NORMAL,

-                              _T("can't have both toggleable and radion button at once") );
+                              _T("can't have both toggle and radio button at once") );

                 kind = wxITEM_CHECK;
             }
             m_toolbar->AddTool(GetID(),
                 kind = wxITEM_CHECK;
             }
             m_toolbar->AddTool(GetID(),