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

avoid implicit conversion to bool

Browse Source
This commit is contained in:
Paul Cornett
2016-09-07 21:38:28 -07:00
parent 9f9c09e24a
commit a18fe083cc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/unix/utilsx11.cpp
View File

@@ -2577,7 +2577,7 @@ static bool wxGetKeyStateX11(wxKeyCode key)
// with the least-significant bit in the byte representing key 8N. // with the least-significant bit in the byte representing key 8N.
char key_vector[32]; char key_vector[32];
XQueryKeymap(pDisplay, key_vector); XQueryKeymap(pDisplay, key_vector);
return key_vector[keyCode >> 3] & (1 << (keyCode & 7)); return (key_vector[keyCode >> 3] & (1 << (keyCode & 7))) != 0;
} }
#endif // !defined(__WXGTK__) || defined(GDK_WINDOWING_X11) #endif // !defined(__WXGTK__) || defined(GDK_WINDOWING_X11)
@@ -2618,7 +2618,7 @@ static bool wxGetKeyStateGTK(wxKeyCode key)
wxFAIL_MSG(wxS("Unsupported key, only modifiers can be used")); wxFAIL_MSG(wxS("Unsupported key, only modifiers can be used"));
return false; return false;
} }
return state & mask; return (state & mask) != 0;
} }
#endif // GTK+ 3.4 #endif // GTK+ 3.4