X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66cf41cb6c05111e223deec793160446937262e4..9ca5a18a01a7d87870427cb0fc1962db2f11a45d:/src/msw/listbox.cpp

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 1b5d0e4819..5f27c25a6e 100644
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -43,10 +43,6 @@
     #include  "wx/ownerdrw.h"
 #endif
 
-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxListBoxStyle )
 
@@ -687,6 +683,9 @@ wxSize wxListBox::DoGetBestSize() const
 
     wListbox += 3*cx;
 
+    // Add room for the scrollbar
+    wListbox += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+
     // don't make the listbox too tall (limit height to 10 items) but don't
     // make it too small neither
     int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*