Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow adjusting the combo button size (patch 1489452)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-16 21:39:33 +00:00
parent a8f7c8b2c5
commit 87419e97c6
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/combocmn.cpp
View File

@@ -807,9 +807,13 @@ void wxComboControlBase::CalculateAreas( int btnWidth )
bool buttonOutside; bool buttonOutside;
int btnBorder; // border for button only int btnBorder; // border for button only
if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) || m_blankButtonBg ) && // check if button should really be outside the border: we'll do it it if
m_btnSpacingX == 0 && m_btnWid == 0 && m_btnHei == 0 && // its platform default or bitmap+pushbutton background is used, but not if
(!m_bmpNormal.Ok() || m_blankButtonBg) ) // 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; buttonOutside = true;
m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE; m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;