don't assign the returned value in wxMDIParentFrame::OnCreateClient() to any member variables, this is the job of the caller (according to documentation and wxMSW code) (modified patch 1910602)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -128,11 +128,12 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
|
||||
long style,
|
||||
const wxString& name )
|
||||
{
|
||||
wxFrame::Create( parent, id, title, pos, size, style, name );
|
||||
if ( !wxFrame::Create( parent, id, title, pos, size, style, name ) )
|
||||
return false;
|
||||
|
||||
OnCreateClient();
|
||||
m_clientWindow = OnCreateClient();
|
||||
|
||||
return true;
|
||||
return m_clientWindow != NULL;
|
||||
}
|
||||
|
||||
void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
|
||||
@@ -290,8 +291,7 @@ wxMDIClientWindow *wxMDIParentFrame::GetClientWindow() const
|
||||
|
||||
wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
|
||||
{
|
||||
m_clientWindow = new wxMDIClientWindow( this );
|
||||
return m_clientWindow;
|
||||
return new wxMDIClientWindow( this );
|
||||
}
|
||||
|
||||
void wxMDIParentFrame::ActivateNext()
|
||||
|
||||
Reference in New Issue
Block a user