Putting files back in the wxWidgets-$VERSION dir.

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 73d99c2779e7c959afa9e66f9ec3fc440f7c7779..62b49e681561fff90ff23de195ea30772c4540a7 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -678,14 +678,14 @@ private:
 
 #if wxUSE_STATBOX
 
 
 #if wxUSE_STATBOX
 

-#include "wx/statbox.h"
+class WXDLLEXPORT wxStaticBox;

 
 class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
 {
 public:
     wxStaticBoxSizer(wxStaticBox *box, int orient);
     wxStaticBoxSizer(int orient, wxWindow *win, const wxString& label = wxEmptyString);
 
 class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
 {
 public:
     wxStaticBoxSizer(wxStaticBox *box, int orient);
     wxStaticBoxSizer(int orient, wxWindow *win, const wxString& label = wxEmptyString);

-    virtual ~wxStaticBoxSizer() { delete m_staticBox; }
+    virtual ~wxStaticBoxSizer();

 
     void RecalcSizes();
     wxSize CalcMin();
 
     void RecalcSizes();
     wxSize CalcMin();


@@ -695,7 +695,10 @@ public:
 
     // override to hide/show the static box as well
     virtual void ShowItems (bool show);
 
     // override to hide/show the static box as well
     virtual void ShowItems (bool show);

+

     virtual bool Detach( wxWindow *window );
     virtual bool Detach( wxWindow *window );

+    virtual bool Detach( wxSizer *sizer ) { return wxBoxSizer::Detach(sizer); }
+    virtual bool Detach( int index ) { return wxBoxSizer::Detach(index); }

 
 protected:
     wxStaticBox   *m_staticBox;
 
 protected:
     wxStaticBox   *m_staticBox;