diff options
author | Johannes Schickel | 2011-03-09 03:02:46 +0100 |
---|---|---|
committer | Johannes Schickel | 2011-03-09 03:02:46 +0100 |
commit | bd82ebd080bf97fad8831d3ad6bdaa01d3158d21 (patch) | |
tree | 039a6b6d51c80ae8f12d58e3b9a6442b0021852b /backends/platform/wince/CEgui/ToolbarHandler.cpp | |
parent | 438f2b2e1bc987080a0dcc500d04f4eb18174763 (diff) | |
download | scummvm-rg350-bd82ebd080bf97fad8831d3ad6bdaa01d3158d21.tar.gz scummvm-rg350-bd82ebd080bf97fad8831d3ad6bdaa01d3158d21.tar.bz2 scummvm-rg350-bd82ebd080bf97fad8831d3ad6bdaa01d3158d21.zip |
WINCE: Run astyle over WinCE source files.
Diffstat (limited to 'backends/platform/wince/CEgui/ToolbarHandler.cpp')
-rw-r--r-- | backends/platform/wince/CEgui/ToolbarHandler.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/backends/platform/wince/CEgui/ToolbarHandler.cpp b/backends/platform/wince/CEgui/ToolbarHandler.cpp index 78f69119c3..ed2a72245a 100644 --- a/backends/platform/wince/CEgui/ToolbarHandler.cpp +++ b/backends/platform/wince/CEgui/ToolbarHandler.cpp @@ -29,15 +29,15 @@ namespace CEGUI { ToolbarHandler::ToolbarHandler(): -_current(""), _active(NULL) { + _current(""), _active(NULL) { } bool ToolbarHandler::add(const String &name, const Toolbar &toolbar) { - _toolbarMap[name] = (Toolbar*)&toolbar; + _toolbarMap[name] = (Toolbar *)&toolbar; if (!_active) { - _active = &((Toolbar&)toolbar); + _active = &((Toolbar &)toolbar); _current = name; } @@ -53,7 +53,7 @@ bool ToolbarHandler::setActive(const String &name) { return false; if (_current == name) return true; - _active->action(0, 0, false); // make sure any items are unpushed when changing toolbars (e.g. forced VK->main panel) + _active->action(0, 0, false); // make sure any items are unpushed when changing toolbars (e.g. forced VK->main panel) _current = name; _active = _toolbarMap[name]; _active->forceRedraw(); @@ -67,8 +67,7 @@ bool ToolbarHandler::action(int x, int y, bool pushed) { return _active->action(x / 2, (y - _offset) / 2, pushed); else return _active->action(x, y - _offset, pushed); - } - else + } else return false; } @@ -118,7 +117,7 @@ int ToolbarHandler::getOffset() { return _offset; } -Toolbar* ToolbarHandler::active() { +Toolbar *ToolbarHandler::active() { return _active; } |