From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 11 Sep 2009 08:55:59 +0000 (+0000)
Subject: Fix on Mac to prevent scrollbars always being shown
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a44c4abe5e4382ad377e3e152bb99d31823789a5

Fix on Mac to prevent scrollbars always being shown


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 1d912e19c0..83dc7cbb95 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -760,6 +760,11 @@ wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int
             height = maxHeight;
 
         int totalHeight = GetTotalHeight(); // + 3;
+
+        // Take borders into account on Mac or scrollbars always appear
+#if defined(__WXMAC__)
+        totalHeight += 2;
+#endif
         if ( height >= totalHeight )
         {
             height = totalHeight;