X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d9669450d562d13bb2d252444a57738a8f1c5e5..8ffd43c56b793781fde046aa532340b92a0067eb:/include/wx/msw/notebook.h?ds=sidebyside diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index c4ebd06ffe..3f4697fab9 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -27,22 +27,33 @@ // ---------------------------------------------------------------------------- // fwd declarations -class wxImageList; -class wxWindow; +class WXDLLEXPORT wxImageList; +class WXDLLEXPORT wxWindow; // array of notebook pages -typedef wxWindow wxNotebookPage; // so far, any window can be a page +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 + // ---------------------------------------------------------------------------- // notebook events // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent +class WXDLLEXPORT wxNotebookEvent : public wxNotifyEvent { public: wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int nSel = -1, int nOldSel = -1) - : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; } + : wxNotifyEvent(commandType, id) + { + m_nSel = nSel; + m_nOldSel = nOldSel; + } // accessors // the currently selected page (-1 if none) @@ -136,6 +147,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, @@ -153,17 +166,22 @@ public: // 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); + void OnEraseBackground(wxEraseEvent& event); // base class virtuals // ------------------- virtual void Command(wxCommandEvent& event); - virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam); + virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result); virtual void SetConstraintSizes(bool recurse = TRUE); virtual bool DoPhase(int nPhase); @@ -199,7 +217,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn) \ { \ - wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ \ + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ id, \ -1, \ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \