X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/106844da7dd52e6423060f6ed08260f0ec896b31..4c200e8d87728306b219822d9c07e28526cd8649:/src/common/wincmn.cpp?ds=inline

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index f894eed073..65d02ccc85 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -634,12 +634,8 @@ wxSize wxWindowBase::DoGetVirtualSize() const
 {
     wxSize  s( GetClientSize() );
 
-    if( m_virtualSize.GetWidth() != -1 )
-        s.SetWidth( m_virtualSize.GetWidth() );
-    if( m_virtualSize.GetHeight() != -1 )
-        s.SetHeight( m_virtualSize.GetHeight() );
-
-    return s;
+    return wxSize( wxMax( m_virtualSize.GetWidth(), s.GetWidth() ),
+                   wxMax( m_virtualSize.GetHeight(), s.GetHeight() ) );
 }
 
 // ----------------------------------------------------------------------------
@@ -1177,7 +1173,9 @@ bool wxWindowBase::TransferDataToWindow()
         if ( validator && !validator->TransferToWindow() )
         {
             wxLogWarning(_("Could not transfer data to window"));
+#if wxUSE_LOG
             wxLog::FlushActive();
+#endif // wxUSE_LOG
 
             return FALSE;
         }