added wxCRITICAL_SECTION macro

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index ccfb67985b4218f812bda27c0be52275794e93a0..d406d059b6277571fb5008b9a30536be3b0cc7a3 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -2,7 +2,7 @@
 // Name:        sizer.h
 // Purpose:     provide wxSizer class for layouting
 // Author:      Robert Roebling and Robin Dunn
-// Modified by:
+// Modified by: Ron Lee
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robin Dunn, Dirk Holtwick and Robert Roebling
@@ -47,6 +47,8 @@ public:
     wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
 
     ~wxSizerItem();
+    
+    virtual void DeleteWindows();
 
     virtual wxSize GetSize();
     virtual wxSize CalcMin();
@@ -143,6 +145,9 @@ public:
     virtual bool Remove( wxWindow *window );
     virtual bool Remove( wxSizer *sizer );
     virtual bool Remove( int pos );
+    
+    virtual void Clear( bool delete_windows=FALSE );
+    virtual void DeleteWindows();
 
     void SetMinSize( int width, int height )
         { DoSetMinSize( width, height ); }
@@ -180,7 +185,9 @@ public:
     virtual void Layout();
 
     void Fit( wxWindow *window );
+    void FitInside( wxWindow *window );
     void SetSizeHints( wxWindow *window );
+    void SetVirtualSizeHints( wxWindow *window );
 
     wxList& GetChildren()
         { return m_children; }
@@ -195,7 +202,10 @@ protected:
 
     wxSize GetMaxWindowSize( wxWindow *window );
     wxSize GetMinWindowSize( wxWindow *window );
+    wxSize GetMaxClientSize( wxWindow *window );
+    wxSize GetMinClientSize( wxWindow *window );
     wxSize FitSize( wxWindow *window );
+    wxSize VirtualFitSize( wxWindow *window );
 
     virtual void DoSetMinSize( int width, int height );
     virtual bool DoSetItemMinSize( wxWindow *window, int width, int height );