godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Remove WinAPI #undef hacks needed for mingw-std-threads

Browse Source 
Instead, we rename the conflicting symbols.
This commit is contained in:
Rémi Verschelde
2025-04-29 12:00:50 +02:00
parent ce94b26de7
commit c019b76523
15 changed files with 46 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/plugins/script_editor_plugin.cpp
View File

@@ -1196,7 +1196,7 @@ void ScriptEditor::_file_dialog_action(const String &p_file) {
}
[[fallthrough]];
}
case FILE_OPEN: {
case FILE_OPEN_: {
open_file(p_file);
file_dialog_option = -1;
} break;
@@ -1281,10 +1281,10 @@ void ScriptEditor::_menu_option(int p_option) {
file_dialog->popup_file_dialog();
open_textfile_after_create = true;
} break;
case FILE_OPEN: {
case FILE_OPEN_: {
file_dialog->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
file_dialog->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
file_dialog_option = FILE_OPEN;
file_dialog_option = FILE_OPEN_;
List<String> extensions;
ResourceLoader::get_recognized_extensions_for_type("Script", &extensions);
@@ -4258,7 +4258,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/new", TTRC("New Script..."), KeyModifierMask::CMD_OR_CTRL | Key::N), FILE_NEW);
file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/new_textfile", TTRC("New Text File..."), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::N), FILE_NEW_TEXTFILE);
file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/open", TTRC("Open...")), FILE_OPEN);
file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/open", TTRC("Open...")), FILE_OPEN_);
file_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_editor/reopen_closed_script"), FILE_REOPEN_CLOSED);
recent_scripts = memnew(PopupMenu);