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

Change window close/deallocation to match upstream

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-09-15 23:56:33 +01:00
parent 79cfc3e8bd
commit f5d1b1d8f8
50 changed files with 352 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osk_gui.cpp
View File

@@ -165,7 +165,7 @@ struct OskWindow : public Window {
return;
}
}
delete this;
this->Close();
break;
case WID_OSK_CANCEL:
@@ -177,7 +177,7 @@ struct OskWindow : public Window {
qs->text.Assign(this->orig_str.c_str());
qs->text.MovePos(WKC_END);
this->OnEditboxChanged(WID_OSK_TEXT);
delete this;
this->Close();
}
break;
}
@@ -197,10 +197,10 @@ struct OskWindow : public Window {
this->parent->SetWidgetDirty(this->text_btn);
}
void OnFocusLost(Window *newly_focused_window) override
void OnFocusLost(bool closing, Window *newly_focused_window) override
{
VideoDriver::GetInstance()->EditBoxLostFocus();
delete this;
if (!closing) this->Close();
}
};