X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca8b28f2efff34b9939035a7aeb1de1e3ac98a0c..5a224901b8ede55e1db9980f0fcaf7d2cb49285f:/include/wx/generic/notebook.h diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h index fe6d8c82de..53582ba352 100644 --- a/include/wx/generic/notebook.h +++ b/include/wx/generic/notebook.h @@ -5,7 +5,7 @@ // Modified by: // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_NOTEBOOK_H_ @@ -31,33 +31,12 @@ class WXDLLEXPORT wxImageList; class WXDLLEXPORT wxWindow; +// Already defined in wx/notebook.h +#if 0 // 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; } - - void SetSelection(int sel) { m_nSel = sel; } - void SetOldSelection(int oldSel) { m_nOldSel = oldSel; } - -private: - int m_nSel, // currently selected page - m_nOldSel; // previously selected page - - DECLARE_DYNAMIC_CLASS(wxNotebookEvent) -}; +#endif // ---------------------------------------------------------------------------- // wxNotebook @@ -80,7 +59,7 @@ protected: wxNotebook* m_notebook; }; -class wxNotebook : public wxControl +class wxNotebook : public wxNotebookBase { public: // ctors @@ -89,14 +68,14 @@ public: wxNotebook(); // the same arguments as for wxControl (@@@ any special styles?) wxNotebook(wxWindow *parent, - wxWindowID id, + wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook"); // Create() function bool Create(wxWindow *parent, - wxWindowID id, + wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -106,9 +85,6 @@ public: // accessors // --------- - // get number of pages in the dialog - int GetPageCount() const; - // Find the position of the wxNotebookPage, -1 if not found. int FindPagePosition(wxNotebookPage* page) const; @@ -117,7 +93,7 @@ public: // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events int SetSelection(int nPage); // cycle thru the tabs - void AdvanceSelection(bool bForward = TRUE); + // void AdvanceSelection(bool bForward = TRUE); // get the currently selected page int GetSelection() const { return m_nSelection; } @@ -125,24 +101,14 @@ 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; } + // get the number of rows for a control with wxNB_MULTILINE style (not all + // versions support it - they will always return 1 then) + virtual int GetRowCount() const ; // 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); @@ -162,20 +128,12 @@ public: bool RemovePage(wxNotebookPage* page); // 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 // --------- @@ -184,19 +142,19 @@ public: void OnSelChange(wxNotebookEvent& event); void OnSetFocus(wxFocusEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); - + // base class virtuals // ------------------- virtual void Command(wxCommandEvent& event); virtual void SetConstraintSizes(bool recurse = TRUE); virtual bool DoPhase(int nPhase); -// Implementation + // Implementation // wxNotebook on Motif uses a generic wxTabView to implement itself. - inline wxTabView *GetTabView() const { return m_tabView; } - inline void SetTabView(wxTabView *v) { m_tabView = v; } - + wxTabView *GetTabView() const { return m_tabView; } + void SetTabView(wxTabView *v) { m_tabView = v; } + void OnMouseEvent(wxMouseEvent& event); void OnPaint(wxPaintEvent& event); @@ -213,9 +171,11 @@ protected: // helper functions void ChangePage(int nOldSel, int nSel); // change pages +#if 0 wxImageList *m_pImageList; // we can have an associated image list wxArrayPages m_aPages; // array of pages - +#endif + int m_nSelection; // the current selection (-1 if none) wxTabView* m_tabView; @@ -224,52 +184,4 @@ protected: DECLARE_EVENT_TABLE() }; -// ---------------------------------------------------------------------------- -// event macros -// ---------------------------------------------------------------------------- -typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); - -// Because of name truncation! -#if defined(__BORLANDC__) && defined(__WIN16__) - -#define EVT_NOTEBOOK_PAGE_CHANGED(id, fn) \ - { \ - wxEVT_COMMAND_NB_PAGE_CHANGED, \ - id, \ - -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ - NULL \ - }, - -#define EVT_NOTEBOOK_PAGE_CHANGING(id, fn) \ - { \ - wxEVT_COMMAND_NB_PAGE_CHANGING, \ \ - id, \ - -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ - NULL \ - }, - -#else - -#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 // _WX_NOTEBOOK_H_