Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-12-21 22:49:58 +00:00
parent 7d616e99ed
commit 5e1a9f05c7
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/xrc/xh_sizer.cpp
View File

@@ -27,6 +27,7 @@
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/button.h" #include "wx/button.h"
#include "wx/scrolwin.h"
#endif #endif
#include "wx/gbsizer.h" #include "wx/gbsizer.h"
@@ -236,7 +237,16 @@ wxObject* wxSizerXmlHandler::Handle_sizer()
wxXmlNode *nd = m_node; wxXmlNode *nd = m_node;
m_node = parentNode; m_node = parentNode;
if (GetSize() == wxDefaultSize) 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; m_node = nd;
if (m_parentAsWindow->IsTopLevel()) if (m_parentAsWindow->IsTopLevel())