X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ca41e57f48db4c1a2de7ae67c7e4b655d9809af..935b53f2fb175499ac1a8ed53ccd2b986dcdd43a:/include/wx/gtk1/notebook.h?ds=sidebyside diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h index 46ae493e57..b211142699 100644 --- a/include/wx/gtk1/notebook.h +++ b/include/wx/gtk1/notebook.h @@ -4,7 +4,7 @@ // 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 ///////////////////////////////////////////////////////////////////////////// @@ -15,80 +15,48 @@ #pragma interface #endif -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/control.h" - //----------------------------------------------------------------------------- -// classes +// internal class //----------------------------------------------------------------------------- -class wxImageList; -class wxNotebook; -class wxNotebookPage; - -// ---------------------------------------------------------------------------- -// notebook events -// ---------------------------------------------------------------------------- - -class wxNotebookEvent : public wxCommandEvent -{ -public: - wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, - int nSel = -1, int nOldSel = -1) - : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; } - - // accessors - int GetSelection() const { return m_nSel; } - int GetOldSelection() const { return m_nOldSel; } - -private: - int m_nSel, // currently selected page - m_nOldSel; // previously selected page +class wxGtkNotebookPage; - DECLARE_DYNAMIC_CLASS(wxNotebookEvent) -}; +#include "wx/list.h" +WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); //----------------------------------------------------------------------------- // wxNotebook //----------------------------------------------------------------------------- -class wxNotebook : public wxControl +class wxNotebook : public wxNotebookBase { public: - // ctors - // ----- - // default for dynamic class - wxNotebook(); - // the same arguments as for wxControl (@@@ any special styles?) - wxNotebook(wxWindow *parent, + // default for dynamic class + wxNotebook(); + // the same arguments as for wxControl + wxNotebook(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook"); - // Create() function - bool Create(wxWindow *parent, + // Create() function + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook"); - // dtor - ~wxNotebook(); + // dtor + virtual ~wxNotebook(); // accessors // --------- - // get number of pages in the dialog - int GetPageCount() const; // 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(int nPage); - // cycle thru the tabs - void AdvanceSelection(bool bForward = TRUE); // get the currently selected page int GetSelection() const; @@ -96,29 +64,17 @@ public: bool SetPageText(int nPage, const wxString& strText); wxString GetPageText(int nPage) const; - // image list stuff: each page may have an image associated with it. All - // the images belong to an image list, so you have to - // 1) create an image list - // 2) associate it with the notebook - // 3) set for each page it's image - // associate image list with a control - void SetImageList(wxImageList* imageList); - // get pointer (may be NULL) to the associated image list - wxImageList* GetImageList() const { return m_imageList; } - // sets/returns item's image index in the current image list int GetPageImage(int nPage) const; bool SetPageImage(int nPage, int nImage); - // currently it's always 1 because wxGTK doesn't support multi-row - // tab controls - int GetRowCount() const; - // control the appearance of the notebook pages // set the size (the same for all pages) void SetPageSize(const wxSize& size); // set the padding between tabs (in pixels) void SetPadding(const wxSize& padding); + // sets the size of the tabs (assumes all tabs are the same size) + void SetTabSize(const wxSize& sz); // operations // ---------- @@ -126,59 +82,54 @@ public: bool DeletePage(int nPage); // remove all pages bool DeleteAllPages(); + // adds a new page to the notebook (it will be deleted ny the notebook, // don't delete it yourself). If bSelect, this page becomes active. - bool AddPage(wxWindow *pPage, - const wxString& strText, - bool bSelect = FALSE, - int imageId = -1); - // @@@@ VZ: I don't know how to implement InsertPage() + // the same as AddPage(), but adds it at the specified position + bool InsertPage( int position, + wxNotebookPage *win, + const wxString& strText, + bool bSelect = FALSE, + int imageId = -1 ); + + // handler for tab navigation + // -------------------------- + void OnNavigationKey(wxNavigationKeyEvent& event); + + // implementation + // -------------- + +#if wxUSE_CONSTRAINTS + void SetConstraintSizes(bool recurse); + bool DoPhase(int phase); +#endif - // get the panel which represents the given page - wxWindow *GetPage(int nPage) const; + void ApplyWidgetStyle(); - - // implementation - - void SetConstraintSizes(bool recurse); - bool DoPhase(int phase); - void ApplyWidgetStyle(); + // report if window belongs to notebook + bool IsOwnGtkWindow( GdkWindow *window ); - // common part of all ctors - void Init(); + // common part of all ctors + void Init(); - // helper function - wxNotebookPage* GetNotebookPage(int page) const; + // helper function + wxGtkNotebookPage* GetNotebookPage(int page) const; - wxImageList* m_imageList; - wxList m_pages; - size_t m_idHandler; // the change page handler id + // the additional page data (the pages themselves are in m_pages array) + wxGtkNotebookPagesList m_pagesData; - DECLARE_DYNAMIC_CLASS(wxNotebook) -}; + // for reasons explained in gtk/notebook.cpp we store the current + // selection internally instead of querying the notebook for it + int m_selection; + +protected: + // remove one page from the notebook but do not destroy it + virtual wxNotebookPage *DoRemovePage(int nPage); -// ---------------------------------------------------------------------------- -// event macros -// ---------------------------------------------------------------------------- -typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); - -#define EVT_NOTEBOOK_PAGE_CHANGED(id, fn) \ - { \ - wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, \ - id, \ - -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ - NULL \ - }, - -#define EVT_NOTEBOOK_PAGE_CHANGING(id, fn) \ - { \ - wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ - id, \ - -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ - NULL \ - }, +private: + DECLARE_DYNAMIC_CLASS(wxNotebook) + DECLARE_EVENT_TABLE() +}; #endif // __GTKNOTEBOOKH__