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

initialize wxDocChildFrameAnyBase before creating the real window to ensure that event handling is set up properly before the first events for the new window are received (closes #10825)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-05-22 22:46:18 +00:00
parent ec86c7ce41
commit e5033ed2f1
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/docview.h
View File

@@ -521,7 +521,12 @@ class WXDLLIMPEXP_CORE wxDocChildFrameAnyBase
{ {
public: public:
// default ctor, use Create() after it // default ctor, use Create() after it
wxDocChildFrameAnyBase() { m_win = NULL; } wxDocChildFrameAnyBase()
{
m_childDocument = NULL;
m_childView = NULL;
m_win = NULL;
}
// full ctor equivalent to using the default one and Create(0 // full ctor equivalent to using the default one and Create(0
wxDocChildFrameAnyBase(wxDocument *doc, wxView *view, wxWindow *win) wxDocChildFrameAnyBase(wxDocument *doc, wxView *view, wxWindow *win)
@@ -631,10 +636,10 @@ public:
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr) const wxString& name = wxFrameNameStr)
{ {
if ( !BaseClass::Create(parent, id, title, pos, size, style, name) ) if ( !wxDocChildFrameAnyBase::Create(doc, view, this) )
return false; return false;
if ( !wxDocChildFrameAnyBase::Create(doc, view, this) ) if ( !BaseClass::Create(parent, id, title, pos, size, style, name) )
return false; return false;
this->Connect(wxEVT_ACTIVATE, this->Connect(wxEVT_ACTIVATE,