From b26ac92a122b86202bf0763eec397d2aa72b572f Mon Sep 17 00:00:00 2001 From: omar Date: Sun, 27 Jan 2019 16:43:56 +0100 Subject: [PATCH] Revert "Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages)." This reverts commit 20bc06af70a9b9189d37812a160af4c5ff9057f8. --- docs/CHANGELOG.txt | 1 - imgui.cpp | 7 ------- imgui.h | 1 - 3 files changed, 9 deletions(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 21966ac7..bd13b790 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -37,7 +37,6 @@ Other Changes: - Added .editorconfig file for text editors to standardize using spaces. (#2038) [@kudaba] - Fixed range-version of PushID() and GetID() not honoring the ### operator to restart from the seed value. - Window: When resizing from an edge, the border is more visible and better follow the rounded corners. -- Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages). - ImDrawList: Fixed AddCircle(), AddCircleFilled() angle step being off, which was visible when drawing a "circle" with a small number of segments (e.g. an hexagon). (#2287) [@baktery] - ImGuiTextBuffer: Added append() function (unformatted). diff --git a/imgui.cpp b/imgui.cpp index fd270b51..35b89ae5 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -6454,13 +6454,6 @@ void ImGui::PushID(const void* ptr_id) window->IDStack.push_back(window->GetIDNoKeepAlive(ptr_id)); } -void ImGui::PushID(size_t int_id) -{ - const void* ptr_id = (void*)int_id; - ImGuiWindow* window = GImGui->CurrentWindow; - window->IDStack.push_back(window->GetIDNoKeepAlive(ptr_id)); -} - void ImGui::PushID(int int_id) { const void* ptr_id = (void*)(intptr_t)int_id; diff --git a/imgui.h b/imgui.h index ced75d40..c12f9739 100644 --- a/imgui.h +++ b/imgui.h @@ -358,7 +358,6 @@ namespace ImGui IMGUI_API void PushID(const char* str_id); // push string into the ID stack (will hash string). IMGUI_API void PushID(const char* str_id_begin, const char* str_id_end); // push string into the ID stack (will hash string). IMGUI_API void PushID(const void* ptr_id); // push pointer into the ID stack (will hash pointer). - IMGUI_API void PushID(size_t int_id); // push pointer into the ID stack (will hash integer). IMGUI_API void PushID(int int_id); // push integer into the ID stack (will hash integer). IMGUI_API void PopID(); // pop from the ID stack. IMGUI_API ImGuiID GetID(const char* str_id); // calculate unique ID (hash of whole ID stack + given parameter). e.g. if you want to query into ImGuiStorage yourself