streamlining code

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

diff --git a/include/wx/palmos/notebook.h b/include/wx/palmos/notebook.h
index fd9333b16ce078d20b7a2761cf0eb0ea2eab081a..5e85e4259d009eb4def0838d162566c61d9da5f9 100644 (file)
--- a/include/wx/palmos/notebook.h
+++ b/include/wx/palmos/notebook.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palmos/notebook.h
+// Name:        wx/palmos/notebook.h

 // Purpose:     notebook interface (a.k.a. property sheet)
 // Purpose:     notebook interface (a.k.a. property sheet)

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,10 +12,6 @@
 #ifndef _NOTEBOOK_H
 #define _NOTEBOOK_H
 
 #ifndef _NOTEBOOK_H
 #define _NOTEBOOK_H
 

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

 #if wxUSE_NOTEBOOK
 
 // ----------------------------------------------------------------------------
 #if wxUSE_NOTEBOOK
 
 // ----------------------------------------------------------------------------


@@ -28,7 +24,7 @@
 // wxNotebook
 // ----------------------------------------------------------------------------
 
 // wxNotebook
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNotebookPageInfo : public wxObject
+class WXDLLIMPEXP_CORE wxNotebookPageInfo : public wxObject

 {
 public :
     wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; }
 {
 public :
     wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; }


@@ -52,7 +48,7 @@ private :
 
 WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList );
 
 
 WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList );
 

-class WXDLLEXPORT wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -91,6 +87,9 @@ public:
     // get the currently selected page
     int GetSelection() const { return m_nSelection; }
 
     // 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;
     // set/get the title of a page
     bool SetPageText(size_t nPage, const wxString& strText);
     wxString GetPageText(size_t nPage) const;


@@ -146,7 +145,7 @@ public:
     // callbacks
     // ---------
     void OnSize(wxSizeEvent& event);
     // callbacks
     // ---------
     void OnSize(wxSizeEvent& event);

-    void OnSelChange(wxNotebookEvent& event);
+    void OnSelChange(wxBookCtrlEvent& event);

     void OnNavigationKey(wxNavigationKeyEvent& event);
 
     // base class virtuals
     void OnNavigationKey(wxNavigationKeyEvent& event);
 
     // base class virtuals