]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/wincmn.cpp
Printing update for Pango (GTK2 and X11-Unicode).
[wxWidgets.git] / src / common / wincmn.cpp
index aa805541dab4eed34953bd7f7e5afa5a6d20c4d7..65d02ccc85920b0fa2d07eaaa038a1215fa64dc8 100644 (file)
@@ -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() ) );
 }
 
 // ----------------------------------------------------------------------------