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

Rename close window functions to match upstream

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-09-15 20:59:08 +01:00
parent ed1b842ad3
commit a18f3274b4
75 changed files with 291 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tracerestrict_gui.cpp
View File

@@ -1832,7 +1832,7 @@ public:
return;
}
this->DeleteChildWindows();
this->CloseChildWindows();
HideDropDownMenu(this);
if (sel == -1 || this->GetOwner() != _local_company) {
@@ -3910,7 +3910,7 @@ public:
/* Process ID-invalidation in command-scope as well */
if (this->slot_rename != INVALID_TRACE_RESTRICT_SLOT_ID && this->slot_rename != NEW_TRACE_RESTRICT_SLOT_ID &&
!TraceRestrictSlot::IsValidID(this->slot_rename)) {
DeleteWindowByClass(WC_QUERY_STRING);
CloseWindowByClass(WC_QUERY_STRING);
this->slot_rename = INVALID_TRACE_RESTRICT_SLOT_ID;
}
@@ -4472,7 +4472,7 @@ public:
if (this->ctr_qt_op != INVALID_TRACE_RESTRICT_COUNTER_ID && this->ctr_qt_op != NEW_TRACE_RESTRICT_COUNTER_ID &&
!TraceRestrictCounter::IsValidID(this->ctr_qt_op)) {
DeleteWindowByClass(WC_QUERY_STRING);
CloseWindowByClass(WC_QUERY_STRING);
this->ctr_qt_op = INVALID_TRACE_RESTRICT_COUNTER_ID;
}