wxStdButtonSizer Finalise --> Realize

[wxWidgets.git] / src / common / wincmn.cpp

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 99ae3cd923d768f74dd8050108ba38c47f128d5a..a6a6360864aa2c6d669940d5812d6c0ffb690ec0 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -699,7 +699,7 @@ void wxWindowBase::SetBestFittingSize(const wxSize& size)
 // by default the origin is not shifted
 wxPoint wxWindowBase::GetClientAreaOrigin() const
 {
-    return wxPoint();
+    return wxPoint(0,0);
 }
 
 // set the min/max size of the window
@@ -789,10 +789,10 @@ void wxWindowBase::DoSetVirtualSize( int x, int y )
 
 wxSize wxWindowBase::DoGetVirtualSize() const
 {
-    wxSize  s( GetClientSize() );
+    if (m_virtualSize == wxDefaultSize)
+        return GetClientSize();
 
-    return wxSize( wxMax( m_virtualSize.GetWidth(), s.GetWidth() ),
-                   wxMax( m_virtualSize.GetHeight(), s.GetHeight() ) );
+    return m_virtualSize;
 }
 
 // ----------------------------------------------------------------------------