summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2009-09-19 14:41:43 +0000
committeralberth <alberth@openttd.org>2009-09-19 14:41:43 +0000
commit89df436f84707182456461e3259e053303feb846 (patch)
tree1c7b51ea691c066ff45ffc5a595748caef1145d7
parent1497cf7e0140616ce6e29e0284eabdb862924482 (diff)
downloadopenttd-89df436f84707182456461e3259e053303feb846.tar.xz
(svn r17578) -Fix (r17572): Some compilers don't like default function template arguments.
-rw-r--r--src/order_gui.cpp6
-rw-r--r--src/window_gui.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 759333239..751d1a8f6 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -475,7 +475,7 @@ private:
*/
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 @@ public:
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 @@ public:
{
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) {
diff --git a/src/window_gui.h b/src/window_gui.h
index e697a344a..73e8e06b2 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -398,7 +398,7 @@ public:
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;