X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/254fbd140e67b60f46d7380c6ac242110ddd7585..2209baaee3a8578450e204593b79ed155f340f68:/include/wx/msw/notebook.h diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 90c0fc7b81..fa7da1658c 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/notebook.h +// Name: wx/msw/notebook.h // Purpose: MSW/GTK compatible notebook (a.k.a. property sheet) // Author: Robert Roebling // Modified by: Vadim Zeitlin for Windows version @@ -11,10 +11,6 @@ #ifndef _NOTEBOOK_H #define _NOTEBOOK_H -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "notebook.h" -#endif - #if wxUSE_NOTEBOOK // ---------------------------------------------------------------------------- @@ -183,15 +179,21 @@ public: return true; } + + // 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); #endif // wxUSE_UXTHEME + // translate wxWin styles to the Windows ones + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; + protected: // common part of all ctors void Init(); - // translate wxWin styles to the Windows ones - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; - // remove one page from the notebook, without deleting virtual wxNotebookPage *DoRemovePage(size_t nPage); @@ -210,18 +212,22 @@ protected: // 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; @@ -232,11 +238,6 @@ protected: WXHBRUSH m_hbrBackground; #endif // wxUSE_UXTHEME - // No need to optimize for WinCE -#ifndef __WXWINCE__ - void OnEraseBackground(wxEraseEvent& event); - void OnPaint(wxPaintEvent& event); -#endif DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebook) DECLARE_EVENT_TABLE()