synchronize GTK2 minimum version in docs

[wxWidgets.git] / include / wx / mousestate.h

diff --git a/include/wx/mousestate.h b/include/wx/mousestate.h
index 1e6dc5070d46b48a14683a6268eeb97de9846eef..98ab291baf72cece641d8e233fe33c7de677b55a 100644 (file)
--- a/include/wx/mousestate.h
+++ b/include/wx/mousestate.h
@@ -11,6 +11,7 @@
 #ifndef _WX_MOUSESTATE_H_
 #define _WX_MOUSESTATE_H_
 
 #ifndef _WX_MOUSESTATE_H_
 #define _WX_MOUSESTATE_H_
 

+#include "wx/gdicmn.h"      // for wxPoint

 #include "wx/kbdstate.h"
 
 // the symbolic names for the mouse buttons
 #include "wx/kbdstate.h"
 
 // the symbolic names for the mouse buttons


@@ -78,10 +79,6 @@ public:
     {
         switch ( but )
         {
     {
         switch ( but )
         {

-            default:
-                wxFAIL_MSG(wxT("invalid parameter in wxMouseState::ButtonIsDown"));
-                // fall through
-

             case wxMOUSE_BTN_ANY:
                 return LeftIsDown() || MiddleIsDown() || RightIsDown() ||
                             Aux1IsDown() || Aux2IsDown();
             case wxMOUSE_BTN_ANY:
                 return LeftIsDown() || MiddleIsDown() || RightIsDown() ||
                             Aux1IsDown() || Aux2IsDown();


@@ -100,6 +97,15 @@ public:
 
             case wxMOUSE_BTN_AUX2:
                 return Aux2IsDown();
 
             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;

         }
     }
 
         }
     }
 


@@ -122,7 +128,7 @@ public:
     // version of wxMouseState but their names are confusing as wxMouseEvent
     // has methods with the same names which do something quite different so
     // don't use them any more
     // version of wxMouseState but their names are confusing as wxMouseEvent
     // has methods with the same names which do something quite different so
     // don't use them any more

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

     wxDEPRECATED_INLINE(bool LeftDown() const, return LeftIsDown(); )
     wxDEPRECATED_INLINE(bool MiddleDown() const, return MiddleIsDown(); )
     wxDEPRECATED_INLINE(bool RightDown() const, return RightIsDown(); )
     wxDEPRECATED_INLINE(bool LeftDown() const, return LeftIsDown(); )
     wxDEPRECATED_INLINE(bool MiddleDown() const, return MiddleIsDown(); )
     wxDEPRECATED_INLINE(bool RightDown() const, return RightIsDown(); )