X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab20a9a95a8bbed75bfc6ecba20f013eb9dcff46..c2bbeff0048b6f02bf1ef41edc6c7a3ce148f907:/include/wx/msw/notebook.h?ds=inline diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 1a5dde10c1..142803edcc 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -15,44 +15,19 @@ #pragma interface "notebook.h" #endif -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- -#ifndef _DYNARRAY_H - #include -#endif //_DYNARRAY_H +#if wxUSE_NOTEBOOK -// This is a work-around for missing defines in gcc-2.95 headers -#ifndef TCS_RIGHT -#define TCS_RIGHT 0x0002 -#endif -#ifndef TCS_VERTICAL -#define TCS_VERTICAL 0x0080 -#endif -#ifndef TCS_BOTTOM -#define TCS_BOTTOM TCS_RIGHT -#endif // ---------------------------------------------------------------------------- -// types +// headers // ---------------------------------------------------------------------------- -// fwd declarations -class WXDLLEXPORT wxImageList; -class WXDLLEXPORT wxWindow; - -// array of notebook pages -typedef wxWindow WXDLLEXPORT wxNotebookPage; // so far, any window can be a page - -WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages); +#include "wx/control.h" // ---------------------------------------------------------------------------- // wxNotebook // ---------------------------------------------------------------------------- -// FIXME 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 @@ -73,8 +48,6 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook"); - // dtor - ~wxNotebook(); // accessors // --------- @@ -85,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; } @@ -101,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; @@ -122,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, @@ -138,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. @@ -155,6 +120,8 @@ public: // base class virtuals // ------------------- virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); + virtual bool MSWOnScroll(int orientation, WXWORD nSBCode, + WXWORD pos, WXHWND control); virtual void SetConstraintSizes(bool recurse = TRUE); virtual bool DoPhase(int nPhase); @@ -162,16 +129,21 @@ protected: // common part of all ctors void Init(); + // translate wxWin styles to the Windows ones + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; + + // 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() }; +#endif // wxUSE_NOTEBOOK + #endif // _NOTEBOOK_H