X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58a8ab88685a72ac030d5e2ade62b4d796f11bed..2b260bc3e2f269de090eefdaefc1450207a7734e:/include/wx/msw/notebook.h?ds=sidebyside diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 3f4697fab9..3681ff38cc 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -15,69 +15,19 @@ #pragma interface "notebook.h" #endif -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- -#ifndef _DYNARRAY_H - #include -#endif //_DYNARRAY_H - -// ---------------------------------------------------------------------------- -// types -// ---------------------------------------------------------------------------- - -// fwd declarations -class WXDLLEXPORT wxImageList; -class WXDLLEXPORT wxWindow; - -// array of notebook pages -typedef wxWindow WXDLLEXPORT wxNotebookPage; // so far, any window can be a page - -#undef WXDLLEXPORTLOCAL -#define WXDLLEXPORTLOCAL WXDLLEXPORT - -WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages); - -#undef WXDLLEXPORTLOCAL -#define WXDLLEXPORTLOCAL +#if wxUSE_NOTEBOOK // ---------------------------------------------------------------------------- -// notebook events +// headers // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebookEvent : public wxNotifyEvent -{ -public: - wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, - int nSel = -1, int nOldSel = -1) - : wxNotifyEvent(commandType, id) - { - m_nSel = nSel; - m_nOldSel = nOldSel; - } - // accessors - // the currently selected page (-1 if none) - int GetSelection() const { return m_nSel; } - void SetSelection(int nSel) { m_nSel = nSel; } - // the page that was selected before the change (-1 if none) - int GetOldSelection() const { return m_nOldSel; } - void SetOldSelection(int nOldSel) { m_nOldSel = nOldSel; } - -private: - int m_nSel, // currently selected page - m_nOldSel; // previously selected page - - DECLARE_DYNAMIC_CLASS(wxNotebookEvent) -}; +#include "wx/control.h" // ---------------------------------------------------------------------------- // wxNotebook // ---------------------------------------------------------------------------- -// @@@ 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 WXDLLEXPORT wxNotebook : public wxControl +class WXDLLEXPORT wxNotebook : public wxNotebookBase { public: // ctors @@ -98,8 +48,6 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook"); - // dtor - ~wxNotebook(); // accessors // --------- @@ -110,8 +58,6 @@ public: // 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; } @@ -126,8 +72,6 @@ public: // 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; @@ -147,8 +91,6 @@ public: // ---------- // 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, @@ -163,8 +105,6 @@ public: 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]; } // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH // style. @@ -176,12 +116,10 @@ public: void OnSelChange(wxNotebookEvent& event); void OnSetFocus(wxFocusEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); - void OnEraseBackground(wxEraseEvent& event); // base class virtuals // ------------------- - virtual void Command(wxCommandEvent& event); - virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result); + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual void SetConstraintSizes(bool recurse = TRUE); virtual bool DoPhase(int nPhase); @@ -189,39 +127,18 @@ protected: // common part of all ctors void Init(); + // remove one page from the notebook, without deleting + virtual wxNotebookPage *DoRemovePage(int nPage); + // helper functions void ChangePage(int nOldSel, int nSel); // change 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) 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 // wxUSE_NOTEBOOK #endif // _NOTEBOOK_H