cleanup for 10.5

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

diff --git a/src/palmos/notebook.cpp b/src/palmos/notebook.cpp
index 9b12131b453dc324846e9633b486e9d683e130d9..2f73ee9e9d2ee2769a789c0969442487eb86c98d 100644 (file)
--- a/src/palmos/notebook.cpp
+++ b/src/palmos/notebook.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "notebook.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -38,15 +34,15 @@
 // event table
 // ----------------------------------------------------------------------------
 
 // event table
 // ----------------------------------------------------------------------------
 

-#include <wx/listimpl.cpp>
+#include "wx/listimpl.cpp"

 
 

-WX_DEFINE_LIST( wxNotebookPageInfoList ) ;
+WX_DEFINE_LIST( wxNotebookPageInfoList )

 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)

-    EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
+    EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)

 
     EVT_SIZE(wxNotebook::OnSize)
 
 
     EVT_SIZE(wxNotebook::OnSize)
 


@@ -85,9 +81,9 @@ wxBEGIN_FLAGS( wxNotebookStyle )
     wxFLAGS_MEMBER(wxHSCROLL)
 
     wxFLAGS_MEMBER(wxNB_FIXEDWIDTH)
     wxFLAGS_MEMBER(wxHSCROLL)
 
     wxFLAGS_MEMBER(wxNB_FIXEDWIDTH)

-    wxFLAGS_MEMBER(wxNB_LEFT)
-    wxFLAGS_MEMBER(wxNB_RIGHT)
-    wxFLAGS_MEMBER(wxNB_BOTTOM)
+    wxFLAGS_MEMBER(wxBK_LEFT)
+    wxFLAGS_MEMBER(wxBK_RIGHT)
+    wxFLAGS_MEMBER(wxBK_BOTTOM)

 
 wxEND_FLAGS( wxNotebookStyle )
 
 
 wxEND_FLAGS( wxNotebookStyle )
 


@@ -198,6 +194,11 @@ int wxNotebook::SetSelection(size_t nPage)
     return 0;
 }
 
     return 0;
 }
 

+int wxNotebook::ChangeSelection(size_t nPage)
+{
+    return 0;
+}
+

 bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 {
     return false;
 bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 {
     return false;