diff options
author | Nicolas Bacca | 2004-05-09 14:47:26 +0000 |
---|---|---|
committer | Nicolas Bacca | 2004-05-09 14:47:26 +0000 |
commit | c21f38bc009d1517b1b917603919bb23f3802b2a (patch) | |
tree | ee2a5380c77d6b48fbed17e70a5915bb37d8af0f /backends/wince/CEgui | |
parent | a533dde2e7dfae78fa7bab2a5218bab8c5a4e267 (diff) | |
download | scummvm-rg350-c21f38bc009d1517b1b917603919bb23f3802b2a.tar.gz scummvm-rg350-c21f38bc009d1517b1b917603919bb23f3802b2a.tar.bz2 scummvm-rg350-c21f38bc009d1517b1b917603919bb23f3802b2a.zip |
Switch to EventsBuffer
svn-id: r13822
Diffstat (limited to 'backends/wince/CEgui')
-rw-r--r-- | backends/wince/CEgui/CEGUI.h | 1 | ||||
-rw-r--r-- | backends/wince/CEgui/ItemSwitch.h | 3 | ||||
-rw-r--r-- | backends/wince/CEgui/PanelKeyboard.cpp | 9 | ||||
-rw-r--r-- | backends/wince/CEgui/PanelKeyboard.h | 7 |
4 files changed, 7 insertions, 13 deletions
diff --git a/backends/wince/CEgui/CEGUI.h b/backends/wince/CEgui/CEGUI.h index e5bd6493a1..8264caedd8 100644 --- a/backends/wince/CEgui/CEGUI.h +++ b/backends/wince/CEgui/CEGUI.h @@ -21,7 +21,6 @@ #include "ToolbarHandler.h" #include "Panel.h" -#include "ItemSendKey.h" #include "ItemSwitch.h" #include "PanelKeyboard.h" diff --git a/backends/wince/CEgui/ItemSwitch.h b/backends/wince/CEgui/ItemSwitch.h index b38aeecef3..b07696534b 100644 --- a/backends/wince/CEgui/ItemSwitch.h +++ b/backends/wince/CEgui/ItemSwitch.h @@ -27,9 +27,8 @@ #include "common/system.h" #include "Panel.h" -#include "KeysBuffer.h" +#include "EventsBuffer.h" -using CEKEYS::KeysBuffer; using CEKEYS::Key; namespace CEGUI { diff --git a/backends/wince/CEgui/PanelKeyboard.cpp b/backends/wince/CEgui/PanelKeyboard.cpp index e7beb17d46..e2f95aeda2 100644 --- a/backends/wince/CEgui/PanelKeyboard.cpp +++ b/backends/wince/CEgui/PanelKeyboard.cpp @@ -29,9 +29,8 @@ namespace CEGUI { const char KEYBOARD_MAPPING_ALPHA_LOW[] = {"nopqrstuvwxyz"}; const char KEYBOARD_MAPPING_NUMERIC_LOW[] = {"67890"}; - PanelKeyboard::PanelKeyboard(WORD reference, KeysBuffer *buffer) : Toolbar() { + PanelKeyboard::PanelKeyboard(WORD reference) : Toolbar() { setBackground(reference); - _buffer = buffer->Instance(); } @@ -73,12 +72,10 @@ namespace CEGUI { keyCode = 10; } - if (keyAscii != 0) { + if (keyAscii != 0 && pushed) { _key.setAscii(keyAscii); _key.setKeycode(tolower(keyAscii)); - _key.setPushed(pushed); - _buffer->add(&_key); - return true; + return EventsBuffer::simulateKey(&_key); } else return false; diff --git a/backends/wince/CEgui/PanelKeyboard.h b/backends/wince/CEgui/PanelKeyboard.h index c562b4f0a1..275e498333 100644 --- a/backends/wince/CEgui/PanelKeyboard.h +++ b/backends/wince/CEgui/PanelKeyboard.h @@ -27,20 +27,19 @@ #include "common/system.h" #include "Toolbar.h" -#include "KeysBuffer.h" +#include "EventsBuffer.h" -using CEKEYS::KeysBuffer; using CEKEYS::Key; +using CEKEYS::EventsBuffer; namespace CEGUI { class PanelKeyboard : public Toolbar { public: - PanelKeyboard(WORD reference, KeysBuffer *buffer); + PanelKeyboard(WORD reference); virtual ~PanelKeyboard(); virtual bool action(int x, int y, bool pushed); private: - KeysBuffer *_buffer; Key _key; }; } |