No changes, just add another case to a switch on wxMouseButton.

Fix warnings given when wx headers are compiled with g++ -Wswitch-enum option.

Also make the assert messages more precise and less verbose as there is no
need to include the function name in them, all relatively recent compilers
provide it via __FUNCTION__ and wxFAIL_MSG() already uses it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-11-14 12:51:47 +00:00
parent 49d47a9fff
commit 907ea7d5cc

View File

@@ -79,10 +79,6 @@ public:
{
switch ( but )
{
default:
wxFAIL_MSG(wxT("invalid parameter in wxMouseState::ButtonIsDown"));
// fall through
case wxMOUSE_BTN_ANY:
return LeftIsDown() || MiddleIsDown() || RightIsDown() ||
Aux1IsDown() || Aux2IsDown();
@@ -101,6 +97,15 @@ public:
case wxMOUSE_BTN_AUX2:
return Aux2IsDown();
case wxMOUSE_BTN_NONE:
case wxMOUSE_BTN_MAX:
wxFAIL_MSG(wxS("invalid parameter"));
return false;
default:
wxFAIL_MSG(wxS("unknown parameter"));
return false;
}
}