wxAUI: Send cancel event on floating panes closing too (last log was misleading ...

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 e79355872e5d07c6c5ebe1cb2b1e966affd0e381..cfbb83f06c5cb8d7f60a50a3c38c08f8fe6d470a 100644 (file)
--- 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)