X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc8793f4d2b217f1b08d8363c717baa5f078d019..d65e9d5707e2e80127ef85927d191c4911169f13:/include/wx/msw/notebook.h diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index fa7da1658c..ac3a69cb5b 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -23,41 +23,7 @@ // wxNotebook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebookPageInfo : public wxObject -{ -public : - wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; } - virtual ~wxNotebookPageInfo() { } - - void Create(wxNotebookPage *page, - const wxString& text, - bool selected, - int imageId) - { - m_page = page; - m_text = text; - m_selected = selected; - m_imageId = imageId; - } - - wxNotebookPage* GetPage() const { return m_page; } - wxString GetText() const { return m_text; } - bool GetSelected() const { return m_selected; } - int GetImageId() const { return m_imageId; } - -private: - wxNotebookPage *m_page; - wxString m_text; - bool m_selected; - int m_imageId; - - DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo) -}; - - -WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList ); - -class WXDLLEXPORT wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // ctors @@ -86,11 +52,12 @@ public: virtual size_t GetPageCount() const; // set the currently selected page, return the index of the previously - // selected one (or -1 on error) + // selected one (or wxNOT_FOUND on error) // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events int SetSelection(size_t nPage); - // get the currently selected page - int GetSelection() const { return m_nSelection; } + + // changes selected page without sending events + int ChangeSelection(size_t nPage); // set/get the title of a page bool SetPageText(size_t nPage, const wxString& strText); @@ -131,9 +98,6 @@ public: bool bSelect = false, int imageId = -1); - void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ); } - const wxNotebookPageInfoList& GetPageInfos() const; - // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH // style. void SetTabSize(const wxSize& sz); @@ -147,7 +111,6 @@ public: // callbacks // --------- void OnSize(wxSizeEvent& event); - void OnSelChange(wxNotebookEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); // base class virtuals @@ -156,7 +119,6 @@ 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); @@ -181,10 +143,12 @@ public: } // return the themed brush for painting our children - virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, WXHWND hWnd); + virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindow *child); // draw child background virtual bool MSWPrintChild(WXHDC hDC, wxWindow *win); + + virtual bool MSWHasInheritableBackground() const { return true; } #endif // wxUSE_UXTHEME // translate wxWin styles to the Windows ones @@ -194,6 +158,10 @@ protected: // common part of all ctors void Init(); + // hides the currently shown page and shows the given one (if not -1) and + // updates m_selection accordingly + void UpdateSelection(int selNew); + // remove one page from the notebook, without deleting virtual wxNotebookPage *DoRemovePage(size_t nPage); @@ -228,11 +196,6 @@ protected: bool m_hasSubclassedUpdown; #endif // __WXWINCE__ - // the current selection (-1 if none) - int m_nSelection; - - wxNotebookPageInfoList m_pageInfos; - #if wxUSE_UXTHEME // background brush used to paint the tab control WXHBRUSH m_hbrBackground;