SourceForge patch #654210 to fix naming/numbering shared libs under OS X

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index ece3be312ea84cb7147e0c9dfaa5de3f2f3523b9..412f6a2f54e7364eb57d6ed6f115329f9ec0e3e7 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -50,6 +50,10 @@ public:
     
     virtual void DeleteWindows();
 
     
     virtual void DeleteWindows();
 

+    // Enable deleting the SizerItem without destroying the contained sizer.
+    void DetachSizer()
+        { m_sizer = 0; }
+

     virtual wxSize GetSize();
     virtual wxSize CalcMin();
     virtual void SetDimension( wxPoint pos, wxSize size );
     virtual wxSize GetSize();
     virtual wxSize CalcMin();
     virtual void SetDimension( wxPoint pos, wxSize size );


@@ -151,10 +155,17 @@ public:
     virtual void Prepend( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
     virtual void Prepend( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
 
     virtual void Prepend( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
     virtual void Prepend( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
 

+    // Remove will delete a sizer, but not a window.

     virtual bool Remove( wxWindow *window );
     virtual bool Remove( wxSizer *sizer );
     virtual bool Remove( int pos );
     virtual bool Remove( wxWindow *window );
     virtual bool Remove( wxSizer *sizer );
     virtual bool Remove( int pos );

-    
+
+    // Detach will never destroy a sizer or window.
+    virtual bool Detach( wxWindow *window )
+        { return Remove( window ); }
+    virtual bool Detach( wxSizer *sizer );
+    virtual bool Detach( int pos );
+

     virtual void Clear( bool delete_windows=FALSE );
     virtual void DeleteWindows();
 
     virtual void Clear( bool delete_windows=FALSE );
     virtual void DeleteWindows();