added wxAuiManager::GetManager() call
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
#include "wx/msw/private.h"
|
||||
#endif
|
||||
|
||||
IMPLEMENT_CLASS( wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass )
|
||||
IMPLEMENT_CLASS(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass)
|
||||
|
||||
wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent,
|
||||
wxAuiManager* owner_mgr,
|
||||
@@ -73,7 +73,8 @@ wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent,
|
||||
wxAuiFloatingFrame::~wxAuiFloatingFrame()
|
||||
{
|
||||
// if we do not do this, then we can crash...
|
||||
if(m_owner_mgr && m_owner_mgr->m_action_window == this) {
|
||||
if(m_owner_mgr && m_owner_mgr->m_action_window == this)
|
||||
{
|
||||
m_owner_mgr->m_action_window = NULL;
|
||||
}
|
||||
m_mgr.UnInit();
|
||||
@@ -131,6 +132,12 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
|
||||
}
|
||||
}
|
||||
|
||||
wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const
|
||||
{
|
||||
return m_owner_mgr;
|
||||
}
|
||||
|
||||
|
||||
void wxAuiFloatingFrame::OnSize(wxSizeEvent& event)
|
||||
{
|
||||
m_owner_mgr->OnFloatingPaneResized(m_pane_window, event.GetSize());
|
||||
|
||||
Reference in New Issue
Block a user