wxVariant is in wxBase so should be forward declared using WXDLLIMPEXP_BASE and not...

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

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 19b7b08a517c9d97c6d5a8ef99a6c1c55bc6d4cc..11b4abfe09bc52e2d3295edc925ea6c659f0238d 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -17,8 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifndef __PALMOS__
-
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "notebook.h"
 #endif
@@ -34,6 +32,8 @@
 #pragma hdrstop
 #endif
 
+#ifndef __WXPALMOS__
+
 #include  "wx/string.h"
 #include  "wx/log.h"
 #include  "wx/settings.h"
@@ -304,7 +304,7 @@ bool wxNotebook::RemovePage(size_t nPage)
 // remove one page from the notebook
 wxWindow* wxNotebook::DoRemovePage(size_t nPage)
 {
-    wxCHECK( IS_VALID_PAGE(nPage), false );
+    wxCHECK( IS_VALID_PAGE(nPage), NULL );
 
     m_pages[nPage]->Show(false);
     //    m_pages[nPage]->Lower();
@@ -708,4 +708,4 @@ bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
   return retval;
 }
 
-#endif // __PALMOS__
+#endif // __WXPALMOS__