summaryrefslogtreecommitdiff
path: root/src/widget.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-04-21 23:40:56 +0000
committerrubidium <rubidium@openttd.org>2009-04-21 23:40:56 +0000
commit59d45a04d606cf7eeffed150f09497dfc56d1014 (patch)
tree9ee92bfa0c3076957e0f2d3bfe29777c0f79a512 /src/widget.cpp
parent58db962353cfb87ef4571462e6d0656781939edd (diff)
downloadopenttd-59d45a04d606cf7eeffed150f09497dfc56d1014.tar.xz
(svn r16118) -Change/cleanup: remove the hexadecimal 'in TTD the string had this ID' from 'some' strings and replace the string name with something more sensible.
Diffstat (limited to 'src/widget.cpp')
-rw-r--r--src/widget.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/widget.cpp b/src/widget.cpp
index 804cc57ea..a811da9c8 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -473,7 +473,7 @@ void Window::DrawWidgets() const
case WWT_CLOSEBOX: {
const StringID str = wi->data;
- assert(str == STR_00C5 || str == STR_00C6); // black or silver cross
+ assert(str == STR_BLACK_CROSS || str == STR_SILVER_CROSS); // black or silver cross
assert(r.right - r.left == 10); // To ensure the same sizes are used everywhere
DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->colour, FR_NONE);
@@ -500,12 +500,12 @@ void Window::DrawWidgets() const
if (_dynlang.text_dir == TD_LTR) {
DrawFrameRect(r.left, r.top, r.right - 12, r.bottom, wi->colour, FR_NONE);
DrawFrameRect(r.right - 11, r.top, r.right, r.bottom, wi->colour, clicked ? FR_LOWERED : FR_NONE);
- DrawString(r.right - (clicked ? 10 : 11), r.right, r.top + (clicked ? 2 : 1), STR_0225, TC_BLACK, SA_CENTER);
+ DrawString(r.right - (clicked ? 10 : 11), r.right, r.top + (clicked ? 2 : 1), STR_ARROW_DOWN, TC_BLACK, SA_CENTER);
if (str != STR_NULL) DrawString(r.left + 2, r.right - 14, r.top + 1, str, TC_BLACK);
} else {
DrawFrameRect(r.left + 12, r.top, r.right, r.bottom, wi->colour, FR_NONE);
DrawFrameRect(r.left, r.top, r.left + 11, r.bottom, wi->colour, clicked ? FR_LOWERED : FR_NONE);
- DrawString(r.left + clicked, r.left + 11, r.top + (clicked ? 2 : 1), STR_0225, TC_BLACK, SA_CENTER);
+ DrawString(r.left + clicked, r.left + 11, r.top + (clicked ? 2 : 1), STR_ARROW_DOWN, TC_BLACK, SA_CENTER);
if (str != STR_NULL) DrawString(r.left + 14, r.right - 2, r.top + 1, str, TC_BLACK);
}
break;
@@ -1263,21 +1263,21 @@ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint16 data,
this->SetFill(false, true);
this->SetResize(0, 1);
this->min_x = 12;
- this->SetDataTip(0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST);
+ this->SetDataTip(0x0, STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST);
break;
case WWT_CAPTION:
this->SetFill(true, false);
this->SetResize(1, 0);
this->min_y = 14;
- this->SetDataTip(data, STR_018C_WINDOW_TITLE_DRAG_THIS);
+ this->SetDataTip(data, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS);
break;
case WWT_HSCROLLBAR:
this->SetFill(true, false);
this->SetResize(1, 0);
this->min_y = 12;
- this->SetDataTip(0x0, STR_HSCROLL_BAR_SCROLLS_LIST);
+ this->SetDataTip(0x0, STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST);
break;
case WWT_STICKYBOX:
@@ -1295,7 +1295,7 @@ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint16 data,
case WWT_CLOSEBOX:
this->SetFill(false, false);
this->SetMinimalSize(11, 14);
- this->SetDataTip(STR_00C5, STR_018B_CLOSE_WINDOW);
+ this->SetDataTip(STR_BLACK_CROSS, STR_TOOLTIP_CLOSE_WINDOW);
break;
case WWT_DROPDOWN: