X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cb172b4f12fae80b06d5936108a1bc7f2521674..30a72e62977e4c532ae2f265db72535a5cccbbab:/src/univ/winuniv.cpp?ds=inline

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 5066ebe080..b3d73e3ed4 100644
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     06.08.00
 // RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -482,6 +482,15 @@ wxPoint wxWindow::GetClientAreaOrigin() const
 
 void wxWindow::DoGetClientSize(int *width, int *height) const
 {
+    // if it is a native window, we assume it handles the scrollbars itself
+    // too - and if it doesn't, there is not much we can do
+    if ( !m_renderer )
+    {
+        wxWindowNative::DoGetClientSize(width, height);
+
+        return;
+    }
+
     int w, h;
     wxWindowNative::DoGetClientSize(&w, &h);