From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 18 Jun 2003 16:17:54 +0000 (+0000)
Subject: make it possible to not attach toolbars to frames (John Anderson)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/017b6a0d408341c918859e88dd1f5882642d7df0

make it possible to not attach toolbars to frames (John Anderson)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/contrib/src/xrc/xh_toolb.cpp b/contrib/src/xrc/xh_toolb.cpp
index 4e472a3dc9..40fc9246df 100644
--- a/contrib/src/xrc/xh_toolb.cpp
+++ b/contrib/src/xrc/xh_toolb.cpp
@@ -148,8 +148,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
 
         toolbar->Realize();
 
-        // FIXME: how can I create a toolbar without immediately setting it to the frame?
-        if (m_parentAsWindow)
+        if (m_parentAsWindow && !GetBool(wxT("dontattachtoframe")))
         {
             wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
             if (parentFrame)
diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 4e472a3dc9..40fc9246df 100644
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -148,8 +148,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
 
         toolbar->Realize();
 
-        // FIXME: how can I create a toolbar without immediately setting it to the frame?
-        if (m_parentAsWindow)
+        if (m_parentAsWindow && !GetBool(wxT("dontattachtoframe")))
         {
             wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
             if (parentFrame)