updated (floooh/sokol@689c826)

floooh · Sep 20, 2024 · 89c4842 · 89c4842
1 parent 727f2c4
commit 89c4842
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/sokol/c/sokol_gl.h b/src/sokol/c/sokol_gl.h
@@ -2919,7 +2919,8 @@ static void _sgl_destroy_context(sgl_context ctx_id) {
 // >>misc
 
 static sgl_error_t _sgl_error_defaults(void) {
-    sgl_error_t defaults = {0};
+    sgl_error_t defaults;
+    _sgl_clear(&defaults, sizeof(defaults));
     return defaults;
 }
 

diff --git a/src/sokol/c/sokol_imgui.h b/src/sokol/c/sokol_imgui.h
@@ -2200,15 +2200,13 @@ SOKOL_API_IMPL void simgui_setup(const simgui_desc_t* desc) {
         ImGui::CreateContext();
         ImGui::StyleColorsDark();
         ImGuiIO* io = &ImGui::GetIO();
-        ImGuiPlatformIO* pio = &ImGui::GetPlatformIO();
         if (!_simgui.desc.no_default_font) {
             io->Fonts->AddFontDefault();
         }
     #else
         igCreateContext(NULL);
         igStyleColorsDark(igGetStyle());
         ImGuiIO* io = igGetIO();
-        ImGuiPlatformIO* pio = igGetPlatformIO();
         if (!_simgui.desc.no_default_font) {
             ImFontAtlas_AddFontDefault(io->Fonts, NULL);
         }
@@ -2220,6 +2218,11 @@ SOKOL_API_IMPL void simgui_setup(const simgui_desc_t* desc) {
         if (!_simgui.desc.disable_set_mouse_cursor) {
             io->BackendFlags |= ImGuiBackendFlags_HasMouseCursors;
         }
+        #if defined(__cplusplus)
+            ImGuiPlatformIO* pio = &ImGui::GetPlatformIO();
+        #else
+            ImGuiPlatformIO* pio = igGetPlatformIO();
+        #endif
         pio->Platform_SetClipboardTextFn = _simgui_set_clipboard;
         pio->Platform_GetClipboardTextFn = _simgui_get_clipboard;
     #endif