Generate code using IsOk() instead of Ok() in stc.cpp.

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

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index f95ca0e3944972b0a1057e37943e5af5faa2abe9..32deb7564d70a925ac4c42a9c941b917aef38437 100644 (file)
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxNotebook class (a.k.a. property sheet, tabbed dialog)
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxNotebook class (a.k.a. property sheet, tabbed dialog)
 // Author:      Julian Smart
 // Modified by:


@@ -22,9 +22,9 @@
 // ----------------------------------------------------------------------------
 
 // fwd declarations
 // ----------------------------------------------------------------------------
 
 // fwd declarations

-class WXDLLEXPORT wxImageList;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxTabView;
+class WXDLLIMPEXP_FWD_CORE wxImageList;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxTabView;

 
 // ----------------------------------------------------------------------------
 // wxNotebook
 
 // ----------------------------------------------------------------------------
 // wxNotebook


@@ -52,21 +52,22 @@ public:
               long style = 0,
               const wxString& name = wxNotebookNameStr);
     // dtor
               long style = 0,
               const wxString& name = wxNotebookNameStr);
     // dtor

-  ~wxNotebook();
+  virtual ~wxNotebook();

 
   // accessors
   // ---------
 
   // accessors
   // ---------

-  // Find the position of the wxNotebookPage, -1 if not found.
+  // Find the position of the wxNotebookPage, wxNOT_FOUND if not found.

   int FindPagePosition(wxNotebookPage* page) const;
 
     // set the currently selected page, return the index of the previously
   int FindPagePosition(wxNotebookPage* page) const;
 
     // set the currently selected page, return the index of the previously

-    // selected one (or -1 on error)
+    // selected one (or wxNOT_FOUND on error)

     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
   int SetSelection(size_t nPage);
     // cycle thru the tabs
   //  void AdvanceSelection(bool bForward = true);
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
   int SetSelection(size_t nPage);
     // cycle thru the tabs
   //  void AdvanceSelection(bool bForward = true);

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


@@ -112,7 +113,7 @@ public:
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnInternalIdle();
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnInternalIdle();

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

   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
 
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
 


@@ -146,8 +147,6 @@ protected:
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
 
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
 

-  int m_nSelection;           // the current selection (-1 if none)
-

   wxTabView*   m_tabView;
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)
   wxTabView*   m_tabView;
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)