From 6e42617af493da590f7d08ed248be615ab817eee Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 15 Mar 2008 03:12:47 +0000 Subject: [PATCH] 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 --- src/aui/tabmdi.cpp | 11 ++++++----- src/cocoa/mdi.mm | 13 +++++++------ src/generic/mdig.cpp | 12 ++++++------ src/gtk/mdi.cpp | 10 +++++----- src/gtk1/mdi.cpp | 10 +++++----- src/mac/carbon/mdi.cpp | 12 ++++++------ 6 files changed, 35 insertions(+), 33 deletions(-) diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp index ccf9e885f5..f5057af3ba 100644 --- a/src/aui/tabmdi.cpp +++ b/src/aui/tabmdi.cpp @@ -110,9 +110,11 @@ bool wxAuiMDIParentFrame::Create(wxWindow *parent, } #endif // wxUSE_MENUS - wxFrame::Create(parent, id, title, pos, size, style, name); - OnCreateClient(); - return true; + if ( !wxFrame::Create(parent, id, title, pos, size, style, name) ) + return false; + + m_pClientWindow = OnCreateClient(); + return m_pClientWindow != NULL; } @@ -252,8 +254,7 @@ wxAuiMDIClientWindow *wxAuiMDIParentFrame::GetClientWindow() const wxAuiMDIClientWindow *wxAuiMDIParentFrame::OnCreateClient() { - m_pClientWindow = new wxAuiMDIClientWindow( this ); - return m_pClientWindow; + return new wxAuiMDIClientWindow( this ); } void wxAuiMDIParentFrame::ActivateNext() diff --git a/src/cocoa/mdi.mm b/src/cocoa/mdi.mm index a0c8022306..b1aa7c6b26 100644 --- a/src/cocoa/mdi.mm +++ b/src/cocoa/mdi.mm @@ -95,10 +95,12 @@ bool wxMDIParentFrame::Create(wxWindow *parent, const wxPoint& pos, const wxSize& size, long style, const wxString& name) { - bool success = wxFrame::Create(parent,winid,title,pos,size,style,name); - if(success) - OnCreateClient(); - return success; + if ( !wxFrame::Create(parent,winid,title,pos,size,style,name) ) + return false; + + m_clientWindow = OnCreateClient(); + + return m_clientWindow != NULL; } wxMDIParentFrame::~wxMDIParentFrame() @@ -145,8 +147,7 @@ wxMDIClientWindow *wxMDIParentFrame::GetClientWindow() const wxMDIClientWindow *wxMDIParentFrame::OnCreateClient() { - m_clientWindow = new wxMDIClientWindow( this ); - return m_clientWindow; + return new wxMDIClientWindow( this ); } void wxMDIParentFrame::ActivateNext() diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp index a1cdc3b089..d97213d797 100644 --- a/src/generic/mdig.cpp +++ b/src/generic/mdig.cpp @@ -120,11 +120,12 @@ bool wxGenericMDIParentFrame::Create(wxWindow *parent, #endif // wxUSE_MENUS } - wxFrame::Create( parent, id, title, pos, size, style, name ); + if ( !wxFrame::Create( parent, id, title, pos, size, style, name ) ) + return false; - OnCreateClient(); + m_pClientWindow = OnCreateClient(); - return true; + return m_pClientWindow != NULL; } #if wxUSE_MENUS @@ -248,11 +249,10 @@ wxGenericMDIClientWindow *wxGenericMDIParentFrame::GetClientWindow() const wxGenericMDIClientWindow *wxGenericMDIParentFrame::OnCreateClient() { #if wxUSE_GENERIC_MDI_AS_NATIVE - m_pClientWindow = new wxMDIClientWindow( this ); + return new wxMDIClientWindow( this ); #else - m_pClientWindow = new wxGenericMDIClientWindow( this ); + return new wxGenericMDIClientWindow( this ); #endif - return m_pClientWindow; } void wxGenericMDIParentFrame::ActivateNext() diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index da981865bf..4a7ddf7c9f 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -99,11 +99,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::OnInternalIdle() @@ -246,8 +247,7 @@ wxMDIClientWindow *wxMDIParentFrame::GetClientWindow() const wxMDIClientWindow *wxMDIParentFrame::OnCreateClient() { - m_clientWindow = new wxMDIClientWindow( this ); - return m_clientWindow; + return new wxMDIClientWindow( this ); } void wxMDIParentFrame::ActivateNext() diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index e906cb600b..eeff4813e4 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -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() diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp index 58a00ae186..428a0dc410 100644 --- a/src/mac/carbon/mdi.cpp +++ b/src/mac/carbon/mdi.cpp @@ -119,12 +119,14 @@ bool wxMDIParentFrame::Create(wxWindow *parent, m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next")); } - wxFrame::Create( parent , id , title , pos , size , style , name ) ; + if ( !wxFrame::Create( parent , id , title , pos , size , style , name ) ) + return false; + m_parentFrameActive = true; - OnCreateClient(); + m_clientWindow = OnCreateClient(); - return true; + return m_clientWindow != NULL; } wxMDIParentFrame::~wxMDIParentFrame() @@ -275,9 +277,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const // just return a new class) wxMDIClientWindow *wxMDIParentFrame::OnCreateClient() { - m_clientWindow = new wxMDIClientWindow( this ); - - return m_clientWindow; + return new wxMDIClientWindow( this ); } // Responds to colour changes, and passes event on to children. -- 2.45.2