Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/kbdstate.h b/include/wx/kbdstate.h
index 25b660c0df631223b77ca7fe21e124187eb8a9d8..71e196db3c1374667441ea3ad900ae9f0bd8edb4 100644 (file)
--- a/include/wx/kbdstate.h
+++ b/include/wx/kbdstate.h
@@ -55,7 +55,14 @@ public:
     }
 
     // returns true if any modifiers at all are pressed
     }
 
     // returns true if any modifiers at all are pressed

-    bool HasModifiers() const { return GetModifiers() != wxMOD_NONE; }
+    bool HasAnyModifiers() const { return GetModifiers() != wxMOD_NONE; }
+
+    // returns true if any modifiers changing the usual key interpretation are
+    // pressed, notably excluding Shift
+    bool HasModifiers() const
+    {
+        return ControlDown() || RawControlDown() || AltDown();
+    }

 
     // accessors for individual modifier keys
     bool ControlDown() const { return m_controlDown; }
 
     // accessors for individual modifier keys
     bool ControlDown() const { return m_controlDown; }