Applied #13819: wxRTC drag and drop, by dghart, with tweaks

[wxWidgets.git] / include / wx / palmos / notebook.h

diff --git a/include/wx/palmos/notebook.h b/include/wx/palmos/notebook.h
index b06f9552f68f061d9189a1888ba158b2ba007644..3c603a8169da3a68e05453b963198b3fd90b60a0 100644 (file)
--- a/include/wx/palmos/notebook.h
+++ b/include/wx/palmos/notebook.h
@@ -24,7 +24,7 @@
 // wxNotebook
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxNotebookPageInfo : public wxObject
+class WXDLLIMPEXP_CORE wxNotebookPageInfo : public wxObject
 {
 public :
     wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; }
@@ -48,7 +48,7 @@ private :
 
 WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList );
 
-class WXDLLEXPORT wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
 {
 public:
     // ctors
@@ -87,6 +87,9 @@ public:
     // get the currently selected page
     int GetSelection() const { return m_nSelection; }
 
+    // changes the selected page without sending events
+    int ChangeSelection(size_t nPage);
+
     // set/get the title of a page
     bool SetPageText(size_t nPage, const wxString& strText);
     wxString GetPageText(size_t nPage) const;
@@ -124,7 +127,7 @@ public:
                     wxNotebookPage *pPage,
                     const wxString& strText,
                     bool bSelect = false,
-                    int imageId = -1);
+                    int imageId = NO_IMAGE);
 
     void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ) ; }
     const wxNotebookPageInfoList& GetPageInfos() const ;
@@ -142,7 +145,7 @@ public:
     // callbacks
     // ---------
     void OnSize(wxSizeEvent& event);
-    void OnSelChange(wxNotebookEvent& event);
+    void OnSelChange(wxBookCtrlEvent& event);
     void OnNavigationKey(wxNavigationKeyEvent& event);
 
     // base class virtuals