X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/072c5412c2f89e31255ba06d55f25c743b7bc15a..95561ddfc3c0c84c71316d40cb539135fa68b440:/include/wx/window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index b754c4ac8e..d081cd409c 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -931,17 +931,7 @@ public:
     wxSizer *GetSizer() const { return m_windowSizer; }
 
     // Track if this window is a member of a sizer
-    void SetContainingSizer(wxSizer* sizer)
-    {
-        // adding a window to a sizer twice is going to result in fatal and
-        // hard to debug problems later because when deleting the second
-        // associated wxSizerItem we're going to dereference a dangling
-        // pointer; so try to detect this as early as possible
-        wxASSERT_MSG( !sizer || m_containingSizer != sizer,
-                        _T("Adding a window to the same sizer twice?") );
-
-        m_containingSizer = sizer;
-    }
+    void SetContainingSizer(wxSizer* sizer);
     wxSizer *GetContainingSizer() const { return m_containingSizer; }
 
     // accessibility
@@ -999,11 +989,6 @@ public:
     wxWindow *GetAncestorWithCustomPalette() const;
 #endif // wxUSE_PALETTE
 
-protected:
-    // event handling specific to wxWindow
-    virtual bool TryValidator(wxEvent& event);
-    virtual bool TryParent(wxEvent& event);
-
     // inherit the parents visual attributes if they had been explicitly set
     // by the user (i.e. we don't inherit default attributes) and if we don't
     // have our own explicitly set
@@ -1016,6 +1001,11 @@ protected:
     // behaviour in the most common case
     virtual bool ShouldInheritColours() const { return false; }
 
+protected:
+    // event handling specific to wxWindow
+    virtual bool TryValidator(wxEvent& event);
+    virtual bool TryParent(wxEvent& event);
+
 
 #if wxUSE_CONSTRAINTS
     // satisfy the constraints for the windows but don't set the window sizes
@@ -1121,6 +1111,9 @@ protected:
     wxAccessible*       m_accessible;
 #endif
 
+    // Initial window size, used as minimal size in Sizers
+    wxSize              m_initialSize;
+    
     // Virtual size (scrolling)
     wxSize                m_virtualSize;