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

fixed RR's change of wxSizer::Fit to set client size (r50717) to not be completely broken; it no longer confuses client and window sizes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-02-01 22:28:10 +00:00
parent 920991eeb3
commit 02dc0099cb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/sizer.cpp
View File

@@ -837,7 +837,7 @@ void wxSizer::DeleteWindows()
wxSize wxSizer::Fit( wxWindow *window ) wxSize wxSizer::Fit( wxWindow *window )
{ {
// take the min size by default and limit it by max size // take the min size by default and limit it by max size
wxSize size = GetMinWindowSize(window); wxSize size = GetMinClientSize(window);
wxTopLevelWindow *tlw = wxDynamicCast(window, wxTopLevelWindow); wxTopLevelWindow *tlw = wxDynamicCast(window, wxTopLevelWindow);
if ( tlw ) if ( tlw )
@@ -878,7 +878,7 @@ wxSize wxSizer::Fit( wxWindow *window )
} }
else else
{ {
wxSize sizeMax = GetMaxWindowSize(window); wxSize sizeMax = GetMaxClientSize(window);
if ( sizeMax.x != wxDefaultCoord && size.x > sizeMax.x ) if ( sizeMax.x != wxDefaultCoord && size.x > sizeMax.x )
size.x = sizeMax.x; size.x = sizeMax.x;