Applied patch [ 1777700 ] call Reparent() from wxAuiNotebook::InsertPage()
(Fixes bug [ 1769662 ] wxAuiNotebook::InsertPage() does not change page parent) Applied patch [ 1777713 ] wxAuiNotebook::InsertPage() - properly update m_curpage (Fixes bug [ 1769655 ] wxAuiNotebook::InsertPage() leads to inconsistent state) From Andrey Yazhuk. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -3072,6 +3072,8 @@ bool wxAuiNotebook::InsertPage(size_t page_idx,
|
|||||||
bool select,
|
bool select,
|
||||||
const wxBitmap& bitmap)
|
const wxBitmap& bitmap)
|
||||||
{
|
{
|
||||||
|
page->Reparent(this);
|
||||||
|
|
||||||
wxAuiNotebookPage info;
|
wxAuiNotebookPage info;
|
||||||
info.window = page;
|
info.window = page;
|
||||||
info.caption = caption;
|
info.caption = caption;
|
||||||
@@ -3102,6 +3104,10 @@ bool wxAuiNotebook::InsertPage(size_t page_idx,
|
|||||||
DoSizing();
|
DoSizing();
|
||||||
active_tabctrl->DoShowHide();
|
active_tabctrl->DoShowHide();
|
||||||
|
|
||||||
|
// adjust selected index
|
||||||
|
if(m_curpage >= (int) page_idx)
|
||||||
|
m_curpage++;
|
||||||
|
|
||||||
if (select)
|
if (select)
|
||||||
{
|
{
|
||||||
int idx = m_tabs.GetIdxFromWindow(page);
|
int idx = m_tabs.GetIdxFromWindow(page);
|
||||||
|
Reference in New Issue
Block a user