aui: allow m_frame to be null in wxFrameManager
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -260,6 +260,8 @@ public:
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0);
|
||||
|
||||
~wxAuiTabCtrl();
|
||||
|
||||
protected:
|
||||
|
||||
void OnPaint(wxPaintEvent& evt);
|
||||
|
@@ -952,6 +952,9 @@ wxAuiTabCtrl::wxAuiTabCtrl(wxWindow* parent,
|
||||
m_hover_button = NULL;
|
||||
}
|
||||
|
||||
wxAuiTabCtrl::~wxAuiTabCtrl()
|
||||
{
|
||||
}
|
||||
|
||||
void wxAuiTabCtrl::OnPaint(wxPaintEvent&)
|
||||
{
|
||||
|
@@ -486,6 +486,7 @@ wxFrameManager::wxFrameManager(wxWindow* managed_wnd, unsigned int flags)
|
||||
m_hint_wnd = NULL;
|
||||
m_flags = flags;
|
||||
m_skipping = false;
|
||||
m_frame = NULL;
|
||||
|
||||
if (managed_wnd)
|
||||
{
|
||||
@@ -741,7 +742,10 @@ void wxFrameManager::SetManagedWindow(wxWindow* wnd)
|
||||
// will result in a crash upon program exit
|
||||
void wxFrameManager::UnInit()
|
||||
{
|
||||
m_frame->RemoveEventHandler(this);
|
||||
if (m_frame)
|
||||
{
|
||||
m_frame->RemoveEventHandler(this);
|
||||
}
|
||||
}
|
||||
|
||||
// GetManagedWindow() returns the window pointer being managed
|
||||
|
Reference in New Issue
Block a user