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

use logical operator &&, not bitwise &; indentation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-09-22 04:40:51 +00:00
parent 4c6a2a70dd
commit 640a91ab0b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/combocmn.cpp
View File

@@ -1005,10 +1005,10 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
{ {
int newY = butHeight+(customBorder*2); int newY = butHeight+(customBorder*2);
SetClientSize(wxDefaultCoord,newY); SetClientSize(wxDefaultCoord,newY);
if ( m_bmpNormal.Ok() || m_btnArea.width != butWidth || m_btnArea.height != butHeight ) if ( m_bmpNormal.Ok() || m_btnArea.width != butWidth || m_btnArea.height != butHeight )
m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON; m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
else else
m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON; m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
sz.y = newY; sz.y = newY;
} }
@@ -1265,7 +1265,7 @@ void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags
{ {
// Drawing control // Drawing control
isEnabled = IsEnabled(); isEnabled = IsEnabled();
doDrawFocusRect = ShouldDrawFocus() & !(m_iFlags & wxCC_FULL_BUTTON); doDrawFocusRect = ShouldDrawFocus() && !(m_iFlags & wxCC_FULL_BUTTON);
// Windows-style: for smaller size control (and for disabled background) use less spacing // Windows-style: for smaller size control (and for disabled background) use less spacing
focusSpacingX = isEnabled ? 2 : 1; focusSpacingX = isEnabled ? 2 : 1;
@@ -1275,7 +1275,7 @@ void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags
{ {
// Drawing a list item // Drawing a list item
isEnabled = true; // they are never disabled isEnabled = true; // they are never disabled
doDrawFocusRect = flags & wxCONTROL_SELECTED ? true : false; doDrawFocusRect = (flags & wxCONTROL_SELECTED) != 0;
focusSpacingX = 0; focusSpacingX = 0;
focusSpacingY = 0; focusSpacingY = 0;