Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/include/wx/window.h b/include/wx/window.h
index e431b9c83ad71be19ee6bfb0894f485fe5512e04..1b7071d6264ab10acb7cec7cca3970463cc4b424 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -298,6 +298,9 @@ public:
     int GetMaxWidth() const { return m_maxWidth; }
     int GetMaxHeight() const { return m_maxHeight; }
 
+        // Override this method to control the values given to Sizers etc.
+    virtual wxSize GetMaxSize() const { return wxSize( m_maxWidth, m_maxHeight ); }
+
     // window state
     // ------------
 
@@ -736,7 +739,7 @@ public:
     virtual bool Layout();
 
         // sizers
-    void SetSizer( wxSizer *sizer );
+    void SetSizer(wxSizer *sizer, bool deleteOld = TRUE );
     wxSizer *GetSizer() const { return m_windowSizer; }
 
     // Track if this window is a member of a sizer
@@ -1077,3 +1080,5 @@ inline int NewControlId() { return wxWindowBase::NewControlId(); }
 
 #endif
     // _WX_WINDOW_H_BASE_
+
+// vi:sts=4:sw=4:et