From: Alex Bligh <alex@alex.org.uk>
Date: Tue, 4 Jul 2006 19:58:24 +0000 (+0000)
Subject: wxAUI: Send cancel event on floating panes closing too (last log was misleading ... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c68038f3bdaac23b837fb68a98a6d673aac347ab

wxAUI: Send cancel event on floating panes closing too (last log was misleading - that was on docked panes with a hand-drawn close button).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index e79355872e..cfbb83f06c 100644
--- a/src/aui/floatpane.cpp
+++ b/src/aui/floatpane.cpp
@@ -114,8 +114,26 @@ void wxFloatingPane::OnSize(wxSizeEvent& event)
 
 void wxFloatingPane::OnClose(wxCloseEvent& WXUNUSED(event))
 {
-    m_owner_mgr->OnFloatingPaneClosed(m_pane_window);
-    Destroy();
+    static wxList s_closing;
+
+    if (!s_closing.Member(this))
+    {
+        s_closing.Append(this);
+
+        wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+        cancelEvent.SetEventObject( m_pane_window );
+        m_pane_window->GetEventHandler()->ProcessEvent(cancelEvent);
+        s_closing.DeleteObject(this);
+        // we should really return here without doing anything if the close was vetoed
+    }
+
+    // The problem here is that the above can cause the window itself to be destroyed
+    if (!IsBeingDeleted() && m_pane_window && !m_pane_window->IsBeingDeleted()
+        && (m_pane_window->GetParent()==this))
+    {
+        m_owner_mgr->OnFloatingPaneClosed(m_pane_window);
+        Destroy();
+    }
 }
 
 void wxFloatingPane::OnMoveEvent(wxMoveEvent& event)