X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..b85a6d855bc7df5b2727c467a18c5e55f1f6754f:/include/wx/mac/notebook.h?ds=sidebyside diff --git a/include/wx/mac/notebook.h b/include/wx/mac/notebook.h index 0e43da55d8..ca4338f619 100644 --- a/include/wx/mac/notebook.h +++ b/include/wx/mac/notebook.h @@ -18,9 +18,7 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#include "wx/dynarray.h" #include "wx/event.h" -#include "wx/control.h" // ---------------------------------------------------------------------------- // types @@ -30,31 +28,6 @@ class WXDLLEXPORT wxImageList; class WXDLLEXPORT wxWindow; -// array of notebook pages -typedef wxWindow wxNotebookPage; // so far, any window can be a page -WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages); - -// ---------------------------------------------------------------------------- -// notebook events -// ---------------------------------------------------------------------------- -class WXDLLEXPORT 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 - - DECLARE_DYNAMIC_CLASS(wxNotebookEvent) -}; - // ---------------------------------------------------------------------------- // wxNotebook // ---------------------------------------------------------------------------- @@ -62,7 +35,7 @@ private: // @@@ this class should really derive from wxTabCtrl, but the interface is not // exactly the same, so I can't do it right now and instead we reimplement // part of wxTabCtrl here -class wxNotebook : public wxControl +class wxNotebook : public wxNotebookBase { public: // ctors @@ -88,15 +61,10 @@ public: // 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 { return m_nSelection; } @@ -104,53 +72,44 @@ 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_pImageList; } - // 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); + virtual void SetPageSize(const wxSize& size); // set the padding between tabs (in pixels) - void SetPadding(const wxSize& padding); + virtual void SetPadding(const wxSize& padding); + // sets the size of the tabs (assumes all tabs are the same size) + virtual void SetTabSize(const wxSize& sz); + +/* + // get number of pages in the dialog + int GetPageCount() const; + + // cycle thru the tabs + void AdvanceSelection(bool bForward = TRUE); + + // currently it's always 1 because wxGTK doesn't support multi-row + // tab controls + int GetRowCount() const; +*/ // operations // ---------- - // remove one page from the notebook - bool DeletePage(int nPage); - // remove one page from the notebook, without deleting - bool RemovePage(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(wxNotebookPage *pPage, - const wxString& strText, - bool bSelect = FALSE, - int imageId = -1); // the same as AddPage(), but adds it at the specified position bool InsertPage(int nPage, wxNotebookPage *pPage, const wxString& strText, bool bSelect = FALSE, int imageId = -1); +/* // get the panel which represents the given page wxNotebookPage *GetPage(int nPage) { return m_aPages[nPage]; } - +*/ // callbacks // --------- void OnSize(wxSizeEvent& event); @@ -158,22 +117,31 @@ public: void OnSetFocus(wxFocusEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); - // base class virtuals - // ------------------- - virtual void Command(wxCommandEvent& event); + + // implementation + // -------------- + +#if wxUSE_CONSTRAINTS virtual void SetConstraintSizes(bool recurse = TRUE); virtual bool DoPhase(int nPhase); +#endif + + // base class virtuals + // ------------------- + virtual void Command(wxCommandEvent& event); protected: - virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ; + virtual wxNotebookPage *DoRemovePage(int page) ; + virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ; // common part of all ctors void Init(); // helper functions void ChangePage(int nOldSel, int nSel); // change pages + void MacSetupTabs(); - wxImageList *m_pImageList; // we can have an associated image list - wxArrayPages m_aPages; // array of pages +// wxImageList *m_pImageList; // we can have an associated image list +// wxArrayPages m_aPages; // array of pages int m_nSelection; // the current selection (-1 if none) @@ -181,27 +149,5 @@ protected: 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 // _WX_NOTEBOOK_H_