X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5ad6961eb70a65860bf458fff694be554acd0e7..bfb9ee966d5d1f29e49f38e340812ade4b3cc956:/include/wx/msw/notebook.h diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index aa4186379f..fde5197f80 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -5,7 +5,7 @@ // Modified by: Vadim Zeitlin for Windows version // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifndef _NOTEBOOK_H @@ -18,51 +18,32 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifndef _DYNARRAY_H - #include -#endif //_DYNARRAY_H + +#include "wx/control.h" +#include "wx/dynarray.h" // ---------------------------------------------------------------------------- // types // ---------------------------------------------------------------------------- // fwd declarations -class wxImageList; -class wxWindow; +class WXDLLEXPORT wxImageList; +class WXDLLEXPORT wxWindow; // array of notebook pages +//typedef wxWindow WXDLLEXPORT wxNotebookPage; // so far, any window can be a page 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(WXTYPE 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) -}; +WX_DEFINE_EXPORTED_ARRAY(wxNotebookPage *, wxArrayPages); // ---------------------------------------------------------------------------- // 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 wxNotebook : public wxControl +// 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 { public: // ctors @@ -71,14 +52,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, @@ -111,6 +92,7 @@ public: // 3) set for each page it's image // associate image list with a control void SetImageList(wxImageList* imageList); + void AssignImageList(wxImageList* imageList); // get pointer (may be NULL) to the associated image list wxImageList* GetImageList() const { return m_pImageList; } @@ -118,11 +100,6 @@ public: int GetPageImage(int nPage) const; bool SetPageImage(int nPage, int nImage); - // each page can have some user-defined data associated with it: - // set/retrieve this pointer - bool SetPageData(int nPage, void* data); - void* GetPageData(int nPage) const; - // currently it's always 1 because wxGTK doesn't support multi-row // tab controls int GetRowCount() const; @@ -137,6 +114,8 @@ 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, @@ -144,27 +123,32 @@ public: bool AddPage(wxNotebookPage *pPage, const wxString& strText, bool bSelect = FALSE, - int imageId = -1, - void* data = NULL); + 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, - void* data = NULL); + 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. + void SetTabSize(const wxSize& sz); + // callbacks // --------- void OnSize(wxSizeEvent& event); void OnSelChange(wxNotebookEvent& event); - + void OnSetFocus(wxFocusEvent& event); + void OnNavigationKey(wxNavigationKeyEvent& event); + // base class virtuals // ------------------- - virtual void Command(wxCommandEvent& event); - virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam); + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); + virtual void SetConstraintSizes(bool recurse = TRUE); + virtual bool DoPhase(int nPhase); protected: // common part of all ctors @@ -172,9 +156,9 @@ protected: // helper functions void ChangePage(int nOldSel, int nSel); // change pages - void FitPage(wxNotebookPage *pPage); // fit a page in the tab control wxImageList *m_pImageList; // we can have an associated image list + bool m_bOwnsImageList; wxArrayPages m_aPages; // array of pages int m_nSelection; // the current selection (-1 if none) @@ -183,27 +167,4 @@ 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 // _NOTEBOOK_H