]> git.saurik.com Git - wxWidgets.git/commitdiff
Call Realize() later in XRC toolbar handler (patch #13888).
authorVáclav Slavík <vslavik@fastmail.fm>
Fri, 20 Jul 2012 20:23:45 +0000 (20:23 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Fri, 20 Jul 2012 20:23:45 +0000 (20:23 +0000)
This is a workaround for a deeper compatibility problem in Cocoa
implementation (see the bug for detailed discussion), but for now, this
simple workaround is much better than not doing nothing.

See #13888.

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

src/xrc/xh_toolb.cpp

index c6e75a361554b42b62197ee08c4ecbc28cf2ecda..2d262ee9024beb2189c4e8a3f1f684f74dfb468b 100644 (file)
@@ -239,8 +239,6 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
         m_isInside = false;
         m_toolbar = NULL;
 
-        toolbar->Realize();
-
         if (m_parentAsWindow && !GetBool(wxT("dontattachtoframe")))
         {
             wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
@@ -248,6 +246,8 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
                 parentFrame->SetToolBar(toolbar);
         }
 
+        toolbar->Realize();
+
         return toolbar;
     }
 }