summaryrefslogtreecommitdiff
path: root/src/window.cpp
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2010-05-30 12:06:18 +0000
committeralberth <alberth@openttd.org>2010-05-30 12:06:18 +0000
commit113f3ef0ebafcc637d061e955a162751cf011f8f (patch)
tree97b540ea5d7e931e802972ccbcee537744239343 /src/window.cpp
parentfc82d9cd77224c458c05ce2fd749e58e9cee5299 (diff)
downloadopenttd-113f3ef0ebafcc637d061e955a162751cf011f8f.tar.xz
(svn r19904) -Codechange: Make EventState usable outside Window context.
Diffstat (limited to 'src/window.cpp')
-rw-r--r--src/window.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/window.cpp b/src/window.cpp
index 117244988..85eb02eda 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1938,14 +1938,14 @@ void HandleKeypress(uint32 raw_key)
/* Check if the focused window has a focused editbox */
if (EditBoxInGlobalFocus()) {
/* All input will in this case go to the focused window */
- if (_focused_window->OnKeyPress(key, keycode) == Window::ES_HANDLED) return;
+ if (_focused_window->OnKeyPress(key, keycode) == ES_HANDLED) return;
}
/* Call the event, start with the uppermost window, but ignore the toolbar. */
Window *w;
FOR_ALL_WINDOWS_FROM_FRONT(w) {
if (w->window_class == WC_MAIN_TOOLBAR) continue;
- if (w->OnKeyPress(key, keycode) == Window::ES_HANDLED) return;
+ if (w->OnKeyPress(key, keycode) == ES_HANDLED) return;
}
w = FindWindowById(WC_MAIN_TOOLBAR, 0);
@@ -1961,7 +1961,7 @@ void HandleCtrlChanged()
/* Call the event, start with the uppermost window. */
Window *w;
FOR_ALL_WINDOWS_FROM_FRONT(w) {
- if (w->OnCTRLStateChange() == Window::ES_HANDLED) return;
+ if (w->OnCTRLStateChange() == ES_HANDLED) return;
}
}