X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c86f1403c3737c07d58676a203f4707942684a01..40c7a5fc4e95a9dc291c0cc7dcc135d552b69272:/include/wx/gtk/notebook.h diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index 097101d094..97c86e7ee9 100644 --- a/include/wx/gtk/notebook.h +++ b/include/wx/gtk/notebook.h @@ -4,15 +4,15 @@ // Author: Robert Roebling // Modified by: // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart and Robert Roebling // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifndef __NOTEBOOKH__ -#define __NOTEBOOKH__ +#ifndef __GTKNOTEBOOKH__ +#define __GTKNOTEBOOKH__ #ifdef __GNUG__ -#pragma interface "notebook.h" +#pragma interface #endif #include "wx/defs.h" @@ -32,18 +32,32 @@ class wxNotebookPage; // notebook events // ---------------------------------------------------------------------------- -class wxNotebookEvent : public wxCommandEvent +class wxNotebookEvent : public wxNotifyEvent { public: wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int nSel = -1, int nOldSel = -1) - : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; } + : wxNotifyEvent(commandType, id) + { + m_bAllow = TRUE; + m_nSel = nSel; + m_nOldSel = nOldSel; + } // accessors int GetSelection() const { return m_nSel; } int GetOldSelection() const { return m_nOldSel; } + // for wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING event this method may be called + // to disallow the page change + void Veto() { m_bAllow = FALSE; } + + // implementation: for wxNotebook usage only + bool Allowed() const { return m_bAllow; } + private: + bool m_bAllow; + int m_nSel, // currently selected page m_nOldSel; // previously selected page @@ -122,6 +136,8 @@ public: // operations // ---------- + // remove one page from the notebook but do not destroy it + bool RemovePage(int nPage); // remove one page from the notebook bool DeletePage(int nPage); // remove all pages @@ -130,21 +146,21 @@ public: // don't delete it yourself). If bSelect, this page becomes active. bool AddPage(wxWindow *pPage, const wxString& strText, - bool bSelect = FALSE, + bool select = FALSE, int imageId = -1); // @@@@ VZ: I don't know how to implement InsertPage() // get the panel which represents the given page wxWindow *GetPage(int nPage) const; + void OnNavigationKey(wxNavigationKeyEvent& event); + // implementation - // -------------- - // base class virtuals - virtual void AddChild(wxWindow *child); - virtual void SetConstraintSizes(bool recurse); - virtual bool DoPhase(int phase); + + void SetConstraintSizes(bool recurse); + bool DoPhase(int phase); + void ApplyWidgetStyle(); -private: // common part of all ctors void Init(); @@ -156,6 +172,7 @@ private: size_t m_idHandler; // the change page handler id DECLARE_DYNAMIC_CLASS(wxNotebook) + DECLARE_EVENT_TABLE() }; // ---------------------------------------------------------------------------- @@ -174,7 +191,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn) \ { \ - wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ \ + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ id, \ -1, \ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ @@ -182,4 +199,4 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); }, #endif - // __NOTEBOOKH__ + // __GTKNOTEBOOKH__