Documentation states scrollbars (plural) are switched off by wxHW_SCROLLBAR_NEVER,

[wxWidgets.git] / src / generic / treebkg.cpp

diff --git a/src/generic/treebkg.cpp b/src/generic/treebkg.cpp
index 32e8250290f98a3cdc5fc4ba55a8b4b3508c5f55..3ca29465552fae5534e81e6f9caa7b14e4ba8afb 100644 (file)
--- a/src/generic/treebkg.cpp
+++ b/src/generic/treebkg.cpp
@@ -203,8 +203,6 @@ bool wxTreebook::DoInsertPage(size_t pagePos,
 
     DoUpdateSelection(bSelect, pagePos);
 
 
     DoUpdateSelection(bSelect, pagePos);
 

-    m_bookctrl->InvalidateBestSize();
-

     return true;
 }
 
     return true;
 }
 


@@ -258,8 +256,6 @@ bool wxTreebook::DoInsertSubPage(size_t pagePos,
 
     DoUpdateSelection(bSelect, newPos);
 
 
     DoUpdateSelection(bSelect, newPos);
 

-    m_bookctrl->InvalidateBestSize();
-

     return true;
 }
 
     return true;
 }
 


@@ -308,7 +304,6 @@ wxTreebookPage *wxTreebook::DoRemovePage(size_t pagePos)
 
     tree->DeleteChildren( pageId );
     tree->Delete( pageId );
 
     tree->DeleteChildren( pageId );
     tree->Delete( pageId );

-    tree->InvalidateBestSize();

 
     return oldPage;
 }
 
     return oldPage;
 }


@@ -614,25 +609,22 @@ int wxTreebook::DoSetSelection(size_t pagePos)
             // find the next page suitable to be shown: the first (grand)child
             // of this one with a non-NULL associated page
             wxTreeItemId childId = m_treeIds[pagePos];
             // find the next page suitable to be shown: the first (grand)child
             // of this one with a non-NULL associated page
             wxTreeItemId childId = m_treeIds[pagePos];

-            m_actualSelection = pagePos;
+            int actualPagePos = pagePos;

             while ( !page && childId.IsOk() )
             {
                 wxTreeItemIdValue cookie;
                 childId = tree->GetFirstChild( childId, cookie );
                 if ( childId.IsOk() )
                 {
             while ( !page && childId.IsOk() )
             {
                 wxTreeItemIdValue cookie;
                 childId = tree->GetFirstChild( childId, cookie );
                 if ( childId.IsOk() )
                 {

-                    page = wxBookCtrlBase::GetPage(++m_actualSelection);
+                    page = wxBookCtrlBase::GetPage(++actualPagePos);

                 }
             }
 
                 }
             }
 

-            wxASSERT_MSG( page, wxT("no page to show found!") );
+            m_actualSelection = page ? actualPagePos : m_selection;

         }
 
         if ( page )
         }
 
         if ( page )

-        {
-            page->SetSize(GetPageRect());

             page->Show();
             page->Show();

-        }

 
         tree->SelectItem(DoInternalGetPage(pagePos));
 
 
         tree->SelectItem(DoInternalGetPage(pagePos));