use logical operator &&, not bitwise &; indentation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||||
|
Reference in New Issue
Block a user