X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58d1c1ae86a096d5ef81c692427c238c1eb0e46d..3b322b4a1f58b62393a6531dd4466902df3dbe00:/include/wx/gtk/notebook.h diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index c23be2fe21..6e8a0a1f40 100644 --- a/include/wx/gtk/notebook.h +++ b/include/wx/gtk/notebook.h @@ -16,6 +16,9 @@ #endif #include "wx/defs.h" + +#if wxUSE_NOTEBOOK + #include "wx/object.h" #include "wx/string.h" #include "wx/control.h" @@ -28,42 +31,6 @@ class wxImageList; class wxNotebook; class wxNotebookPage; -// ---------------------------------------------------------------------------- -// notebook events -// ---------------------------------------------------------------------------- - -class wxNotebookEvent : public wxNotifyEvent -{ -public: - wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, - int nSel = -1, int nOldSel = -1) - : 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 - - DECLARE_DYNAMIC_CLASS(wxNotebookEvent) -}; - //----------------------------------------------------------------------------- // wxNotebook //----------------------------------------------------------------------------- @@ -118,7 +85,7 @@ public: // 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; } + wxImageList *GetImageList() const { return m_imageList; } // sets/returns item's image index in the current image list int GetPageImage(int nPage) const; @@ -133,8 +100,7 @@ public: 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) + // sets the size of the tabs (assumes all tabs are the same size) void SetTabSize(const wxSize& sz); // operations @@ -145,64 +111,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 select = FALSE, - int imageId = -1); - // @@@@ VZ: I don't know how to implement InsertPage() + bool AddPage( wxWindow *win, + const wxString& strText, + bool select = FALSE, + int imageId = -1 ); + // the same as AddPage(), but adds it at the specified position + bool InsertPage( int position, + wxWindow *win, + const wxString& strText, + bool bSelect = FALSE, + int imageId = -1 ); // get the panel which represents the given page wxWindow *GetPage(int nPage) const; void OnNavigationKey(wxNavigationKeyEvent& event); - - // implementation - - void SetConstraintSizes(bool recurse); - bool DoPhase(int phase); - void ApplyWidgetStyle(); - // report if window belongs to notebook - bool IsOwnGtkWindow( GdkWindow *window ); + // overridden from wxWindow to make tabbing work + void SetFocus(); + + // implementation + // -------------- + + void SetConstraintSizes(bool recurse); + bool DoPhase(int phase); + void ApplyWidgetStyle(); - // common part of all ctors - void Init(); + // report if window belongs to notebook + bool IsOwnGtkWindow( GdkWindow *window ); - // helper function - wxNotebookPage* GetNotebookPage(int page) const; + // common part of all ctors + void Init(); - wxImageList* m_imageList; - wxList m_pages; - size_t m_idHandler; // the change page handler id + // helper function + wxNotebookPage* GetNotebookPage(int page) const; - DECLARE_DYNAMIC_CLASS(wxNotebook) - DECLARE_EVENT_TABLE() + wxImageList* m_imageList; + wxList m_pages; + int m_lastSelection; /* hack */ + +private: + DECLARE_DYNAMIC_CLASS(wxNotebook) + DECLARE_EVENT_TABLE() }; -// ---------------------------------------------------------------------------- -// 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 \ - }, +#endif #endif // __GTKNOTEBOOKH__