invalidate m_selection in DoRemovePage(), not in DeletePage() (replaces patch 998984)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 1830da0e9ef3cf0b1e4eb516e0fc5ddc5372b57f..d19a9cd6d673444fbf4b40c3ff82f61ac9ea6dab 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -80,8 +80,6 @@ public:
 
   // operations
   // ----------
-    // remove one page from the notebook
-  bool DeletePage(size_t nPage);
     // remove all pages
   bool DeleteAllPages();
 

diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 1830da0e9ef3cf0b1e4eb516e0fc5ddc5372b57f..d19a9cd6d673444fbf4b40c3ff82f61ac9ea6dab 100644 (file)
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -80,8 +80,6 @@ public:
 
   // operations
   // ----------
-    // remove one page from the notebook
-  bool DeletePage(size_t nPage);
     // remove all pages
   bool DeleteAllPages();
 

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 91114c04914d39bf28355a2912dec3cb80dd30c5..9bd054e96fc35e49459981bbce65794698e57546 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -564,7 +564,7 @@ bool wxNotebook::DeleteAllPages()
     return wxNotebookBase::DeleteAllPages();
 }
 
-bool wxNotebook::DeletePage( size_t page )
+wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
 {
     if ( m_selection != -1 && (size_t)m_selection >= page )
     {
@@ -572,12 +572,6 @@ bool wxNotebook::DeletePage( size_t page )
         m_selection = -1;
     }
 
-    // it will call our DoRemovePage() to do the real work
-    return wxNotebookBase::DeletePage(page);
-}
-
-wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
-{
     wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
     if ( !client )
         return NULL;

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 91114c04914d39bf28355a2912dec3cb80dd30c5..9bd054e96fc35e49459981bbce65794698e57546 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -564,7 +564,7 @@ bool wxNotebook::DeleteAllPages()
     return wxNotebookBase::DeleteAllPages();
 }
 
-bool wxNotebook::DeletePage( size_t page )
+wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
 {
     if ( m_selection != -1 && (size_t)m_selection >= page )
     {
@@ -572,12 +572,6 @@ bool wxNotebook::DeletePage( size_t page )
         m_selection = -1;
     }
 
-    // it will call our DoRemovePage() to do the real work
-    return wxNotebookBase::DeletePage(page);
-}
-
-wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
-{
     wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
     if ( !client )
         return NULL;