dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r18092) -Codechange: remove support for the unnested widgets

Browse Source
This commit is contained in:
rubidium
2009-11-15 13:36:30 +00:00
parent 7337a0553c
commit aeb9f8e715
9 changed files with 91 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osk_gui.cpp
View File

@@ -75,14 +75,9 @@ struct OskWindow : public Window {
this->parent = parent;
assert(parent != NULL);
if (parent->widget != NULL) {
this->caption = (parent->widget[button].data != STR_NULL) ? parent->widget[button].data : parent->caption;
}
if (parent->nested_array != NULL) {
NWidgetCore *par_wid = parent->GetWidget<NWidgetCore>(button);
assert(par_wid != NULL);
this->caption = (par_wid->widget_data != STR_NULL) ? par_wid->widget_data : parent->caption;
}
NWidgetCore *par_wid = parent->GetWidget<NWidgetCore>(button);
assert(par_wid != NULL);
this->caption = (par_wid->widget_data != STR_NULL) ? par_wid->widget_data : parent->caption;
this->qs = parent;
this->text_btn = button;