Keep track of the initial size that the window was created with, and

when the window is added to a sizer use that size with SetSizeHints.
This is to fix problems resulting from the previous change where
SetSizeHints was called with the initial size from CreateBase.

Also, Patch [ 934677 ] wxWindowBase::DoGetBestSize() should exclude hidden windows


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-04-14 22:40:14 +00:00
parent dd05f81195
commit 1ebfafde51
2 changed files with 31 additions and 20 deletions

View File

@@ -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
@@ -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;