Merge branch 'master' into jgrpp

# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
This commit is contained in:
Jonathan G Rennison
2019-11-12 18:43:10 +00:00
1409 changed files with 225 additions and 2908 deletions

View File

@@ -1,5 +1,3 @@
/* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -641,10 +639,6 @@ public:
*/
virtual void SetStringParameters(int widget) const {}
/**
* Called when window gains focus
* @param previously_focused_window The window that lost the focus.
*/
virtual void OnFocus(Window *previously_focused_window);
virtual void OnFocusLost(Window *newly_focused_window);