X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8acd402fb0496fb48f7af7c2cfc793e445b3eae3..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/msw/notebook.h?ds=sidebyside diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 51b0056284..483eecbeb2 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -30,28 +30,36 @@ class WXDLLEXPORT wxNotebookPageInfo : public wxObject { public : - wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; } + 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 ; } + 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) ; -} ; +private: + wxNotebookPage *m_page; + wxString m_text; + bool m_selected; + int m_imageId; + + DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo) +}; -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 { @@ -66,30 +74,31 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME); + const wxString& name = wxNotebookNameStr); // Create() function bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME); + const wxString& name = wxNotebookNameStr); + virtual ~wxNotebook(); // 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) // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(int nPage); + int SetSelection(size_t nPage); // get the currently selected page int GetSelection() const { return m_nSelection; } // set/get the title of a page - bool SetPageText(int nPage, const wxString& strText); - wxString GetPageText(int nPage) const; + bool SetPageText(size_t nPage, const wxString& strText); + wxString GetPageText(size_t nPage) const; // image list stuff: each page may have an image associated with it. All // the images belong to an image list, so you have to @@ -100,8 +109,8 @@ public: void SetImageList(wxImageList* imageList); // sets/returns item's image index in the current image list - int GetPageImage(int nPage) const; - bool SetPageImage(int nPage, int nImage); + int GetPageImage(size_t nPage) const; + bool SetPageImage(size_t nPage, int nImage); // currently it's always 1 because wxGTK doesn't support multi-row // tab controls @@ -113,9 +122,6 @@ public: // set the padding between tabs (in pixels) void SetPadding(const wxSize& padding); - // Windows only: attempts to get colour for UX theme page background - wxColour GetThemeBackgroundColour(); - // operations // ---------- // remove all pages @@ -123,22 +129,19 @@ public: // inserts a new page to the notebook (it will be deleted ny the notebook, // don't delete it yourself). If bSelect, this page becomes active. - bool InsertPage(int nPage, + bool InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, - bool bSelect = FALSE, + bool bSelect = false, int imageId = -1); - void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ) ; } - const wxNotebookPageInfoList& GetPageInfos() const ; + 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); - // Windows only: attempts to apply the UX theme page background to this page - void ApplyThemeBackground(wxWindow* window, const wxColour& colour); - // hit test virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; @@ -149,7 +152,6 @@ public: // --------- void OnSize(wxSizeEvent& event); void OnSelChange(wxNotebookEvent& event); - void OnSetFocus(wxFocusEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); // base class virtuals @@ -158,12 +160,31 @@ 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); + virtual void SetConstraintSizes(bool recurse = true); virtual bool DoPhase(int nPhase); #endif // wxUSE_CONSTRAINTS + // Attempts to get colour for UX theme page background + wxColour GetThemeBackgroundColour() const; + + // implementation only + // ------------------- + +#if wxUSE_UXTHEME + virtual bool SetBackgroundColour(const wxColour& colour) + { + if ( !wxNotebookBase::SetBackgroundColour(colour) ) + return false; + + UpdateBgBrush(); + + return true; + } +#endif // wxUSE_UXTHEME + protected: // common part of all ctors void Init(); @@ -172,18 +193,54 @@ protected: virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; // remove one page from the notebook, without deleting - virtual wxNotebookPage *DoRemovePage(int nPage); + virtual wxNotebookPage *DoRemovePage(size_t nPage); + + // get the page rectangle for the current notebook size + // + // returns empty rectangle if an error occurs, do test for it + wxRect GetPageSize() const; // 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); +#if wxUSE_UXTHEME + // gets the bitmap of notebook background and returns a brush from it + WXHBRUSH QueryBgBitmap(); + + // creates the brush to be used for drawing the tab control background + void UpdateBgBrush(); + + // return the themed brush for painting our children + virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, WXHWND hWnd); + + // draw child background + virtual bool MSWPrintChild(WXHDC hDC, wxWindow *win); + + // common part of QueryBgBitmap() and MSWPrintChild() + // + // if child == NULL, draw background for the entire notebook itself + bool DoDrawBackground(WXHDC hDC, wxWindow *child = NULL); +#endif // wxUSE_UXTHEME + + // these function are only used for reducing flicker on notebook resize and + // we don't need to do this for WinCE +#ifndef __WXWINCE__ + void OnEraseBackground(wxEraseEvent& event); + void OnPaint(wxPaintEvent& event); + + // 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 ; + wxNotebookPageInfoList m_pageInfos; + +#if wxUSE_UXTHEME + // background brush used to paint the tab control + WXHBRUSH m_hbrBackground; +#endif // wxUSE_UXTHEME DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebook)