Mercurial > hg > openttd

changeset 8358:1228b53a99c9 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r11924) -Codechange: All dropdowns now use the dropdown widget, so compatibility code can be removed
author peter1138 <peter1138@openttd.org>
date Sat, 19 Jan 2008 11:08:06 +0000
parents 711bbeced0a7
children 59a8ddb2ed88
files src/widgets/dropdown.cpp
diffstat 1 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/widgets/dropdown.cpp
+++ b/src/widgets/dropdown.cpp
@@ -246,21 +246,17 @@
 		}
 	}
 
-	/* XXX Temporary fix to make dropdown compatible with separate widgets */
-	const Widget *wil = wi;
-	if (wi->type != WWT_DROPDOWN && wi->type != WWT_DROPDOWNIN) wil--;
-
 	Window *dw = AllocateWindow(
-		w->left + wil->left,
+		w->left + wi->left,
 		top,
-		wi->right - wil->left + 1,
+		wi->right - wi->left + 1,
 		height,
 		DropDownMenuWndProc,
 		WC_DROPDOWN_MENU,
 		_dropdown_menu_widgets);
 
 	dw->widget[0].color = wi->color;
-	dw->widget[0].right = wi->right - wil->left;
+	dw->widget[0].right = wi->right - wi->left;
 	dw->widget[0].bottom = height - 1;
 
 	dw->SetWidgetHiddenState(1, !scroll);