Mercurial > hg > openttd

changeset 11533:80379bc12cb3 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r15894) -Codechange: remove console widget array (it was empty anyway) and window desc
author glx <glx@openttd.org>
date Mon, 30 Mar 2009 01:15:51 +0000
parents 3e68dda0f8af
children a29143dd6197
files src/console_gui.cpp
diffstat 1 files changed, 2 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/console_gui.cpp
+++ b/src/console_gui.cpp
@@ -147,12 +147,9 @@
 {
 	static int scroll;
 
-	IConsoleWindow(const WindowDesc *desc) : Window(desc)
+	IConsoleWindow() : Window(0, 0, _screen.width, _screen.height / 3, WC_CONSOLE, NULL)
 	{
 		_iconsole_mode = ICONSOLE_OPENED;
-
-		this->height = _screen.height / 3;
-		this->width  = _screen.width;
 	}
 
 	~IConsoleWindow()
@@ -314,17 +311,6 @@
 
 int IConsoleWindow::scroll = 0;
 
-static const Widget _iconsole_window_widgets[] = {
-	{WIDGETS_END}
-};
-
-static const WindowDesc _iconsole_window_desc(
-	0, 0, 2, 2, 2, 2,
-	WC_CONSOLE, WC_NONE,
-	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	_iconsole_window_widgets
-);
-
 void IConsoleGUIInit()
 {
 	_iconsole_historypos = ICON_HISTORY_SIZE - 1;
@@ -376,7 +362,7 @@
 {
 	switch (_iconsole_mode) {
 		case ICONSOLE_CLOSED:
-			new IConsoleWindow(&_iconsole_window_desc);
+			new IConsoleWindow();
 			break;
 
 		case ICONSOLE_OPENED: case ICONSOLE_FULL: