avoid setting initial position if it was not specified, broken in r70734

[wxWidgets.git] / src / osx / notebook_osx.cpp

diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp
index 90dc4888636f0eaa806f27b652db64771d7aa03f..59a329d5e7f56a0eeb25c35c10f4c4f2c489be49 100644 (file)
--- a/src/osx/notebook_osx.cpp
+++ b/src/osx/notebook_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -173,11 +172,19 @@ wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)
 
     wxNotebookPage* page = m_pages[nPage] ;
     m_pages.RemoveAt(nPage);
 
     wxNotebookPage* page = m_pages[nPage] ;
     m_pages.RemoveAt(nPage);

+    m_images.RemoveAt(nPage);

 
     MacSetupTabs();
 
 
     MacSetupTabs();
 

-    if (m_selection >= (int)GetPageCount())
-        m_selection = GetPageCount() - 1;
+    if ( m_selection >= (int)nPage )
+    {
+        if ( GetPageCount() == 0 )
+            m_selection = wxNOT_FOUND;
+        else
+            m_selection = m_selection ? m_selection - 1 : 0;
+
+        GetPeer()->SetValue( m_selection + 1 ) ;
+    }

 
     if (m_selection >= 0)
         m_pages[m_selection]->Show(true);
 
     if (m_selection >= 0)
         m_pages[m_selection]->Show(true);


@@ -190,7 +197,8 @@ wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {

-    WX_CLEAR_ARRAY(m_pages) ;
+    WX_CLEAR_ARRAY(m_pages);
+    m_images.clear();

     MacSetupTabs();
     m_selection = wxNOT_FOUND ;
     InvalidateBestSize();
     MacSetupTabs();
     m_selection = wxNOT_FOUND ;
     InvalidateBestSize();