mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Merge branch 'master' into docking

Browse source
This commit is contained in:
ocornut 2025-06-30 21:18:46 +02:00
commit 92e2df5978
12 changed files with 149 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backends/imgui_impl_sdl2.cpp
View file

@ -128,6 +128,9 @@
#ifdef __EMSCRIPTEN__
#include <emscripten/em_js.h>
#endif
#ifdef Status // X11 headers
#undef Status
#endif
#if SDL_VERSION_ATLEAST(2,0,4) && !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) && !(defined(__APPLE__) && TARGET_OS_IOS) && !defined(__amigaos4__)
#define SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE 1