mirror of
https://github.com/ocornut/imgui.git
synced 2025-02-08 23:19:40 +01:00
Misc: fixed misc/cpp/imgui_stdlib.h/.cpp not supporting IMGUI_DISABLE. (#8294)
This commit is contained in:
parent
a0f907933d
commit
f169102c8e
@ -60,6 +60,7 @@ Other changes:
|
|||||||
windows with the ImGuiWindowFlags_NoNavInputs flag. (#8231)
|
windows with the ImGuiWindowFlags_NoNavInputs flag. (#8231)
|
||||||
- Debug Tools: Debug Log: hovering 0xXXXXXXXX values in log is allowed even
|
- Debug Tools: Debug Log: hovering 0xXXXXXXXX values in log is allowed even
|
||||||
if a popup is blocking mouse access to the debug log window. (#5855)
|
if a popup is blocking mouse access to the debug log window. (#5855)
|
||||||
|
- Misc: fixed misc/cpp/imgui_stdlib.h/.cpp not supporting IMGUI_DISABLE. (#8294) [@juur]
|
||||||
- Backends: Allegro5: Avoid calling al_set_mouse_cursor() repeatedly since it appears
|
- Backends: Allegro5: Avoid calling al_set_mouse_cursor() repeatedly since it appears
|
||||||
to leak on on X11 (#8256). [@Helodity]
|
to leak on on X11 (#8256). [@Helodity]
|
||||||
- Backends: Vulkan: Fixed setting VkSwapchainCreateInfoKHR::preTransform for
|
- Backends: Vulkan: Fixed setting VkSwapchainCreateInfoKHR::preTransform for
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
// https://github.com/ocornut/imgui/wiki/Useful-Extensions#cness
|
// https://github.com/ocornut/imgui/wiki/Useful-Extensions#cness
|
||||||
|
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
|
#ifndef IMGUI_DISABLE
|
||||||
#include "imgui_stdlib.h"
|
#include "imgui_stdlib.h"
|
||||||
|
|
||||||
// Clang warnings with -Weverything
|
// Clang warnings with -Weverything
|
||||||
@ -83,3 +84,5 @@ bool ImGui::InputTextWithHint(const char* label, const char* hint, std::string*
|
|||||||
#if defined(__clang__)
|
#if defined(__clang__)
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // #ifndef IMGUI_DISABLE
|
||||||
|
@ -9,6 +9,8 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#ifndef IMGUI_DISABLE
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace ImGui
|
namespace ImGui
|
||||||
@ -19,3 +21,5 @@ namespace ImGui
|
|||||||
IMGUI_API bool InputTextMultiline(const char* label, std::string* str, const ImVec2& size = ImVec2(0, 0), ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = nullptr, void* user_data = nullptr);
|
IMGUI_API bool InputTextMultiline(const char* label, std::string* str, const ImVec2& size = ImVec2(0, 0), ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = nullptr, void* user_data = nullptr);
|
||||||
IMGUI_API bool InputTextWithHint(const char* label, const char* hint, std::string* str, ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = nullptr, void* user_data = nullptr);
|
IMGUI_API bool InputTextWithHint(const char* label, const char* hint, std::string* str, ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = nullptr, void* user_data = nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // #ifndef IMGUI_DISABLE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user