dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r20071) -Codechange: Consistently return the toolbar window for ShowBuildXxxToolbar().

Browse Source
This commit is contained in:
frosch
2010-07-04 09:27:15 +00:00
parent d96aa7abfa
commit d19a8038f4
6 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/airport_gui.cpp
View File

@@ -168,20 +168,27 @@ static const WindowDesc _air_toolbar_desc(
_nested_air_toolbar_widgets, lengthof(_nested_air_toolbar_widgets)
);
void ShowBuildAirToolbar()
/**
* Open the build airport toolbar window
*
* If the terraform toolbar is linked to the toolbar, that window is also opened.
*
* @return newly opened airport toolbar, or NULL if the toolbar could not be opened.
*/
Window *ShowBuildAirToolbar()
{
if (!Company::IsValidID(_local_company)) return;
if (!Company::IsValidID(_local_company)) return NULL;
DeleteWindowByClass(WC_BUILD_TOOLBAR);
AllocateWindowDescFront<BuildAirToolbarWindow>(&_air_toolbar_desc, TRANSPORT_AIR);
return AllocateWindowDescFront<BuildAirToolbarWindow>(&_air_toolbar_desc, TRANSPORT_AIR);
}
EventState AirportToolbarGlobalHotkeys(uint16 key, uint16 keycode)
{
int num = CheckHotkeyMatch<BuildAirToolbarWindow>(_airtoolbar_hotkeys, keycode, NULL, true);
if (num == -1) return ES_NOT_HANDLED;
ShowBuildAirToolbar();
Window *w = FindWindowByClass(WC_BUILD_TOOLBAR);
Window *w = ShowBuildAirToolbar();
if (w == NULL) return ES_NOT_HANDLED;
return w->OnKeyPress(key, keycode);
}