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:
Benjamin Williams
2006-10-31 08:02:56 +00:00
parent 533bedbf30
commit 26da5e4f5a
3 changed files with 11 additions and 2 deletions

View File

@@ -260,6 +260,8 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0);
~wxAuiTabCtrl();
protected:
void OnPaint(wxPaintEvent& evt);

View File

@@ -952,6 +952,9 @@ wxAuiTabCtrl::wxAuiTabCtrl(wxWindow* parent,
m_hover_button = NULL;
}
wxAuiTabCtrl::~wxAuiTabCtrl()
{
}
void wxAuiTabCtrl::OnPaint(wxPaintEvent&)
{

View File

@@ -486,7 +486,8 @@ wxFrameManager::wxFrameManager(wxWindow* managed_wnd, unsigned int flags)
m_hint_wnd = NULL;
m_flags = flags;
m_skipping = false;
m_frame = NULL;
if (managed_wnd)
{
SetManagedWindow(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