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

don't delete m_pActiveChild twice in wxWINDOWCLOSEALL event handler (patch 1665395, bug 1661995)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-07 22:59:11 +00:00
parent f4322df68b
commit ccc8c01a11
1 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/aui/tabmdi.cpp
View File

@@ -128,7 +128,7 @@ wxAuiTabArt* wxAuiMDIParentFrame::GetArtProvider()
{
if (!m_pClientWindow)
return NULL;
return m_pClientWindow->GetArtProvider();
}
@@ -202,7 +202,7 @@ bool wxAuiMDIParentFrame::ProcessEvent(wxEvent& event)
if (m_pLastEvt == &event)
return false;
m_pLastEvt = &event;
// let the active child (if any) process the event first.
bool res = false;
if (m_pActiveChild &&
@@ -331,11 +331,6 @@ void wxAuiMDIParentFrame::DoHandleMenu(wxCommandEvent& event)
{
return; // failure
}
else
{
delete m_pActiveChild;
m_pActiveChild = NULL;
}
}
break;
case wxWINDOWNEXT:
@@ -359,11 +354,11 @@ void wxAuiMDIParentFrame::Tile(wxOrientation orient)
{
wxAuiMDIClientWindow* client_window = GetClientWindow();
wxASSERT_MSG(client_window, wxT("Missing MDI Client Window"));
int cur_idx = client_window->GetSelection();
if (cur_idx == -1)
return;
if (orient == wxVERTICAL)
{
client_window->Split(cur_idx, wxLEFT);
@@ -401,7 +396,7 @@ wxAuiMDIChildFrame::wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent,
const wxString& name)
{
Init();
// There are two ways to create an tabbed mdi child fram without
// making it the active document. Either Show(false) can be called
// before Create() (as is customary on some ports with wxFrame-type
@@ -411,7 +406,7 @@ wxAuiMDIChildFrame::wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent,
// onto the panel underneath.
if (style & wxMINIMIZE)
m_activate_on_create = false;
Create(parent, id, title, wxDefaultPosition, size, 0, name);
}
@@ -423,7 +418,7 @@ wxAuiMDIChildFrame::~wxAuiMDIChildFrame()
pParentFrame->SetActiveChild(NULL);
pParentFrame->SetChildMenuBar(NULL);
}
#if wxUSE_MENUS
wxDELETE(m_pMenuBar);
#endif // wxUSE_MENUS
@@ -464,7 +459,7 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
pClientWindow->AddPage(this, title, m_activate_on_create);
pClientWindow->Refresh();
return true;
}
@@ -482,7 +477,7 @@ bool wxAuiMDIChildFrame::Destroy()
wxActivateEvent event(wxEVT_ACTIVATE, false, GetId());
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
pParentFrame->SetActiveChild(NULL);
pParentFrame->SetChildMenuBar(NULL);
}
@@ -570,15 +565,15 @@ void wxAuiMDIChildFrame::SetIcon(const wxIcon& icon)
wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame"));
m_icon = icon;
wxBitmap bmp;
bmp.CopyFromIcon(m_icon);
wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
if (pClientWindow != NULL)
{
int idx = pClientWindow->GetPageIndex(this);
if (idx != -1)
{
pClientWindow->SetPageBitmap((size_t)idx, bmp);
@@ -590,8 +585,8 @@ const wxIcon& wxAuiMDIChildFrame::GetIcon() const
{
return m_icon;
}
void wxAuiMDIChildFrame::Activate()
{
wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
@@ -659,7 +654,7 @@ void wxAuiMDIChildFrame::Init()
bool wxAuiMDIChildFrame::Show(bool show)
{
m_activate_on_create = show;
// do nothing
return true;
}
@@ -725,11 +720,11 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
{
SetWindowStyleFlag(style);
wxSize caption_icon_size =
wxSize caption_icon_size =
wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X),
wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
SetUniformBitmapSize(caption_icon_size);
if (!wxAuiNotebook::Create(parent,
wxID_ANY,
wxPoint(0,0),
@@ -757,7 +752,7 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
// don't do anything if the page doesn't actually change
if (old_selection == new_selection)
return;
/*
// don't do anything if the new page is already active
if (new_selection != -1)
@@ -766,8 +761,8 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
if (child->GetMDIParentFrame()->GetActiveChild() == child)
return;
}*/
// notify old active child that it has been deactivated
if (old_selection != -1)
{
@@ -778,24 +773,24 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
event.SetEventObject(old_child);
old_child->GetEventHandler()->ProcessEvent(event);
}
// notify new active child that it has been activated
if (new_selection != -1)
{
wxAuiMDIChildFrame* active_child = (wxAuiMDIChildFrame*)GetPage(new_selection);
wxASSERT_MSG(active_child, wxT("wxAuiMDIClientWindow::PageChanged - null page pointer"));
wxActivateEvent event(wxEVT_ACTIVATE, true, active_child->GetId());
event.SetEventObject(active_child);
active_child->GetEventHandler()->ProcessEvent(event);
if (active_child->GetMDIParentFrame())
{
active_child->GetMDIParentFrame()->SetActiveChild(active_child);
active_child->GetMDIParentFrame()->SetChildMenuBar(active_child);
}
}
}
@@ -803,9 +798,9 @@ void wxAuiMDIClientWindow::OnPageClose(wxAuiNotebookEvent& evt)
{
wxAuiMDIChildFrame* wnd;
wnd = static_cast<wxAuiMDIChildFrame*>(GetPage(evt.GetSelection()));
wnd->Close();
// regardless of the result of wnd->Close(), we've
// already taken care of the close operations, so
// suppress further processing