[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:
@@ -743,7 +743,7 @@ bool wxSlider::PerformAction(const wxControlAction& action,
|
||||
long numArg,
|
||||
const wxString& strArg)
|
||||
{
|
||||
if ( action == wxACTION_SLIDER_START )
|
||||
if ( action == wxACTION_SLIDER_START )
|
||||
{
|
||||
ChangeValueTo(m_min);
|
||||
}
|
||||
@@ -823,13 +823,13 @@ wxScrollThumb::Shaft wxSlider::HitTest(const wxPoint& pt) const
|
||||
x3 = rectThumb.GetRight();
|
||||
x4 = rectShaft.GetRight();
|
||||
}
|
||||
if ((x1 <= x) & (x < x2))
|
||||
if ((x1 <= x) && (x < x2))
|
||||
{
|
||||
// or to the left
|
||||
return wxScrollThumb::Shaft_Above;
|
||||
}
|
||||
|
||||
if ((x3 < x) & (x <= x4)) {
|
||||
if ((x3 < x) && (x <= x4)) {
|
||||
// or to the right
|
||||
return wxScrollThumb::Shaft_Below;
|
||||
}
|
||||
@@ -952,7 +952,7 @@ bool wxStdSliderButtonInputHandler::HandleKey(wxInputConsumer *consumer,
|
||||
const wxKeyEvent& event,
|
||||
bool pressed)
|
||||
{
|
||||
if ( pressed )
|
||||
if ( pressed )
|
||||
{
|
||||
int keycode = event.GetKeyCode();
|
||||
|
||||
|
Reference in New Issue
Block a user