Some code renaming to avoid confusion. Test editable column in sample.

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

diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index d3111df808604ee22b61403a09e056511b4c8696..112171e148040f130a4730fe50d62b8f24aa66d9 100644 (file)
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxNotebook class
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxNotebook class
 // Author:      Robert Roebling
 // Modified by:


@@ -15,7 +15,7 @@
 // internal class
 //-----------------------------------------------------------------------------
 
 // internal class
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxGtkNotebookPage;
+class WXDLLIMPEXP_FWD_CORE wxGtkNotebookPage;

 
 #include "wx/list.h"
 WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);
 
 #include "wx/list.h"
 WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);


@@ -52,9 +52,12 @@ public:
     // set the currently selected page, return the index of the previously
     // selected one (or -1 on error)
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
     // set the currently selected page, return the index of the previously
     // selected one (or -1 on error)
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events

-  int SetSelection(size_t nPage);
+    int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }

     // get the currently selected page
     // get the currently selected page

-  int GetSelection() const;
+    int GetSelection() const;
+
+    // changes selected page without sending events
+    int ChangeSelection(size_t nPage) { return DoSetSelection(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);


@@ -79,7 +82,7 @@ public:
     // remove all pages
   bool DeleteAllPages();
 
     // remove all pages
   bool DeleteAllPages();
 

-    // adds a new page to the notebook (it will be deleted ny the notebook,
+    // adds a new page to the notebook (it will be deleted by the notebook,

     // don't delete it yourself). If bSelect, this page becomes active.
     // the same as AddPage(), but adds it at the specified position
     bool InsertPage( size_t position,
     // don't delete it yourself). If bSelect, this page becomes active.
     // the same as AddPage(), but adds it at the specified position
     bool InsertPage( size_t position,


@@ -126,10 +129,15 @@ public:
     // flag set to true while we're inside "switch_page" callback
     bool m_inSwitchPage;
 
     // flag set to true while we're inside "switch_page" callback
     bool m_inSwitchPage;
 

+    // flag set to true when the switch-page signal has been programatically generated
+    bool m_skipNextPageChangeEvent;
+

 protected:
     // remove one page from the notebook but do not destroy it
     virtual wxNotebookPage *DoRemovePage(size_t nPage);
 
 protected:
     // remove one page from the notebook but do not destroy it
     virtual wxNotebookPage *DoRemovePage(size_t nPage);
 

+    int DoSetSelection(size_t nPage, int flags = 0);
+

 private:
     // the padding set by SetPadding()
     int m_padding;
 private:
     // the padding set by SetPadding()
     int m_padding;