fixed XRC handler for sizers to do the expected thing when putting controls into wxScrolledWindow: let them determine virtual size, not real size

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@50880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-12-21 22:50:35 +00:00
parent 16fb9e58c1
commit 7d840762c6

View File

@@ -27,6 +27,7 @@
#include "wx/frame.h"
#include "wx/dialog.h"
#include "wx/button.h"
#include "wx/scrolwin.h"
#endif
#include "wx/gbsizer.h"
@@ -237,7 +238,16 @@ wxObject* wxSizerXmlHandler::Handle_sizer()
wxXmlNode *nd = m_node;
m_node = parentNode;
if (GetSize() == wxDefaultSize)
sizer->Fit(m_parentAsWindow);
{
if ( wxDynamicCast(m_parentAsWindow, wxScrolledWindow) != NULL )
{
sizer->FitInside(m_parentAsWindow);
}
else
{
sizer->Fit(m_parentAsWindow);
}
}
m_node = nd;
if (m_parentAsWindow->GetWindowStyle() & (wxMAXIMIZE_BOX | wxRESIZE_BORDER))