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

corrected DoGetVirtualSize() to return at least our real size

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-12-17 19:19:45 +00:00
parent 9347ef2f59
commit 143e2719f5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/wincmn.cpp
View File

@@ -834,14 +834,14 @@ void wxWindowBase::DoSetVirtualSize( int x, int y )
wxSize wxWindowBase::DoGetVirtualSize() const wxSize wxWindowBase::DoGetVirtualSize() const
{ {
if ( m_virtualSize.IsFullySpecified() ) // we should use the entire client area so if it is greater than our
return m_virtualSize; // virtual size, expand it to fit (otherwise if the window is big enough we
// wouldn't be using parts of it)
wxSize size = GetClientSize(); wxSize size = GetClientSize();
if ( m_virtualSize.x != wxDefaultCoord ) if ( m_virtualSize.x > size.x )
size.x = m_virtualSize.x; size.x = m_virtualSize.x;
if ( m_virtualSize.y != wxDefaultCoord ) if ( m_virtualSize.y >= size.y )
size.y = m_virtualSize.y; size.y = m_virtualSize.y;
return size; return size;