Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 1678412 ] handling non-existent panes and uninitialized sizers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-21 09:18:44 +00:00
parent d61989a7de
commit 4d83610edf
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/aui/framemanager.cpp
View File

@@ -3530,11 +3530,8 @@ void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)
void wxAuiManager::OnFloatingPaneActivated(wxWindow* wnd) void wxAuiManager::OnFloatingPaneActivated(wxWindow* wnd)
{ {
if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) if ((GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) && GetPane(wnd).IsOk())
{ {
// try to find the pane
wxASSERT_MSG(GetPane(wnd).IsOk(), wxT("Pane window not found"));
SetActivePane(m_panes, wnd); SetActivePane(m_panes, wnd);
Repaint(); Repaint();
} }
@@ -3561,8 +3558,8 @@ void wxAuiManager::OnRender(wxAuiManagerEvent& evt)
{ {
wxAuiDockUIPart& part = m_uiparts.Item(i); wxAuiDockUIPart& part = m_uiparts.Item(i);
// don't draw hidden pane items // don't draw hidden pane items or items that aren't windows
if (part.sizer_item && !part.sizer_item->IsShown()) if (part.sizer_item && ((!part.sizer_item->IsWindow() && !part.sizer_item->IsSpacer() && !part.sizer_item->IsSizer()) || !part.sizer_item->IsShown()))
continue; continue;
switch (part.type) switch (part.type)