[Scummvm-git-logs] scummvm master -> 4a4431f488d29692c71564007613cf44f0410537

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4a4431f488 IMGUI: Disable Obselete ImGui APIs and Migrate Engine Code To Newer


Commit: 4a4431f488d29692c71564007613cf44f0410537
    https://github.com/scummvm/scummvm/commit/4a4431f488d29692c71564007613cf44f0410537
Author: D G Turner (digitall at scummvm.org)
Date: 2024-11-14T01:27:35Z

Commit Message:
IMGUI: Disable Obselete ImGui APIs and Migrate Engine Code To Newer

This is a fairly trivial change to use the newer API in DIRECTOR,
QDENGINE and TWP engines, so not likely to cause any regressions.

This has the side effect of removing some GCC compiler warnings.

Changed paths:
    backends/imgui/imconfig.h
    engines/director/debugger/dt-lists.cpp
    engines/qdengine/debugger/debugtools.cpp
    engines/twp/debugtools.cpp


diff --git a/backends/imgui/imconfig.h b/backends/imgui/imconfig.h
index 1aeae9db150..d6f0587dea2 100644
--- a/backends/imgui/imconfig.h
+++ b/backends/imgui/imconfig.h
@@ -28,8 +28,8 @@
 //#define IMGUI_API __attribute__((visibility("default")))  // GCC/Clang: override visibility when set is hidden
 
 //---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to clean your code of obsolete function/names.
-//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-//#define IMGUI_DISABLE_OBSOLETE_KEYIO                      // 1.87+ disable legacy io.KeyMap[]+io.KeysDown[] in favor io.AddKeyEvent(). This is automatically done by IMGUI_DISABLE_OBSOLETE_FUNCTIONS.
+#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+#define IMGUI_DISABLE_OBSOLETE_KEYIO                      // 1.87+ disable legacy io.KeyMap[]+io.KeysDown[] in favor io.AddKeyEvent(). This is automatically done by IMGUI_DISABLE_OBSOLETE_FUNCTIONS.
 
 //---- Disable all of Dear ImGui or don't implement standard windows/tools.
 // It is very strongly recommended to NOT disable the demo windows and debug tool during development. They are extremely useful in day to day work. Please read comments in imgui_demo.cpp.
diff --git a/engines/director/debugger/dt-lists.cpp b/engines/director/debugger/dt-lists.cpp
index 59e11ec8cb6..7674edfab4c 100644
--- a/engines/director/debugger/dt-lists.cpp
+++ b/engines/director/debugger/dt-lists.cpp
@@ -307,7 +307,7 @@ void showArchive() {
 		ImGui::SameLine();
 
 		{ // Right pane
-			ImGui::BeginChild("ChildR", ImVec2(ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y), ImGuiChildFlags_Border);
+			ImGui::BeginChild("ChildR", ImVec2(ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y), ImGuiChildFlags_Borders);
 
 			ImGui::Text("Resource %s %d (%d bytes)", tag2str(_state->_archive.resType), _state->_archive.resId, _state->_archive.dataSize);
 
diff --git a/engines/qdengine/debugger/debugtools.cpp b/engines/qdengine/debugger/debugtools.cpp
index 56b3c332ea5..7470b98ba9a 100644
--- a/engines/qdengine/debugger/debugtools.cpp
+++ b/engines/qdengine/debugger/debugtools.cpp
@@ -393,7 +393,7 @@ void showArchives() {
 		ImGui::SameLine();
 
 		{ // Right pane
-			ImGui::BeginChild("ChildR", ImVec2(ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y), ImGuiChildFlags_Border);
+			ImGui::BeginChild("ChildR", ImVec2(ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y), ImGuiChildFlags_Borders);
 
 			if (_state->_displayMode == kDisplayQDA) {
 				displayQDA();
diff --git a/engines/twp/debugtools.cpp b/engines/twp/debugtools.cpp
index d61973214c1..ddd2c77d091 100644
--- a/engines/twp/debugtools.cpp
+++ b/engines/twp/debugtools.cpp
@@ -283,7 +283,7 @@ static void drawResources() {
 	ImVec2 cursor = ImGui::GetCursorPos();
 	ImGui::SetCursorPos(ImVec2(cursor.x, cursor.y + 10.f));
 	ImGui::Text("Preview:");
-	ImGui::BeginChild("TexturePreview", ImVec2(0, 0), ImGuiChildFlags_Border | ImGuiChildFlags_ResizeX | ImGuiChildFlags_ResizeY);
+	ImGui::BeginChild("TexturePreview", ImVec2(0, 0), ImGuiChildFlags_Borders | ImGuiChildFlags_ResizeX | ImGuiChildFlags_ResizeY);
 	for (auto &res : g_twp->_resManager->_textures) {
 		if (_state->_textureSelected == res._key) {
 			ImGui::Image((ImTextureID)(intptr_t)res._value.id, ImVec2(res._value.width, res._value.height));