Mercurial > hg > openttd

changeset 13078:854fcab2b59d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r17578) -Fix (r17572): Some compilers don't like default function template arguments.
author alberth <alberth@openttd.org>
date Sat, 19 Sep 2009 14:41:43 +0000
parents 7e8fe82936af
children 090bac35e7e4
files src/order_gui.cpp src/window_gui.h
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -475,7 +475,7 @@
 	 */
 	int GetOrderFromPt(int y)
 	{
-		int sel = (y - this->GetWidget(ORDER_WIDGET_ORDER_LIST)->pos_y - WD_FRAMERECT_TOP) / this->resize.step_height; // Selected line in the ORDER_WIDGET_ORDER_LIST panel.
+		int sel = (y - this->GetWidget<NWidgetBase>(ORDER_WIDGET_ORDER_LIST)->pos_y - WD_FRAMERECT_TOP) / this->resize.step_height; // Selected line in the ORDER_WIDGET_ORDER_LIST panel.
 
 		if ((uint)sel >= this->vscroll.GetCapacity()) return INVALID_ORDER;
 
@@ -680,7 +680,7 @@
 		this->selected_order = -1;
 		this->owner = v->owner;
 
-		int num_lines = (this->GetWidget(ORDER_WIDGET_ORDER_LIST)->current_y - WD_FRAMERECT_TOP - WD_FRAMERECT_BOTTOM) / this->resize.step_height;
+		int num_lines = (this->GetWidget<NWidgetBase>(ORDER_WIDGET_ORDER_LIST)->current_y - WD_FRAMERECT_TOP - WD_FRAMERECT_BOTTOM) / this->resize.step_height;
 		this->vscroll.SetCapacity(num_lines);
 
 		if (_settings_client.gui.quick_goto && v->owner == _local_company) {
@@ -1234,7 +1234,7 @@
 	{
 		if (this->goto_type == OPOS_CONDITIONAL) {
 			this->goto_type = OPOS_GOTO;
-			NWidgetBase *nwid = this->GetWidget(ORDER_WIDGET_ORDER_LIST);
+			NWidgetBase *nwid = this->GetWidget<NWidgetBase>(ORDER_WIDGET_ORDER_LIST);
 			if (IsInsideBS(_cursor.pos.x, this->left + nwid->pos_x, nwid->current_x) && IsInsideBS(_cursor.pos.y, this->top + nwid->pos_y, nwid->current_y)) {
 				int order_id = this->GetOrderFromPt(_cursor.pos.y - this->top);
 				if (order_id != INVALID_ORDER) {
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -398,7 +398,7 @@
 	Window *z_front;                 ///< The window in front of us in z-order.
 	Window *z_back;                  ///< The window behind us in z-order.
 
-	template <class NWID = NWidgetBase>
+	template <class NWID>
 	inline NWID *GetWidget(uint widnum) const;