From eb6c4508c9b76a0636bd9d970aa37fd5f5a72d7f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 14 Sep 2003 19:52:46 +0000
Subject: [PATCH] account for the scrollbars in GetViewRect()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/listctrl.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 583333642a..750e3a7222 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -3800,11 +3800,16 @@ wxRect wxListMainWindow::GetViewRect() const
         }
     }
 
-#if 0
-    // account for the scrollbar
-    yMax += wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
-    xMax += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
-#endif
+    // some fudge needed to make it look prettier
+    xMax += EXTRA_WIDTH;
+    yMax += EXTRA_HEIGHT;
+
+    // account for the scrollbars if necessary
+    const wxSize sizeAll = GetClientSize();
+    if ( xMax > sizeAll.x )
+        yMax += wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
+    if ( yMax > sizeAll.y )
+        xMax += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
 
     return wxRect(0, 0, xMax, yMax);
 }
-- 
2.45.2