X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15aad3b9386e52524eefbd2619571a038070419b..46d492a879f7fec474c0847dd0637593453746eb:/include/wx/msw/notebook.h diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 635e8cb571..6e19b04fa3 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -49,9 +49,7 @@ private : } ; -WX_DECLARE_LIST(wxNotebookPageInfo, wxNotebookPageInfoList); -// WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList ); -// WX_DECLARE_LIST_3(wxNotebookPageInfo, wxNotebookPageInfo, wxNotebookPageInfoList, wxNotebookPageInfoListNode, class WXDLLEXPORT); +WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList ); class WXDLLEXPORT wxNotebook : public wxNotebookBase { @@ -78,7 +76,7 @@ public: // accessors // --------- // get number of pages in the dialog - int GetPageCount() const; + virtual size_t GetPageCount() const; // set the currently selected page, return the index of the previously // selected one (or -1 on error) @@ -149,7 +147,6 @@ public: // --------- void OnSize(wxSizeEvent& event); void OnSelChange(wxNotebookEvent& event); - void OnSetFocus(wxFocusEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); // base class virtuals @@ -158,6 +155,7 @@ public: virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnScroll(int orientation, WXWORD nSBCode, WXWORD pos, WXHWND control); + virtual bool MSWTranslateMessage(WXMSG *wxmsg); #if wxUSE_CONSTRAINTS virtual void SetConstraintSizes(bool recurse = TRUE); @@ -177,8 +175,10 @@ protected: // set the size of the given page to fit in the notebook void AdjustPageSize(wxNotebookPage *page); - // override WndProc - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + // override WndProc. +#if wxUSE_UXTHEME + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); +#endif // the current selection (-1 if none) int m_nSelection;