X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/718e35a651487b43ab21b15f0bbdf5318c3cad1f..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk1/notebook.h?ds=sidebyside diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h index 454cf9f01e..45e7db965f 100644 --- a/include/wx/gtk1/notebook.h +++ b/include/wx/gtk1/notebook.h @@ -1,9 +1,8 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.h +// Name: wx/gtk1/notebook.h // Purpose: wxNotebook class // Author: Robert Roebling // Modified by: -// RCS-ID: $Id$ // Copyright: (c) Julian Smart and Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -11,15 +10,11 @@ #ifndef __GTKNOTEBOOKH__ #define __GTKNOTEBOOKH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - //----------------------------------------------------------------------------- // internal class //----------------------------------------------------------------------------- -class wxGtkNotebookPage; +class WXDLLIMPEXP_FWD_CORE wxGtkNotebookPage; #include "wx/list.h" WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); @@ -28,7 +23,7 @@ WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); // wxNotebook //----------------------------------------------------------------------------- -class wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // default for dynamic class @@ -39,14 +34,14 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // Create() function bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // dtor virtual ~wxNotebook(); @@ -54,11 +49,14 @@ public: // --------- // 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); + int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); } // 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); @@ -83,14 +81,14 @@ public: // 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, wxNotebookPage *win, const wxString& strText, - bool bSelect = FALSE, - int imageId = -1 ); + bool bSelect = false, + int imageId = NO_IMAGE ); // handler for tab navigation // -------------------------- @@ -99,7 +97,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation // -------------- @@ -127,13 +125,18 @@ public: // selection internally instead of querying the notebook for it int m_selection; - // flag set to TRUE while we're inside "switch_page" callback + // 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 programmatically generated + bool m_skipNextPageChangeEvent; + 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;