more VC6 fixes: nested value must be real classes, not typedefs; skeleton declaration...

[wxWidgets.git] / include / wx / sizer.h

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 8ecd58f86acc429f0111fb339dbcc04ecb3f2933..125dd55c7f95a8bd19eec4d1d17f338686f39dea 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -604,7 +604,10 @@ public:
     wxSize Fit( wxWindow *window );
     void FitInside( wxWindow *window );
     void SetSizeHints( wxWindow *window );
-    void SetVirtualSizeHints( wxWindow *window );
+#if WXWIN_COMPATIBILITY_2_8
+    // This only calls FitInside() since 2.9
+    wxDEPRECATED( void SetVirtualSizeHints( wxWindow *window ) );
+#endif
 
     wxSizerItemList& GetChildren()
         { return m_children; }
@@ -796,6 +799,7 @@ public:
     wxBoxSizer(int orient)
     {
         m_orient = orient;
+        m_totalProportion = 0;
 
         wxASSERT_MSG( m_orient == wxHORIZONTAL || m_orient == wxVERTICAL,
                       _T("invalid value for wxBoxSizer orientation") );
@@ -899,8 +903,7 @@ protected:
 
     void AdjustPropLastItem(wxSizer *psz, wxSizerItem *itemLast);    
     
-private:
-    DECLARE_DYNAMIC_CLASS(wxWrapSizer);
+    DECLARE_DYNAMIC_CLASS(wxWrapSizer)
 };
 
 //---------------------------------------------------------------------------