mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-16 19:19:09 +00:00
Code Issues Activity

(svn r13151) -Codechange: use an enum instead of bool as return type of OnKeyPress/OnCTRLStateChange to make it obvious what the return values mean.

Browse Source
This commit is contained in:
rubidium
2008-05-17 23:11:06 +00:00
parent c1713c9ab7
commit f5681547ef
13 changed files with 85 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/window.cpp
View File

@@ -68,7 +68,7 @@ void Window::OnPaint()
this->HandleWindowEvent(&e);
}
bool Window::OnKeyPress(uint16 key, uint16 keycode)
Window::EventState Window::OnKeyPress(uint16 key, uint16 keycode)
{
WindowEvent e;
e.event = WE_KEYPRESS;
@@ -77,17 +77,17 @@ bool Window::OnKeyPress(uint16 key, uint16 keycode)
e.we.keypress.cont = true;
this->HandleWindowEvent(&e);
return e.we.keypress.cont;
return e.we.keypress.cont ? ES_NOT_HANDLED : ES_HANDLED;
}
bool Window::OnCTRLStateChange()
Window::EventState Window::OnCTRLStateChange()
{
WindowEvent e;
e.event = WE_CTRL_CHANGED;
e.we.ctrl.cont = true;
this->HandleWindowEvent(&e);
return e.we.ctrl.cont;
return e.we.ctrl.cont ? ES_NOT_HANDLED : ES_HANDLED;
}
void Window::OnClick(Point pt, int widget)
@@ -1802,8 +1802,7 @@ void HandleKeypress(uint32 raw_key)
w->window_class != WC_COMPANY_PASSWORD_WINDOW) {
continue;
}
;
if (!w->OnKeyPress(key, keycode)) return;
if (w->OnKeyPress(key, keycode) == Window::ES_HANDLED) return;
}
Window *w = FindWindowById(WC_MAIN_TOOLBAR, 0);
@@ -1819,7 +1818,7 @@ void HandleCtrlChanged()
/* Call the event, start with the uppermost window. */
for (Window* const *wz = _last_z_window; wz != _z_windows;) {
Window *w = *--wz;
if (!w->OnCTRLStateChange()) break;
if (w->OnCTRLStateChange() == Window::ES_HANDLED) return;
}
}