Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call Realize() later in XRC toolbar handler (patch #13888).

Browse Source 
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
This commit is contained in:
Václav Slavík
2012-07-20 20:23:45 +00:00
parent 1582a1db62
commit 5c413e62cf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xrc/xh_toolb.cpp
View File

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