diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-04-14 01:07:23 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-04-14 01:07:23 +0300 |
commit | 035cc92ee2a435ff1d663e2037f543578dd2578a (patch) | |
tree | 084cc6998c99fd66100108428ea6bbb615af8ca7 /src/guichan | |
parent | 8bb2cb1e077ded2837be80cb4efa75391317de42 (diff) | |
download | manaplus-035cc92ee2a435ff1d663e2037f543578dd2578a.tar.gz manaplus-035cc92ee2a435ff1d663e2037f543578dd2578a.tar.bz2 manaplus-035cc92ee2a435ff1d663e2037f543578dd2578a.tar.xz manaplus-035cc92ee2a435ff1d663e2037f543578dd2578a.zip |
Block enter key from pressing active button.
Diffstat (limited to 'src/guichan')
-rw-r--r-- | src/guichan/include/guichan/widgets/button.hpp | 7 | ||||
-rw-r--r-- | src/guichan/widgets/button.cpp | 26 |
2 files changed, 0 insertions, 33 deletions
diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/guichan/include/guichan/widgets/button.hpp index a934499d0..b8a442c40 100644 --- a/src/guichan/include/guichan/widgets/button.hpp +++ b/src/guichan/include/guichan/widgets/button.hpp @@ -162,13 +162,6 @@ namespace gcn virtual void mouseDragged(MouseEvent& mouseEvent); - - // Inherited from KeyListener - - virtual void keyPressed(KeyEvent& keyEvent); - - virtual void keyReleased(KeyEvent& keyEvent); - protected: /** * Checks if the button is pressed. Convenient method to use diff --git a/src/guichan/widgets/button.cpp b/src/guichan/widgets/button.cpp index 6ae443705..42dc686f0 100644 --- a/src/guichan/widgets/button.cpp +++ b/src/guichan/widgets/button.cpp @@ -241,32 +241,6 @@ namespace gcn mouseEvent.consume(); } - void Button::keyPressed(KeyEvent& keyEvent) - { - Key key = keyEvent.getKey(); - - if (key.getValue() == Key::ENTER - || key.getValue() == Key::SPACE) - { - mKeyPressed = true; - keyEvent.consume(); - } - } - - void Button::keyReleased(KeyEvent& keyEvent) - { - Key key = keyEvent.getKey(); - - if ((key.getValue() == Key::ENTER - || key.getValue() == Key::SPACE) - && mKeyPressed) - { - mKeyPressed = false; - distributeActionEvent(); - keyEvent.consume(); - } - } - void Button::focusLost(const Event& event A_UNUSED) { mMousePressed = false; |