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 a8ddfebff4389b48bce421bd51770c94ccdaafae..467a27e58b03f2404f2e169e0004b279fe8ec769 100644 (file)
--- 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);
     // 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
     // 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 5db9b18603166dcd3745ee85324b2ef14fbb6eb7..5c73f3579ef34491a3ec8a095b59186183f49552 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -309,8 +309,13 @@ bool wxNotebook::DeletePage(wxNotebookPage* page)
         return FALSE;
 }
 
         return FALSE;
 }
 

-// remove one page from the notebook

 bool wxNotebook::RemovePage(size_t nPage)
 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 );
 
 {
     wxCHECK( IS_VALID_PAGE(nPage), FALSE );
 


@@ -353,7 +358,7 @@ bool wxNotebook::RemovePage(size_t nPage)
 
     RefreshLayout(FALSE);
 
 
     RefreshLayout(FALSE);
 

-    return TRUE;
+    return pPage;

 }
 
 bool wxNotebook::RemovePage(wxNotebookPage* page)
 }
 
 bool wxNotebook::RemovePage(wxNotebookPage* page)