diff options
| author | frosch <frosch@openttd.org> | 2013-06-15 15:30:44 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2013-06-15 15:30:44 +0000 |
| commit | 5cb174c6b86c58b2ff6ec0d245e546328fae6480 (patch) | |
| tree | 3daf547fa10b3e701086c7e0546cded7e6261bbb /src/road_gui.cpp | |
| parent | 62913838237c474419c68124ea7aebd74e72c628 (diff) | |
| download | openttd-5cb174c6b86c58b2ff6ec0d245e546328fae6480.tar.xz | |
(svn r25412) -Codechange: Make use of Window::OnHotkey
Diffstat (limited to 'src/road_gui.cpp')
| -rw-r--r-- | src/road_gui.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/road_gui.cpp b/src/road_gui.cpp index ae0c40c32..989e0a50e 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -473,13 +473,10 @@ struct BuildRoadToolbarWindow : Window { if (_ctrl_pressed) RoadToolbar_CtrlChanged(this); } - virtual EventState OnKeyPress(uint16 key, uint16 keycode) + virtual EventState OnHotkey(int hotkey) { - int num = this->hotkeys.CheckMatch(keycode); - if (num == -1 || this->GetWidget<NWidgetBase>(num) == NULL) return ES_NOT_HANDLED; - this->OnClick(Point(), num, 1); MarkTileDirtyByTile(TileVirtXY(_thd.pos.x, _thd.pos.y)); // redraw tile selection - return ES_HANDLED; + return Window::OnHotkey(hotkey); } virtual void OnPlaceObject(Point pt, TileIndex tile) @@ -717,7 +714,8 @@ static WindowDesc _build_road_desc( WDP_ALIGN_TOOLBAR, "toolbar_road", 0, 0, WC_BUILD_TOOLBAR, WC_NONE, WDF_CONSTRUCTION, - _nested_build_road_widgets, lengthof(_nested_build_road_widgets) + _nested_build_road_widgets, lengthof(_nested_build_road_widgets), + &BuildRoadToolbarWindow::hotkeys ); static const NWidgetPart _nested_build_tramway_widgets[] = { @@ -756,7 +754,8 @@ static WindowDesc _build_tramway_desc( WDP_ALIGN_TOOLBAR, "toolbar_tramway", 0, 0, WC_BUILD_TOOLBAR, WC_NONE, WDF_CONSTRUCTION, - _nested_build_tramway_widgets, lengthof(_nested_build_tramway_widgets) + _nested_build_tramway_widgets, lengthof(_nested_build_tramway_widgets), + &BuildRoadToolbarWindow::hotkeys ); /** @@ -782,7 +781,7 @@ EventState RoadToolbarGlobalHotkeys(uint16 key, uint16 keycode) if (num == -1) return ES_NOT_HANDLED; Window *w = ShowBuildRoadToolbar(_last_built_roadtype); if (w == NULL) return ES_NOT_HANDLED; - return w->OnKeyPress(key, keycode); + return w->OnHotkey(num); } static const NWidgetPart _nested_build_road_scen_widgets[] = { @@ -816,7 +815,8 @@ static WindowDesc _build_road_scen_desc( WDP_AUTO, "toolbar_road_scen", 0, 0, WC_SCEN_BUILD_TOOLBAR, WC_NONE, WDF_CONSTRUCTION, - _nested_build_road_scen_widgets, lengthof(_nested_build_road_scen_widgets) + _nested_build_road_scen_widgets, lengthof(_nested_build_road_scen_widgets), + &BuildRoadToolbarWindow::hotkeys ); /** @@ -835,7 +835,7 @@ EventState RoadToolbarEditorGlobalHotkeys(uint16 key, uint16 keycode) if (num == -1) return ES_NOT_HANDLED; Window *w = ShowBuildRoadScenToolbar(); if (w == NULL) return ES_NOT_HANDLED; - return w->OnKeyPress(key, keycode); + return w->OnHotkey(num); } struct BuildRoadDepotWindow : public PickerWindowBase { |