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

Prevent accession of to-be-deleted mdi

Browse Source 
child window.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2006-10-25 17:51:28 +00:00
parent 43a9ab2f1b
commit 3811dacb39
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/mdi.h
View File

@ -150,6 +150,8 @@ public:
virtual bool IsTopLevel() const { return false; }
virtual bool Destroy();
void OnActivate( wxActivateEvent& event );
void OnMenuHighlight( wxMenuEvent& event );

22
src/gtk/mdi.cpp
View File

@ -250,19 +250,24 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
gint i = gtk_notebook_get_current_page( notebook );
if (i < 0) return (wxMDIChildFrame*) NULL;
GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data);
if (!page) return (wxMDIChildFrame*) NULL;
wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();
while (node)
{
if ( wxPendingDelete.Member(node->GetData()) )
return (wxMDIChildFrame*) NULL;
wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
wxASSERT_MSG( child_frame, _T("child is not a wxMDIChildFrame") );
if (!child_frame)
return (wxMDIChildFrame*) NULL;
if (child_frame->m_page == page)
return child_frame;
node = node->GetNext();
}
@ -335,6 +340,19 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
}
bool wxMDIChildFrame::Destroy()
{
// delayed destruction: the frame will be deleted during
// the next idle loop iteration.
// I'm not sure if delayed destruction really makes so
// much sense for MDI child frames, actually, but hiding
// it doesn't make any sense.
if ( !wxPendingDelete.Member(this) )
wxPendingDelete.Append(this);
return true;
}
void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxWindow::DoSetSize( x, y, width, height, sizeFlags );