diff options
| author | Eugene Sandulenko | 2012-03-17 03:46:46 -0700 |
|---|---|---|
| committer | Eugene Sandulenko | 2012-03-17 03:46:46 -0700 |
| commit | 56252909f5bebfa9cfd43cf092effb0111fdabef (patch) | |
| tree | efcf99fefc8b019cd07c119a9e15ccf3be06a2fe /backends/keymapper/remap-dialog.h | |
| parent | 5ae2543795433513e68339b16e0783d4b3295204 (diff) | |
| parent | c0a215282d12872cf32fb24f9067216c0f869b96 (diff) | |
| download | scummvm-rg350-56252909f5bebfa9cfd43cf092effb0111fdabef.tar.gz scummvm-rg350-56252909f5bebfa9cfd43cf092effb0111fdabef.tar.bz2 scummvm-rg350-56252909f5bebfa9cfd43cf092effb0111fdabef.zip | |
Merge pull request #202 from tsoliman/keymapper-nonkey-inputs
KEYMAPPER: Add Gesture Support
Diffstat (limited to 'backends/keymapper/remap-dialog.h')
| -rw-r--r-- | backends/keymapper/remap-dialog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/keymapper/remap-dialog.h b/backends/keymapper/remap-dialog.h index 143deca4cf..82c68405db 100644 --- a/backends/keymapper/remap-dialog.h +++ b/backends/keymapper/remap-dialog.h @@ -50,6 +50,7 @@ public: virtual void handleKeyUp(Common::KeyState state); virtual void handleMouseDown(int x, int y, int button, int clickCount); virtual void handleTickle(); + virtual void handleOtherEvent(Common::Event ev); protected: struct ActionWidgets { @@ -67,7 +68,7 @@ protected: void refreshKeymap(); void clearMapping(uint i); void startRemapping(uint i); - void stopRemapping(); + void stopRemapping(bool force = false); Keymapper *_keymapper; Keymap** _keymapTable; @@ -85,7 +86,6 @@ protected: uint _rowCount; Array<ActionWidgets> _keymapWidgets; - Action *_activeRemapAction; uint32 _remapTimeout; static const uint32 kRemapTimeoutDelay = 3000; |