X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b8797d96ca1d94443bd2201e9884fc9a16cb53bb..659ca93c425faabda30fce9dee68b38cb6868d14:/include/wx/msw/notebook.h?ds=sidebyside diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 2dfa4337e8..a62f72f6b0 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -23,40 +23,6 @@ // wxNotebook // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE 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 WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: @@ -86,11 +52,9 @@ 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); @@ -132,10 +96,7 @@ public: wxNotebookPage *pPage, const wxString& strText, bool bSelect = false, - int imageId = -1); - - void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ); } - const wxNotebookPageInfoList& GetPageInfos() const; + int imageId = NO_IMAGE); // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH // style. @@ -150,7 +111,6 @@ public: // callbacks // --------- void OnSize(wxSizeEvent& event); - void OnSelChange(wxBookCtrlEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); // base class virtuals @@ -182,11 +142,10 @@ public: return true; } - // return the themed brush for painting our children - 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 @@ -197,7 +156,7 @@ protected: void Init(); // hides the currently shown page and shows the given one (if not -1) and - // updates m_nSelection accordingly + // updates m_selection accordingly void UpdateSelection(int selNew); // remove one page from the notebook, without deleting @@ -212,6 +171,9 @@ protected: void AdjustPageSize(wxNotebookPage *page); #if wxUSE_UXTHEME + // return the themed brush for painting our children + virtual WXHBRUSH MSWGetCustomBgBrush() { return m_hbrBackground; } + // gets the bitmap of notebook background and returns a brush from it WXHBRUSH QueryBgBitmap(); @@ -232,12 +194,10 @@ protected: // true if we have already subclassed our updown control bool m_hasSubclassedUpdown; -#endif // __WXWINCE__ - - // the current selection (-1 if none) - int m_nSelection; - wxNotebookPageInfoList m_pageInfos; + // true if we already refreshed the current page after showing the window + bool m_doneUpdateHack; +#endif // __WXWINCE__ #if wxUSE_UXTHEME // background brush used to paint the tab control