[1267725] Wrong operator for logical/bitwise operation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -95,13 +95,13 @@ public:
|
||||
{ return IsVert() ? wxVERTICAL : wxHORIZONTAL; }
|
||||
|
||||
// do we have labels?
|
||||
bool HasLabels() const
|
||||
{ return ((GetWindowStyle() & wxSL_LABELS) != 0) &
|
||||
bool HasLabels() const
|
||||
{ return ((GetWindowStyle() & wxSL_LABELS) != 0) &&
|
||||
((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT)) != 0); }
|
||||
|
||||
// do we have ticks?
|
||||
bool HasTicks() const
|
||||
{ return ((GetWindowStyle() & wxSL_TICKS) != 0) &
|
||||
bool HasTicks() const
|
||||
{ return ((GetWindowStyle() & wxSL_TICKS) != 0) &&
|
||||
((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT|wxSL_BOTH)) != 0); }
|
||||
|
||||
// implement wxControlWithThumb interface
|
||||
|
Reference in New Issue
Block a user