Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[wxWidgets.git] / include / wx / msw / notebook.h

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index ac3a69cb5b5ff2bde7a29a4e661eb125445ab4b8..ceda97127a6604894e47d6182e3a7d8be45dd01f 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -3,7 +3,6 @@
 // Purpose:     MSW/GTK compatible notebook (a.k.a. property sheet)
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin for Windows version
 // Purpose:     MSW/GTK compatible notebook (a.k.a. property sheet)
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin for Windows version

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -96,7 +95,7 @@ public:
                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = false,
                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = false,

-                  int imageId = -1);
+                  int imageId = NO_IMAGE);

 
     // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
     // style.
 
     // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
     // style.


@@ -142,9 +141,6 @@ public:
       return true;
   }
 
       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);
 
   // draw child background
   virtual bool MSWPrintChild(WXHDC hDC, wxWindow *win);
 


@@ -174,6 +170,9 @@ protected:
   void AdjustPageSize(wxNotebookPage *page);
 
 #if wxUSE_UXTHEME
   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();
 
   // gets the bitmap of notebook background and returns a brush from it
   WXHBRUSH QueryBgBitmap();
 


@@ -194,6 +193,9 @@ protected:
 
   // true if we have already subclassed our updown control
   bool m_hasSubclassedUpdown;
 
   // true if we have already subclassed our updown control
   bool m_hasSubclassedUpdown;

+
+  // true if we already refreshed the current page after showing the window
+  bool m_doneUpdateHack;

 #endif // __WXWINCE__
 
 #if wxUSE_UXTHEME
 #endif // __WXWINCE__
 
 #if wxUSE_UXTHEME