allow adjusting the combo button size (patch 1489452)

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

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 09bd64340ec97898ad7d6a1df4aae6f30d0bf16f..b8b9051a62745f45f4776f24efacb5c5cf4f0939 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -807,9 +807,13 @@ void wxComboControlBase::CalculateAreas( int btnWidth )
     bool buttonOutside;
     int btnBorder; // border for button only
 
-    if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) || m_blankButtonBg ) &&
-         m_btnSpacingX == 0 && m_btnWid == 0 && m_btnHei == 0 &&
-         (!m_bmpNormal.Ok() || m_blankButtonBg) )
+    // check if button should really be outside the border: we'll do it it if
+    // its platform default or bitmap+pushbutton background is used, but not if
+    // there is vertical size adjustment or horizontal spacing.
+    if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ||
+                (m_bmpNormal.Ok() && m_blankButtonBg) ) &&
+         m_btnSpacingX == 0 &&
+         m_btnHei == 0 )
     {
         buttonOutside = true;
         m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;