X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07c19327922deabc5f140ea3659e65e1c37a5d65..a84d5f9da10b3bed2a1421dd8db0e3fdc0d35daa:/include/wx/msw/notebook.h

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 7261a747a5..291c681ea9 100644
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -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,9 +179,6 @@ public:
 
       return true;
   }
-
-  virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindow *win);
-  virtual wxColour MSWGetBgColourForChild(wxWindow *win);
 #endif // wxUSE_UXTHEME
 
 protected:
@@ -198,25 +191,43 @@ protected:
   // remove one page from the notebook, without deleting
   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);
 
 #if wxUSE_UXTHEME
-  // this is a slightly ugly function which gets the bitmap of notebook
-  // background and either returns the colour under the specified window in it
-  // or creates a brush from it
-  //
-  // so if win == NULL, a brush is created and returned
-  //       win != NULL, returns COLORREF of the pixel under its top left corner
-  WXHANDLE QueryBgBitmap(wxWindow *win = NULL);
+  // 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();
 
-  // paint themed children background here
-  virtual bool MSWPrintChild(wxWindow *win, WXWPARAM wParam, WXLPARAM lParam);
+  // 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;