Skip to content

Instantly share code, notes, and snippets.

@ousttrue
Created January 15, 2018 00:48
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ousttrue/1dfda0f42086d4123803acd72af543dd to your computer and use it in GitHub Desktop.
Save ousttrue/1dfda0f42086d4123803acd72af543dd to your computer and use it in GitHub Desktop.
imgui patch for UWP build
diff --git a/examples/directx11_example/imgui_impl_dx11.cpp b/examples/directx11_example/imgui_impl_dx11.cpp
index 0442d78..48e971b 100644
--- a/examples/directx11_example/imgui_impl_dx11.cpp
+++ b/examples/directx11_example/imgui_impl_dx11.cpp
@@ -547,6 +547,7 @@ void ImGui_ImplDX11_Shutdown()
g_hWnd = (HWND)0;
}
+#ifndef UWP
void ImGui_ImplDX11_NewFrame()
{
if (!g_pFontSampler)
@@ -582,3 +583,4 @@ void ImGui_ImplDX11_NewFrame()
// Start the frame
ImGui::NewFrame();
}
+#endif
\ No newline at end of file
diff --git a/imgui.cpp b/imgui.cpp
index f98cd68..f21c6a1 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -10371,7 +10371,7 @@ void ImGui::Value(const char* prefix, float v, const char* float_format)
#endif
// Win32 API clipboard implementation
-#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS)
+#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS) && !defined(UWP)
#ifdef _MSC_VER
#pragma comment(lib, "user32")
@@ -10439,7 +10439,7 @@ static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
#endif
// Win32 API IME support (for Asian languages, etc.)
-#if defined(_WIN32) && !defined(__GNUC__) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCS)
+#if defined(_WIN32) && !defined(__GNUC__) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCS) && !defined(UWP)
#include <imm.h>
#ifdef _MSC_VER
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment