diff options
| author | Lars Persson | 2005-07-05 20:27:14 +0000 |
|---|---|---|
| committer | Lars Persson | 2005-07-05 20:27:14 +0000 |
| commit | a5af0165ba7fb93da647622336e7c8c7b429ce00 (patch) | |
| tree | 41ed462cc1795f7eeb162ceab434ab8eec311ec9 /backends/wince/CEgui | |
| parent | d4716a1fb525540f3395262d236df51ef70874f1 (diff) | |
| download | scummvm-rg350-a5af0165ba7fb93da647622336e7c8c7b429ce00.tar.gz scummvm-rg350-a5af0165ba7fb93da647622336e7c8c7b429ce00.tar.bz2 scummvm-rg350-a5af0165ba7fb93da647622336e7c8c7b429ce00.zip | |
* Updated WINCE files to compile with new code sharing with other small screen devices (such as Symbian)
svn-id: r18499
Diffstat (limited to 'backends/wince/CEgui')
| -rw-r--r-- | backends/wince/CEgui/ItemAction.cpp | 6 | ||||
| -rw-r--r-- | backends/wince/CEgui/ItemAction.h | 8 | ||||
| -rw-r--r-- | backends/wince/CEgui/ItemSwitch.h | 2 | ||||
| -rw-r--r-- | backends/wince/CEgui/PanelKeyboard.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/backends/wince/CEgui/ItemAction.cpp b/backends/wince/CEgui/ItemAction.cpp index d70da846bd..bc9dfeaec0 100644 --- a/backends/wince/CEgui/ItemAction.cpp +++ b/backends/wince/CEgui/ItemAction.cpp @@ -24,10 +24,10 @@ namespace CEGUI { - ItemAction::ItemAction(WORD reference, ActionType action) : + ItemAction::ItemAction(WORD reference, GUI::ActionType action) : PanelItem(reference) { _action = action; - if (!CEActions::Instance()->isEnabled(_action)) + if (!GUI::Actions::Instance()->isEnabled(_action)) _visible = false; } @@ -38,7 +38,7 @@ namespace CEGUI { bool ItemAction::action(int x, int y, bool pushed) { if (checkInside(x, y) && _visible && pushed) { - CEActions::Instance()->perform(_action); + GUI::Actions::Instance()->perform(_action); return true; } else diff --git a/backends/wince/CEgui/ItemAction.h b/backends/wince/CEgui/ItemAction.h index 00a1ebf0f1..df38842bcb 100644 --- a/backends/wince/CEgui/ItemAction.h +++ b/backends/wince/CEgui/ItemAction.h @@ -26,17 +26,17 @@ #include "common/scummsys.h" #include "common/system.h" -#include "CEActions.h" - +#include "gui/Actions.h" +#include "CEgui/PanelItem.h" namespace CEGUI { class ItemAction : public PanelItem { public: - ItemAction(WORD reference, ActionType action); + ItemAction(WORD reference, GUI::ActionType action); virtual ~ItemAction(); virtual bool action(int x, int y, bool pushed); private: - ActionType _action; + GUI::ActionType _action; }; } diff --git a/backends/wince/CEgui/ItemSwitch.h b/backends/wince/CEgui/ItemSwitch.h index 72b37f1b9f..e8377031d9 100644 --- a/backends/wince/CEgui/ItemSwitch.h +++ b/backends/wince/CEgui/ItemSwitch.h @@ -29,7 +29,7 @@ #include "Panel.h" #include "EventsBuffer.h" -using CEKEYS::Key; +using GUI::Key; namespace CEGUI { diff --git a/backends/wince/CEgui/PanelKeyboard.h b/backends/wince/CEgui/PanelKeyboard.h index 33394dcf57..f4c48bf659 100644 --- a/backends/wince/CEgui/PanelKeyboard.h +++ b/backends/wince/CEgui/PanelKeyboard.h @@ -29,7 +29,7 @@ #include "Toolbar.h" #include "EventsBuffer.h" -using CEKEYS::Key; +using GUI::Key; using CEKEYS::EventsBuffer; namespace CEGUI { |