mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-11 12:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	docs/CHANGELOG.txt
#	imgui_widgets.cpp
This commit is contained in:
ocornut
2023-03-29 18:41:41 +02:00
parent bf87fbcbcc 5f301914a0
commit 4fdafef54f
15 changed files with 170 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backends/imgui_impl_sdlrenderer.cpp
View File

@@ -33,6 +33,12 @@
#include <stdint.h> // intptr_t
#endif
// Clang warnings with -Weverything
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wsign-conversion" // warning: implicit conversion changes signedness
#endif
// SDL
#include <SDL.h>
#if !SDL_VERSION_ATLEAST(2,0,17)
@@ -250,3 +256,7 @@ void ImGui_ImplSDLRenderer_DestroyDeviceObjects()
{
ImGui_ImplSDLRenderer_DestroyFontsTexture();
}
#if defined(__clang__)
#pragma clang diagnostic pop
#endif