removed more unused variables (thanks Borland)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1590,8 +1590,6 @@ wxWindow* wxAuiMultiNotebook::GetTabFrameFromTabCtrl(wxWindow* tab_ctrl)
|
|||||||
|
|
||||||
void wxAuiMultiNotebook::RemoveEmptyTabFrames()
|
void wxAuiMultiNotebook::RemoveEmptyTabFrames()
|
||||||
{
|
{
|
||||||
bool must_update = false;
|
|
||||||
|
|
||||||
// if we've just removed the last tab from the source
|
// if we've just removed the last tab from the source
|
||||||
// tab set, the remove the tab control completely
|
// tab set, the remove the tab control completely
|
||||||
wxPaneInfoArray all_panes = m_mgr.GetAllPanes();
|
wxPaneInfoArray all_panes = m_mgr.GetAllPanes();
|
||||||
@@ -1613,7 +1611,6 @@ void wxAuiMultiNotebook::RemoveEmptyTabFrames()
|
|||||||
//tab_frame->m_tabs->Destroy();
|
//tab_frame->m_tabs->Destroy();
|
||||||
|
|
||||||
delete tab_frame;
|
delete tab_frame;
|
||||||
must_update = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1637,7 +1634,6 @@ void wxAuiMultiNotebook::RemoveEmptyTabFrames()
|
|||||||
if (!center_found && first_good)
|
if (!center_found && first_good)
|
||||||
{
|
{
|
||||||
m_mgr.GetPane(first_good).Centre();
|
m_mgr.GetPane(first_good).Centre();
|
||||||
must_update = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
m_mgr.Update();
|
m_mgr.Update();
|
||||||
|
@@ -400,16 +400,14 @@ bool wxTabMDIChildFrame::Destroy()
|
|||||||
wxTabMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
|
wxTabMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
|
||||||
wxASSERT_MSG(pClientWindow, wxT("Missing MDI Client Window"));
|
wxASSERT_MSG(pClientWindow, wxT("Missing MDI Client Window"));
|
||||||
|
|
||||||
bool bActive = false;
|
|
||||||
if (pParentFrame->GetActiveChild() == this)
|
if (pParentFrame->GetActiveChild() == this)
|
||||||
{
|
{
|
||||||
pParentFrame->SetActiveChild(NULL);
|
pParentFrame->SetActiveChild(NULL);
|
||||||
pParentFrame->SetChildMenuBar(NULL);
|
pParentFrame->SetChildMenuBar(NULL);
|
||||||
bActive = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t pos, page_count = pClientWindow->GetPageCount();
|
const size_t page_count = pClientWindow->GetPageCount();
|
||||||
for (pos = 0; pos < page_count; pos++)
|
for (size_t pos = 0; pos < page_count; pos++)
|
||||||
{
|
{
|
||||||
if (pClientWindow->GetPage(pos) == this)
|
if (pClientWindow->GetPage(pos) == this)
|
||||||
return pClientWindow->DeletePage(pos);
|
return pClientWindow->DeletePage(pos);
|
||||||
|
Reference in New Issue
Block a user