From: Mattia Barbon <mbarbon@cpan.org>
Date: Thu, 21 Aug 2003 12:38:26 +0000 (+0000)
Subject:   Compilation fixes for wxMotif.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/64b090c72a104a5a9d010b323ba8fe770036c708

  Compilation fixes for wxMotif.


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

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index a8ddfebff4..467a27e58b 100644
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -101,6 +101,8 @@ public:
     // remove one page from the notebook, without deleting the page.
   bool RemovePage(size_t nPage);
   bool RemovePage(wxNotebookPage* page);
+  virtual wxWindow* DoRemovePage(size_t nPage);
+
     // remove all pages
   bool DeleteAllPages();
     // the same as AddPage(), but adds it at the specified position
diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 5db9b18603..5c73f3579e 100644
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -309,8 +309,13 @@ bool wxNotebook::DeletePage(wxNotebookPage* page)
         return FALSE;
 }
 
-// remove one page from the notebook
 bool wxNotebook::RemovePage(size_t nPage)
+{
+    return DoRemovePage(nPage) != NULL;
+}
+
+// remove one page from the notebook
+wxWindow* wxNotebook::DoRemovePage(size_t nPage)
 {
     wxCHECK( IS_VALID_PAGE(nPage), FALSE );
 
@@ -353,7 +358,7 @@ bool wxNotebook::RemovePage(size_t nPage)
 
     RefreshLayout(FALSE);
 
-    return TRUE;
+    return pPage;
 }
 
 bool wxNotebook::RemovePage(wxNotebookPage* page)