Merge branch 'docking_inter'

pull imgui 1.86 and generate
2025-08-10 20:08:31 +01:00 · 2021-12-24 11:54:12 +01:00 · 2021-12-24 11:34:47 +01:00 · 2021-12-06 19:41:17 +01:00 · 2021-12-06 19:38:53 +01:00 · 2021-10-18 19:17:22 +02:00
20 changed files with 6352 additions and 10592 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "imgui"]
 	path = imgui
 	url = https://github.com/ocornut/imgui.git
-	branch = docking
+	branch = master
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)

 Notes:
-* currently this wrapper is based on version [1.84.1 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.86 of Dear ImGui with internal api]
 * only functions, structs and enums from imgui.h (an optionally imgui_internal.h) are wrapped.
 * if you are interested in imgui backends you should look [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui) project.
 * All naming is algorithmic except for those names that were coded in cimgui_overloads table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L60). In the official version this table is empty.
--- a/backend_test/CMakeLists.txt
+++ b/backend_test/CMakeLists.txt
@@ -52,7 +52,7 @@ if(IMGUI_FREETYPE)
 endif(IMGUI_FREETYPE)

 #opengl3
-list(APPEND IMGUI_SOURCES ${BAKENDS_FOLDER}imgui_impl_opengl3.cpp ../imgui/examples/libs/gl3w/GL/gl3w.c)
+list(APPEND IMGUI_SOURCES ${BAKENDS_FOLDER}imgui_impl_opengl3.cpp)
 list(APPEND IMGUI_SOURCES ./cimgui_extras.cpp)
 include_directories(../imgui/examples/libs/gl3w)
 if(WIN32)
--- a/backend_test/cimgui_extras.cpp
+++ b/backend_test/cimgui_extras.cpp
@@ -1,11 +1,10 @@
 #include "../imgui/imgui.h"

-// GL3W/GLFW
-#include <GL/gl3w.h>    // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you.
+#include "../imgui/backends/imgui_impl_opengl3_loader.h"

 //making it accesible for luajit
 #ifdef _WIN32
-extern "C" __declspec( dllexport ) int Do_gl3wInit(void){ return gl3wInit();};
+extern "C" __declspec( dllexport ) int Do_gl3wInit(void){ return imgl3wInit();};
 #else
-extern "C"	int Do_gl3wInit(void){ return gl3wInit();};
+extern "C"	int Do_gl3wInit(void){ return imgl3wInit();};
 #endif
--- a/cimgui.cpp
+++ b/cimgui.cpp
@@ -1,7 +1,6 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.84.1" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.86" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
-//docking branch

 #include "./imgui/imgui.h"
 #ifdef CIMGUI_FREETYPE
@@ -84,6 +83,10 @@ CIMGUI_API void igShowMetricsWindow(bool* p_open)
 {
    return ImGui::ShowMetricsWindow(p_open);
 }
+CIMGUI_API void igShowStackToolWindow(bool* p_open)
+{
+    return ImGui::ShowStackToolWindow(p_open);
+}
 CIMGUI_API void igShowAboutWindow(bool* p_open)
 {
    return ImGui::ShowAboutWindow(p_open);
@@ -160,10 +163,6 @@ CIMGUI_API ImDrawList* igGetWindowDrawList()
 {
    return ImGui::GetWindowDrawList();
 }
-CIMGUI_API float igGetWindowDpiScale()
-{
-    return ImGui::GetWindowDpiScale();
-}
 CIMGUI_API void igGetWindowPos(ImVec2 *pOut)
 {
    *pOut = ImGui::GetWindowPos();
@@ -180,10 +179,6 @@ CIMGUI_API float igGetWindowHeight()
 {
    return ImGui::GetWindowHeight();
 }
-CIMGUI_API ImGuiViewport* igGetWindowViewport()
-{
-    return ImGui::GetWindowViewport();
-}
 CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot)
 {
    return ImGui::SetNextWindowPos(pos,cond,pivot);
@@ -212,10 +207,6 @@ CIMGUI_API void igSetNextWindowBgAlpha(float alpha)
 {
    return ImGui::SetNextWindowBgAlpha(alpha);
 }
-CIMGUI_API void igSetNextWindowViewport(ImGuiID viewport_id)
-{
-    return ImGui::SetNextWindowViewport(viewport_id);
-}
 CIMGUI_API void igSetWindowPos_Vec2(const ImVec2 pos,ImGuiCond cond)
 {
    return ImGui::SetWindowPos(pos,cond);
@@ -268,10 +259,6 @@ CIMGUI_API void igGetWindowContentRegionMax(ImVec2 *pOut)
 {
    *pOut = ImGui::GetWindowContentRegionMax();
 }
-CIMGUI_API float igGetWindowContentRegionWidth()
-{
-    return ImGui::GetWindowContentRegionWidth();
-}
 CIMGUI_API float igGetScrollX()
 {
    return ImGui::GetScrollX();
@@ -1221,30 +1208,6 @@ CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label)
 {
    return ImGui::SetTabItemClosed(tab_or_docked_window_label);
 }
-CIMGUI_API ImGuiID igDockSpace(ImGuiID id,const ImVec2 size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
-{
-    return ImGui::DockSpace(id,size,flags,window_class);
-}
-CIMGUI_API ImGuiID igDockSpaceOverViewport(const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
-{
-    return ImGui::DockSpaceOverViewport(viewport,flags,window_class);
-}
-CIMGUI_API void igSetNextWindowDockID(ImGuiID dock_id,ImGuiCond cond)
-{
-    return ImGui::SetNextWindowDockID(dock_id,cond);
-}
-CIMGUI_API void igSetNextWindowClass(const ImGuiWindowClass* window_class)
-{
-    return ImGui::SetNextWindowClass(window_class);
-}
-CIMGUI_API ImGuiID igGetWindowDockID()
-{
-    return ImGui::GetWindowDockID();
-}
-CIMGUI_API bool igIsWindowDocked()
-{
-    return ImGui::IsWindowDocked();
-}
 CIMGUI_API void igLogToTTY(int auto_open_depth)
 {
    return ImGui::LogToTTY(auto_open_depth);
@@ -1417,14 +1380,6 @@ CIMGUI_API ImDrawList* igGetForegroundDrawList_Nil()
 {
    return ImGui::GetForegroundDrawList();
 }
-CIMGUI_API ImDrawList* igGetBackgroundDrawList_ViewportPtr(ImGuiViewport* viewport)
-{
-    return ImGui::GetBackgroundDrawList(viewport);
-}
-CIMGUI_API ImDrawList* igGetForegroundDrawList_ViewportPtr(ImGuiViewport* viewport)
-{
-    return ImGui::GetForegroundDrawList(viewport);
-}
 CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData()
 {
    return ImGui::GetDrawListSharedData();
@@ -1441,10 +1396,6 @@ CIMGUI_API ImGuiStorage* igGetStateStorage()
 {
    return ImGui::GetStateStorage();
 }
-CIMGUI_API void igCalcListClipping(int items_count,float items_height,int* out_items_display_start,int* out_items_display_end)
-{
-    return ImGui::CalcListClipping(items_count,items_height,out_items_display_start,out_items_display_end);
-}
 CIMGUI_API bool igBeginChildFrame(ImGuiID id,const ImVec2 size,ImGuiWindowFlags flags)
 {
    return ImGui::BeginChildFrame(id,size,flags);
@@ -1513,6 +1464,10 @@ CIMGUI_API bool igIsMouseDoubleClicked(ImGuiMouseButton button)
 {
    return ImGui::IsMouseDoubleClicked(button);
 }
+CIMGUI_API int igGetMouseClickedCount(ImGuiMouseButton button)
+{
+    return ImGui::GetMouseClickedCount(button);
+}
 CIMGUI_API bool igIsMouseHoveringRect(const ImVec2 r_min,const ImVec2 r_max,bool clip)
 {
    return ImGui::IsMouseHoveringRect(r_min,r_max,clip);
@@ -1601,30 +1556,6 @@ CIMGUI_API void igMemFree(void* ptr)
 {
    return ImGui::MemFree(ptr);
 }
-CIMGUI_API ImGuiPlatformIO* igGetPlatformIO()
-{
-    return &ImGui::GetPlatformIO();
-}
-CIMGUI_API void igUpdatePlatformWindows()
-{
-    return ImGui::UpdatePlatformWindows();
-}
-CIMGUI_API void igRenderPlatformWindowsDefault(void* platform_render_arg,void* renderer_render_arg)
-{
-    return ImGui::RenderPlatformWindowsDefault(platform_render_arg,renderer_render_arg);
-}
-CIMGUI_API void igDestroyPlatformWindows()
-{
-    return ImGui::DestroyPlatformWindows();
-}
-CIMGUI_API ImGuiViewport* igFindViewportByID(ImGuiID id)
-{
-    return ImGui::FindViewportByID(id);
-}
-CIMGUI_API ImGuiViewport* igFindViewportByPlatformHandle(void* platform_handle)
-{
-    return ImGui::FindViewportByPlatformHandle(platform_handle);
-}
 CIMGUI_API ImGuiStyle* ImGuiStyle_ImGuiStyle(void)
 {
    return IM_NEW(ImGuiStyle)();
@@ -1697,14 +1628,6 @@ CIMGUI_API bool ImGuiInputTextCallbackData_HasSelection(ImGuiInputTextCallbackDa
 {
    return self->HasSelection();
 }
-CIMGUI_API ImGuiWindowClass* ImGuiWindowClass_ImGuiWindowClass(void)
-{
-    return IM_NEW(ImGuiWindowClass)();
-}
-CIMGUI_API void ImGuiWindowClass_destroy(ImGuiWindowClass* self)
-{
-    IM_DELETE(self);
-}
 CIMGUI_API ImGuiPayload* ImGuiPayload_ImGuiPayload(void)
 {
    return IM_NEW(ImGuiPayload)();
@@ -1941,6 +1864,10 @@ CIMGUI_API bool ImGuiListClipper_Step(ImGuiListClipper* self)
 {
    return self->Step();
 }
+CIMGUI_API void ImGuiListClipper_ForceDisplayRangeByIndices(ImGuiListClipper* self,int item_min,int item_max)
+{
+    return self->ForceDisplayRangeByIndices(item_min,item_max);
+}
 CIMGUI_API ImColor* ImColor_ImColor_Nil(void)
 {
    return IM_NEW(ImColor)();
@@ -2553,22 +2480,6 @@ CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* self)
 {
    *pOut = self->GetWorkCenter();
 }
-CIMGUI_API ImGuiPlatformIO* ImGuiPlatformIO_ImGuiPlatformIO(void)
-{
-    return IM_NEW(ImGuiPlatformIO)();
-}
-CIMGUI_API void ImGuiPlatformIO_destroy(ImGuiPlatformIO* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API ImGuiPlatformMonitor* ImGuiPlatformMonitor_ImGuiPlatformMonitor(void)
-{
-    return IM_NEW(ImGuiPlatformMonitor)();
-}
-CIMGUI_API void ImGuiPlatformMonitor_destroy(ImGuiPlatformMonitor* self)
-{
-    IM_DELETE(self);
-}
 CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed)
 {
    return ImHashData(data,data_size,seed);
@@ -2577,6 +2488,10 @@ CIMGUI_API ImGuiID igImHashStr(const char* data,size_t data_size,ImU32 seed)
 {
    return ImHashStr(data,data_size,seed);
 }
+CIMGUI_API void igImQsort(void* base,size_t count,size_t size_of_element,int(*compare_func)(void const*,void const*))
+{
+    return ImQsort(base,count,size_of_element,compare_func);
+}
 CIMGUI_API ImU32 igImAlphaBlendColors(ImU32 col_a,ImU32 col_b)
 {
    return ImAlphaBlendColors(col_a,col_b);
@@ -2845,6 +2760,10 @@ CIMGUI_API void igImMul(ImVec2 *pOut,const ImVec2 lhs,const ImVec2 rhs)
 {
    *pOut = ImMul(lhs,rhs);
 }
+CIMGUI_API bool igImIsFloatAboveGuaranteedIntegerPrecision(float f)
+{
+    return ImIsFloatAboveGuaranteedIntegerPrecision(f);
+}
 CIMGUI_API void igImBezierCubicCalc(ImVec2 *pOut,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,float t)
 {
    *pOut = ImBezierCubicCalc(p1,p2,p3,p4,t);
@@ -3205,18 +3124,6 @@ CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API ImGuiNavItemData* ImGuiNavItemData_ImGuiNavItemData(void)
-{
-    return IM_NEW(ImGuiNavItemData)();
-}
-CIMGUI_API void ImGuiNavItemData_destroy(ImGuiNavItemData* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API void ImGuiNavItemData_Clear(ImGuiNavItemData* self)
-{
-    return self->Clear();
-}
 CIMGUI_API ImGuiNextWindowData* ImGuiNextWindowData_ImGuiNextWindowData(void)
 {
    return IM_NEW(ImGuiNextWindowData)();
@@ -3249,6 +3156,22 @@ CIMGUI_API void ImGuiLastItemData_destroy(ImGuiLastItemData* self)
 {
    IM_DELETE(self);
 }
+CIMGUI_API ImGuiStackSizes* ImGuiStackSizes_ImGuiStackSizes(void)
+{
+    return IM_NEW(ImGuiStackSizes)();
+}
+CIMGUI_API void ImGuiStackSizes_destroy(ImGuiStackSizes* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImGuiStackSizes_SetToCurrentState(ImGuiStackSizes* self)
+{
+    return self->SetToCurrentState();
+}
+CIMGUI_API void ImGuiStackSizes_CompareWithCurrentState(ImGuiStackSizes* self)
+{
+    return self->CompareWithCurrentState();
+}
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Ptr(void* ptr)
 {
    return IM_NEW(ImGuiPtrOrIndex)(ptr);
@@ -3261,6 +3184,38 @@ CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Int(int index)
 {
    return IM_NEW(ImGuiPtrOrIndex)(index);
 }
+CIMGUI_API ImGuiListClipperRange ImGuiListClipperRange_FromIndices(int min,int max)
+{
+    return ImGuiListClipperRange::FromIndices(min,max);
+}
+CIMGUI_API ImGuiListClipperRange ImGuiListClipperRange_FromPositions(float y1,float y2,int off_min,int off_max)
+{
+    return ImGuiListClipperRange::FromPositions(y1,y2,off_min,off_max);
+}
+CIMGUI_API ImGuiListClipperData* ImGuiListClipperData_ImGuiListClipperData(void)
+{
+    return IM_NEW(ImGuiListClipperData)();
+}
+CIMGUI_API void ImGuiListClipperData_destroy(ImGuiListClipperData* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImGuiListClipperData_Reset(ImGuiListClipperData* self,ImGuiListClipper* clipper)
+{
+    return self->Reset(clipper);
+}
+CIMGUI_API ImGuiNavItemData* ImGuiNavItemData_ImGuiNavItemData(void)
+{
+    return IM_NEW(ImGuiNavItemData)();
+}
+CIMGUI_API void ImGuiNavItemData_destroy(ImGuiNavItemData* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImGuiNavItemData_Clear(ImGuiNavItemData* self)
+{
+    return self->Clear();
+}
 CIMGUI_API ImGuiOldColumnData* ImGuiOldColumnData_ImGuiOldColumnData(void)
 {
    return IM_NEW(ImGuiOldColumnData)();
@@ -3277,70 +3232,6 @@ CIMGUI_API void ImGuiOldColumns_destroy(ImGuiOldColumns* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API ImGuiDockNode* ImGuiDockNode_ImGuiDockNode(ImGuiID id)
-{
-    return IM_NEW(ImGuiDockNode)(id);
-}
-CIMGUI_API void ImGuiDockNode_destroy(ImGuiDockNode* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API bool ImGuiDockNode_IsRootNode(ImGuiDockNode* self)
-{
-    return self->IsRootNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsDockSpace(ImGuiDockNode* self)
-{
-    return self->IsDockSpace();
-}
-CIMGUI_API bool ImGuiDockNode_IsFloatingNode(ImGuiDockNode* self)
-{
-    return self->IsFloatingNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsCentralNode(ImGuiDockNode* self)
-{
-    return self->IsCentralNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsHiddenTabBar(ImGuiDockNode* self)
-{
-    return self->IsHiddenTabBar();
-}
-CIMGUI_API bool ImGuiDockNode_IsNoTabBar(ImGuiDockNode* self)
-{
-    return self->IsNoTabBar();
-}
-CIMGUI_API bool ImGuiDockNode_IsSplitNode(ImGuiDockNode* self)
-{
-    return self->IsSplitNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsLeafNode(ImGuiDockNode* self)
-{
-    return self->IsLeafNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsEmpty(ImGuiDockNode* self)
-{
-    return self->IsEmpty();
-}
-CIMGUI_API void ImGuiDockNode_Rect(ImRect *pOut,ImGuiDockNode* self)
-{
-    *pOut = self->Rect();
-}
-CIMGUI_API void ImGuiDockNode_SetLocalFlags(ImGuiDockNode* self,ImGuiDockNodeFlags flags)
-{
-    return self->SetLocalFlags(flags);
-}
-CIMGUI_API void ImGuiDockNode_UpdateMergedFlags(ImGuiDockNode* self)
-{
-    return self->UpdateMergedFlags();
-}
-CIMGUI_API ImGuiDockContext* ImGuiDockContext_ImGuiDockContext(void)
-{
-    return IM_NEW(ImGuiDockContext)();
-}
-CIMGUI_API void ImGuiDockContext_destroy(ImGuiDockContext* self)
-{
-    IM_DELETE(self);
-}
 CIMGUI_API ImGuiViewportP* ImGuiViewportP_ImGuiViewportP(void)
 {
    return IM_NEW(ImGuiViewportP)();
@@ -3349,10 +3240,6 @@ CIMGUI_API void ImGuiViewportP_destroy(ImGuiViewportP* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API void ImGuiViewportP_ClearRequestFlags(ImGuiViewportP* self)
-{
-    return self->ClearRequestFlags();
-}
 CIMGUI_API void ImGuiViewportP_CalcWorkRectPos(ImVec2 *pOut,ImGuiViewportP* self,const ImVec2 off_min)
 {
    *pOut = self->CalcWorkRectPos(off_min);
@@ -3405,21 +3292,21 @@ CIMGUI_API void ImGuiMetricsConfig_destroy(ImGuiMetricsConfig* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API ImGuiStackSizes* ImGuiStackSizes_ImGuiStackSizes(void)
+CIMGUI_API ImGuiStackLevelInfo* ImGuiStackLevelInfo_ImGuiStackLevelInfo(void)
 {
-    return IM_NEW(ImGuiStackSizes)();
+    return IM_NEW(ImGuiStackLevelInfo)();
 }
-CIMGUI_API void ImGuiStackSizes_destroy(ImGuiStackSizes* self)
+CIMGUI_API void ImGuiStackLevelInfo_destroy(ImGuiStackLevelInfo* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API void ImGuiStackSizes_SetToCurrentState(ImGuiStackSizes* self)
+CIMGUI_API ImGuiStackTool* ImGuiStackTool_ImGuiStackTool(void)
 {
-    return self->SetToCurrentState();
+    return IM_NEW(ImGuiStackTool)();
 }
-CIMGUI_API void ImGuiStackSizes_CompareWithCurrentState(ImGuiStackSizes* self)
+CIMGUI_API void ImGuiStackTool_destroy(ImGuiStackTool* self)
 {
-    return self->CompareWithCurrentState();
+    IM_DELETE(self);
 }
 CIMGUI_API ImGuiContextHook* ImGuiContextHook_ImGuiContextHook(void)
 {
@@ -3589,9 +3476,13 @@ CIMGUI_API void igCalcWindowNextAutoFitSize(ImVec2 *pOut,ImGuiWindow* window)
 {
    *pOut = ImGui::CalcWindowNextAutoFitSize(window);
 }
-CIMGUI_API bool igIsWindowChildOf(ImGuiWindow* window,ImGuiWindow* potential_parent)
+CIMGUI_API bool igIsWindowChildOf(ImGuiWindow* window,ImGuiWindow* potential_parent,bool popup_hierarchy)
 {
-    return ImGui::IsWindowChildOf(window,potential_parent);
+    return ImGui::IsWindowChildOf(window,potential_parent,popup_hierarchy);
+}
+CIMGUI_API bool igIsWindowWithinBeginStackOf(ImGuiWindow* window,ImGuiWindow* potential_parent)
+{
+    return ImGui::IsWindowWithinBeginStackOf(window,potential_parent);
 }
 CIMGUI_API bool igIsWindowAbove(ImGuiWindow* potential_above,ImGuiWindow* potential_below)
 {
@@ -3617,6 +3508,14 @@ CIMGUI_API void igSetWindowHitTestHole(ImGuiWindow* window,const ImVec2 pos,cons
 {
    return ImGui::SetWindowHitTestHole(window,pos,size);
 }
+CIMGUI_API void igWindowRectAbsToRel(ImRect *pOut,ImGuiWindow* window,const ImRect r)
+{
+    *pOut = ImGui::WindowRectAbsToRel(window,r);
+}
+CIMGUI_API void igWindowRectRelToAbs(ImRect *pOut,ImGuiWindow* window,const ImRect r)
+{
+    *pOut = ImGui::WindowRectRelToAbs(window,r);
+}
 CIMGUI_API void igFocusWindow(ImGuiWindow* window)
 {
    return ImGui::FocusWindow(window);
@@ -3637,6 +3536,18 @@ CIMGUI_API void igBringWindowToDisplayBack(ImGuiWindow* window)
 {
    return ImGui::BringWindowToDisplayBack(window);
 }
+CIMGUI_API void igBringWindowToDisplayBehind(ImGuiWindow* window,ImGuiWindow* above_window)
+{
+    return ImGui::BringWindowToDisplayBehind(window,above_window);
+}
+CIMGUI_API int igFindWindowDisplayIndex(ImGuiWindow* window)
+{
+    return ImGui::FindWindowDisplayIndex(window);
+}
+CIMGUI_API ImGuiWindow* igFindBottomMostVisibleWindowWithinBeginStack(ImGuiWindow* window)
+{
+    return ImGui::FindBottomMostVisibleWindowWithinBeginStack(window);
+}
 CIMGUI_API void igSetCurrentFont(ImFont* font)
 {
    return ImGui::SetCurrentFont(font);
@@ -3649,6 +3560,14 @@ CIMGUI_API ImDrawList* igGetForegroundDrawList_WindowPtr(ImGuiWindow* window)
 {
    return ImGui::GetForegroundDrawList(window);
 }
+CIMGUI_API ImDrawList* igGetBackgroundDrawList_ViewportPtr(ImGuiViewport* viewport)
+{
+    return ImGui::GetBackgroundDrawList(viewport);
+}
+CIMGUI_API ImDrawList* igGetForegroundDrawList_ViewportPtr(ImGuiViewport* viewport)
+{
+    return ImGui::GetForegroundDrawList(viewport);
+}
 CIMGUI_API void igInitialize(ImGuiContext* context)
 {
    return ImGui::Initialize(context);
@@ -3665,10 +3584,6 @@ CIMGUI_API void igStartMouseMovingWindow(ImGuiWindow* window)
 {
    return ImGui::StartMouseMovingWindow(window);
 }
-CIMGUI_API void igStartMouseMovingWindowOrNode(ImGuiWindow* window,ImGuiDockNode* node,bool undock_floating_node)
-{
-    return ImGui::StartMouseMovingWindowOrNode(window,node,undock_floating_node);
-}
 CIMGUI_API void igUpdateMouseMovingWindowNewFrame()
 {
    return ImGui::UpdateMouseMovingWindowNewFrame();
@@ -3689,26 +3604,6 @@ CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType ty
 {
    return ImGui::CallContextHooks(context,type);
 }
-CIMGUI_API void igTranslateWindowsInViewport(ImGuiViewportP* viewport,const ImVec2 old_pos,const ImVec2 new_pos)
-{
-    return ImGui::TranslateWindowsInViewport(viewport,old_pos,new_pos);
-}
-CIMGUI_API void igScaleWindowsInViewport(ImGuiViewportP* viewport,float scale)
-{
-    return ImGui::ScaleWindowsInViewport(viewport,scale);
-}
-CIMGUI_API void igDestroyPlatformWindow(ImGuiViewportP* viewport)
-{
-    return ImGui::DestroyPlatformWindow(viewport);
-}
-CIMGUI_API void igSetCurrentViewport(ImGuiWindow* window,ImGuiViewportP* viewport)
-{
-    return ImGui::SetCurrentViewport(window,viewport);
-}
-CIMGUI_API const ImGuiPlatformMonitor* igGetViewportPlatformMonitor(ImGuiViewport* viewport)
-{
-    return ImGui::GetViewportPlatformMonitor(viewport);
-}
 CIMGUI_API void igMarkIniSettingsDirty_Nil()
 {
    return ImGui::MarkIniSettingsDirty();
@@ -3757,9 +3652,21 @@ CIMGUI_API void igSetScrollFromPosY_WindowPtr(ImGuiWindow* window,float local_y,
 {
    return ImGui::SetScrollFromPosY(window,local_y,center_y_ratio);
 }
-CIMGUI_API void igScrollToBringRectIntoView(ImVec2 *pOut,ImGuiWindow* window,const ImRect item_rect)
+CIMGUI_API void igScrollToItem(ImGuiScrollFlags flags)
 {
-    *pOut = ImGui::ScrollToBringRectIntoView(window,item_rect);
+    return ImGui::ScrollToItem(flags);
+}
+CIMGUI_API void igScrollToRect(ImGuiWindow* window,const ImRect rect,ImGuiScrollFlags flags)
+{
+    return ImGui::ScrollToRect(window,rect,flags);
+}
+CIMGUI_API void igScrollToRectEx(ImVec2 *pOut,ImGuiWindow* window,const ImRect rect,ImGuiScrollFlags flags)
+{
+    *pOut = ImGui::ScrollToRectEx(window,rect,flags);
+}
+CIMGUI_API void igScrollToBringRectIntoView(ImGuiWindow* window,const ImRect rect)
+{
+    return ImGui::ScrollToBringRectIntoView(window,rect);
 }
 CIMGUI_API ImGuiID igGetItemID()
 {
@@ -3825,21 +3732,17 @@ CIMGUI_API void igItemSize_Rect(const ImRect bb,float text_baseline_y)
 {
    return ImGui::ItemSize(bb,text_baseline_y);
 }
-CIMGUI_API bool igItemAdd(const ImRect bb,ImGuiID id,const ImRect* nav_bb,ImGuiItemAddFlags flags)
+CIMGUI_API bool igItemAdd(const ImRect bb,ImGuiID id,const ImRect* nav_bb,ImGuiItemFlags extra_flags)
 {
-    return ImGui::ItemAdd(bb,id,nav_bb,flags);
+    return ImGui::ItemAdd(bb,id,nav_bb,extra_flags);
 }
 CIMGUI_API bool igItemHoverable(const ImRect bb,ImGuiID id)
 {
    return ImGui::ItemHoverable(bb,id);
 }
-CIMGUI_API void igItemFocusable(ImGuiWindow* window,ImGuiID id)
+CIMGUI_API bool igIsClippedEx(const ImRect bb,ImGuiID id)
 {
-    return ImGui::ItemFocusable(window,id);
-}
-CIMGUI_API bool igIsClippedEx(const ImRect bb,ImGuiID id,bool clip_even_when_logged)
-{
-    return ImGui::IsClippedEx(bb,id,clip_even_when_logged);
+    return ImGui::IsClippedEx(bb,id);
 }
 CIMGUI_API void igSetLastItemData(ImGuiID item_id,ImGuiItemFlags in_flags,ImGuiItemStatusFlags status_flags,const ImRect item_rect)
 {
@@ -3909,6 +3812,10 @@ CIMGUI_API void igClosePopupsOverWindow(ImGuiWindow* ref_window,bool restore_foc
 {
    return ImGui::ClosePopupsOverWindow(ref_window,restore_focus_to_window_under_popup);
 }
+CIMGUI_API void igClosePopupsExceptModals()
+{
+    return ImGui::ClosePopupsExceptModals();
+}
 CIMGUI_API bool igIsPopupOpen_ID(ImGuiID id,ImGuiPopupFlags popup_flags)
 {
    return ImGui::IsPopupOpen(id,popup_flags);
@@ -3917,9 +3824,9 @@ CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_flags)
 {
    return ImGui::BeginPopupEx(id,extra_flags);
 }
-CIMGUI_API void igBeginTooltipEx(ImGuiWindowFlags extra_flags,ImGuiTooltipFlags tooltip_flags)
+CIMGUI_API void igBeginTooltipEx(ImGuiTooltipFlags tooltip_flags,ImGuiWindowFlags extra_window_flags)
 {
-    return ImGui::BeginTooltipEx(extra_flags,tooltip_flags);
+    return ImGui::BeginTooltipEx(tooltip_flags,extra_window_flags);
 }
 CIMGUI_API void igGetPopupAllowedExtentRect(ImRect *pOut,ImGuiWindow* window)
 {
@@ -3929,6 +3836,10 @@ CIMGUI_API ImGuiWindow* igGetTopMostPopupModal()
 {
    return ImGui::GetTopMostPopupModal();
 }
+CIMGUI_API ImGuiWindow* igGetTopMostAndVisiblePopupModal()
+{
+    return ImGui::GetTopMostAndVisiblePopupModal();
+}
 CIMGUI_API void igFindBestWindowPosForPopup(ImVec2 *pOut,ImGuiWindow* window)
 {
    *pOut = ImGui::FindBestWindowPosForPopup(window);
@@ -3941,6 +3852,10 @@ CIMGUI_API bool igBeginViewportSideBar(const char* name,ImGuiViewport* viewport,
 {
    return ImGui::BeginViewportSideBar(name,viewport,dir,size,window_flags);
 }
+CIMGUI_API bool igBeginMenuEx(const char* label,const char* icon,bool enabled)
+{
+    return ImGui::BeginMenuEx(label,icon,enabled);
+}
 CIMGUI_API bool igMenuItemEx(const char* label,const char* icon,const char* shortcut,bool selected,bool enabled)
 {
    return ImGui::MenuItemEx(label,icon,shortcut,selected,enabled);
@@ -3961,17 +3876,33 @@ CIMGUI_API void igNavInitWindow(ImGuiWindow* window,bool force_reinit)
 {
    return ImGui::NavInitWindow(window,force_reinit);
 }
+CIMGUI_API void igNavInitRequestApplyResult()
+{
+    return ImGui::NavInitRequestApplyResult();
+}
 CIMGUI_API bool igNavMoveRequestButNoResultYet()
 {
    return ImGui::NavMoveRequestButNoResultYet();
 }
+CIMGUI_API void igNavMoveRequestSubmit(ImGuiDir move_dir,ImGuiDir clip_dir,ImGuiNavMoveFlags move_flags,ImGuiScrollFlags scroll_flags)
+{
+    return ImGui::NavMoveRequestSubmit(move_dir,clip_dir,move_flags,scroll_flags);
+}
+CIMGUI_API void igNavMoveRequestForward(ImGuiDir move_dir,ImGuiDir clip_dir,ImGuiNavMoveFlags move_flags,ImGuiScrollFlags scroll_flags)
+{
+    return ImGui::NavMoveRequestForward(move_dir,clip_dir,move_flags,scroll_flags);
+}
+CIMGUI_API void igNavMoveRequestResolveWithLastItem(ImGuiNavItemData* result)
+{
+    return ImGui::NavMoveRequestResolveWithLastItem(result);
+}
 CIMGUI_API void igNavMoveRequestCancel()
 {
    return ImGui::NavMoveRequestCancel();
 }
-CIMGUI_API void igNavMoveRequestForward(ImGuiDir move_dir,ImGuiDir clip_dir,const ImRect bb_rel,ImGuiNavMoveFlags move_flags)
+CIMGUI_API void igNavMoveRequestApplyResult()
 {
-    return ImGui::NavMoveRequestForward(move_dir,clip_dir,bb_rel,move_flags);
+    return ImGui::NavMoveRequestApplyResult();
 }
 CIMGUI_API void igNavMoveRequestTryWrapping(ImGuiWindow* window,ImGuiNavMoveFlags move_flags)
 {
@@ -4053,150 +3984,6 @@ CIMGUI_API ImGuiKeyModFlags igGetMergedKeyModFlags()
 {
    return ImGui::GetMergedKeyModFlags();
 }
-CIMGUI_API void igDockContextInitialize(ImGuiContext* ctx)
-{
-    return ImGui::DockContextInitialize(ctx);
-}
-CIMGUI_API void igDockContextShutdown(ImGuiContext* ctx)
-{
-    return ImGui::DockContextShutdown(ctx);
-}
-CIMGUI_API void igDockContextClearNodes(ImGuiContext* ctx,ImGuiID root_id,bool clear_settings_refs)
-{
-    return ImGui::DockContextClearNodes(ctx,root_id,clear_settings_refs);
-}
-CIMGUI_API void igDockContextRebuildNodes(ImGuiContext* ctx)
-{
-    return ImGui::DockContextRebuildNodes(ctx);
-}
-CIMGUI_API void igDockContextNewFrameUpdateUndocking(ImGuiContext* ctx)
-{
-    return ImGui::DockContextNewFrameUpdateUndocking(ctx);
-}
-CIMGUI_API void igDockContextNewFrameUpdateDocking(ImGuiContext* ctx)
-{
-    return ImGui::DockContextNewFrameUpdateDocking(ctx);
-}
-CIMGUI_API ImGuiID igDockContextGenNodeID(ImGuiContext* ctx)
-{
-    return ImGui::DockContextGenNodeID(ctx);
-}
-CIMGUI_API void igDockContextQueueDock(ImGuiContext* ctx,ImGuiWindow* target,ImGuiDockNode* target_node,ImGuiWindow* payload,ImGuiDir split_dir,float split_ratio,bool split_outer)
-{
-    return ImGui::DockContextQueueDock(ctx,target,target_node,payload,split_dir,split_ratio,split_outer);
-}
-CIMGUI_API void igDockContextQueueUndockWindow(ImGuiContext* ctx,ImGuiWindow* window)
-{
-    return ImGui::DockContextQueueUndockWindow(ctx,window);
-}
-CIMGUI_API void igDockContextQueueUndockNode(ImGuiContext* ctx,ImGuiDockNode* node)
-{
-    return ImGui::DockContextQueueUndockNode(ctx,node);
-}
-CIMGUI_API bool igDockContextCalcDropPosForDocking(ImGuiWindow* target,ImGuiDockNode* target_node,ImGuiWindow* payload,ImGuiDir split_dir,bool split_outer,ImVec2* out_pos)
-{
-    return ImGui::DockContextCalcDropPosForDocking(target,target_node,payload,split_dir,split_outer,out_pos);
-}
-CIMGUI_API bool igDockNodeBeginAmendTabBar(ImGuiDockNode* node)
-{
-    return ImGui::DockNodeBeginAmendTabBar(node);
-}
-CIMGUI_API void igDockNodeEndAmendTabBar()
-{
-    return ImGui::DockNodeEndAmendTabBar();
-}
-CIMGUI_API ImGuiDockNode* igDockNodeGetRootNode(ImGuiDockNode* node)
-{
-    return ImGui::DockNodeGetRootNode(node);
-}
-CIMGUI_API int igDockNodeGetDepth(const ImGuiDockNode* node)
-{
-    return ImGui::DockNodeGetDepth(node);
-}
-CIMGUI_API ImGuiID igDockNodeGetWindowMenuButtonId(const ImGuiDockNode* node)
-{
-    return ImGui::DockNodeGetWindowMenuButtonId(node);
-}
-CIMGUI_API ImGuiDockNode* igGetWindowDockNode()
-{
-    return ImGui::GetWindowDockNode();
-}
-CIMGUI_API bool igGetWindowAlwaysWantOwnTabBar(ImGuiWindow* window)
-{
-    return ImGui::GetWindowAlwaysWantOwnTabBar(window);
-}
-CIMGUI_API void igBeginDocked(ImGuiWindow* window,bool* p_open)
-{
-    return ImGui::BeginDocked(window,p_open);
-}
-CIMGUI_API void igBeginDockableDragDropSource(ImGuiWindow* window)
-{
-    return ImGui::BeginDockableDragDropSource(window);
-}
-CIMGUI_API void igBeginDockableDragDropTarget(ImGuiWindow* window)
-{
-    return ImGui::BeginDockableDragDropTarget(window);
-}
-CIMGUI_API void igSetWindowDock(ImGuiWindow* window,ImGuiID dock_id,ImGuiCond cond)
-{
-    return ImGui::SetWindowDock(window,dock_id,cond);
-}
-CIMGUI_API void igDockBuilderDockWindow(const char* window_name,ImGuiID node_id)
-{
-    return ImGui::DockBuilderDockWindow(window_name,node_id);
-}
-CIMGUI_API ImGuiDockNode* igDockBuilderGetNode(ImGuiID node_id)
-{
-    return ImGui::DockBuilderGetNode(node_id);
-}
-CIMGUI_API ImGuiDockNode* igDockBuilderGetCentralNode(ImGuiID node_id)
-{
-    return ImGui::DockBuilderGetCentralNode(node_id);
-}
-CIMGUI_API ImGuiID igDockBuilderAddNode(ImGuiID node_id,ImGuiDockNodeFlags flags)
-{
-    return ImGui::DockBuilderAddNode(node_id,flags);
-}
-CIMGUI_API void igDockBuilderRemoveNode(ImGuiID node_id)
-{
-    return ImGui::DockBuilderRemoveNode(node_id);
-}
-CIMGUI_API void igDockBuilderRemoveNodeDockedWindows(ImGuiID node_id,bool clear_settings_refs)
-{
-    return ImGui::DockBuilderRemoveNodeDockedWindows(node_id,clear_settings_refs);
-}
-CIMGUI_API void igDockBuilderRemoveNodeChildNodes(ImGuiID node_id)
-{
-    return ImGui::DockBuilderRemoveNodeChildNodes(node_id);
-}
-CIMGUI_API void igDockBuilderSetNodePos(ImGuiID node_id,ImVec2 pos)
-{
-    return ImGui::DockBuilderSetNodePos(node_id,pos);
-}
-CIMGUI_API void igDockBuilderSetNodeSize(ImGuiID node_id,ImVec2 size)
-{
-    return ImGui::DockBuilderSetNodeSize(node_id,size);
-}
-CIMGUI_API ImGuiID igDockBuilderSplitNode(ImGuiID node_id,ImGuiDir split_dir,float size_ratio_for_node_at_dir,ImGuiID* out_id_at_dir,ImGuiID* out_id_at_opposite_dir)
-{
-    return ImGui::DockBuilderSplitNode(node_id,split_dir,size_ratio_for_node_at_dir,out_id_at_dir,out_id_at_opposite_dir);
-}
-CIMGUI_API void igDockBuilderCopyDockSpace(ImGuiID src_dockspace_id,ImGuiID dst_dockspace_id,ImVector_const_charPtr* in_window_remap_pairs)
-{
-    return ImGui::DockBuilderCopyDockSpace(src_dockspace_id,dst_dockspace_id,in_window_remap_pairs);
-}
-CIMGUI_API void igDockBuilderCopyNode(ImGuiID src_node_id,ImGuiID dst_node_id,ImVector_ImGuiID* out_node_remap_pairs)
-{
-    return ImGui::DockBuilderCopyNode(src_node_id,dst_node_id,out_node_remap_pairs);
-}
-CIMGUI_API void igDockBuilderCopyWindowSettings(const char* src_name,const char* dst_name)
-{
-    return ImGui::DockBuilderCopyWindowSettings(src_name,dst_name);
-}
-CIMGUI_API void igDockBuilderFinish(ImGuiID node_id)
-{
-    return ImGui::DockBuilderFinish(node_id);
-}
 CIMGUI_API bool igBeginDragDropTargetCustom(const ImRect bb,ImGuiID id)
 {
    return ImGui::BeginDragDropTargetCustom(bb,id);
@@ -4429,22 +4216,14 @@ CIMGUI_API ImGuiTableSettings* igTableSettingsFindByID(ImGuiID id)
 {
    return ImGui::TableSettingsFindByID(id);
 }
-CIMGUI_API bool igBeginTabBarEx(ImGuiTabBar* tab_bar,const ImRect bb,ImGuiTabBarFlags flags,ImGuiDockNode* dock_node)
+CIMGUI_API bool igBeginTabBarEx(ImGuiTabBar* tab_bar,const ImRect bb,ImGuiTabBarFlags flags)
 {
-    return ImGui::BeginTabBarEx(tab_bar,bb,flags,dock_node);
+    return ImGui::BeginTabBarEx(tab_bar,bb,flags);
 }
 CIMGUI_API ImGuiTabItem* igTabBarFindTabByID(ImGuiTabBar* tab_bar,ImGuiID tab_id)
 {
    return ImGui::TabBarFindTabByID(tab_bar,tab_id);
 }
-CIMGUI_API ImGuiTabItem* igTabBarFindMostRecentlySelectedTabForActiveWindow(ImGuiTabBar* tab_bar)
-{
-    return ImGui::TabBarFindMostRecentlySelectedTabForActiveWindow(tab_bar);
-}
-CIMGUI_API void igTabBarAddTab(ImGuiTabBar* tab_bar,ImGuiTabItemFlags tab_flags,ImGuiWindow* window)
-{
-    return ImGui::TabBarAddTab(tab_bar,tab_flags,window);
-}
 CIMGUI_API void igTabBarRemoveTab(ImGuiTabBar* tab_bar,ImGuiID tab_id)
 {
    return ImGui::TabBarRemoveTab(tab_bar,tab_id);
@@ -4465,9 +4244,9 @@ CIMGUI_API bool igTabBarProcessReorder(ImGuiTabBar* tab_bar)
 {
    return ImGui::TabBarProcessReorder(tab_bar);
 }
-CIMGUI_API bool igTabItemEx(ImGuiTabBar* tab_bar,const char* label,bool* p_open,ImGuiTabItemFlags flags,ImGuiWindow* docked_window)
+CIMGUI_API bool igTabItemEx(ImGuiTabBar* tab_bar,const char* label,bool* p_open,ImGuiTabItemFlags flags)
 {
-    return ImGui::TabItemEx(tab_bar,label,p_open,flags,docked_window);
+    return ImGui::TabItemEx(tab_bar,label,p_open,flags);
 }
 CIMGUI_API void igTabItemCalcSize(ImVec2 *pOut,const char* label,bool has_close_button)
 {
@@ -4541,10 +4320,6 @@ CIMGUI_API void igRenderArrowPointingAt(ImDrawList* draw_list,ImVec2 pos,ImVec2
 {
    return ImGui::RenderArrowPointingAt(draw_list,pos,half_sz,direction,col);
 }
-CIMGUI_API void igRenderArrowDockMenu(ImDrawList* draw_list,ImVec2 p_min,float sz,ImU32 col)
-{
-    return ImGui::RenderArrowDockMenu(draw_list,p_min,sz,col);
-}
 CIMGUI_API void igRenderRectFilledRangeH(ImDrawList* draw_list,const ImRect rect,ImU32 col,float x_start_norm,float x_end_norm,float rounding)
 {
    return ImGui::RenderRectFilledRangeH(draw_list,rect,col,x_start_norm,x_end_norm,rounding);
@@ -4565,9 +4340,9 @@ CIMGUI_API bool igCloseButton(ImGuiID id,const ImVec2 pos)
 {
    return ImGui::CloseButton(id,pos);
 }
-CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2 pos,ImGuiDockNode* dock_node)
+CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2 pos)
 {
-    return ImGui::CollapseButton(id,pos,dock_node);
+    return ImGui::CollapseButton(id,pos);
 }
 CIMGUI_API bool igArrowButtonEx(const char* str_id,ImGuiDir dir,ImVec2 size_arg,ImGuiButtonFlags flags)
 {
@@ -4577,7 +4352,7 @@ CIMGUI_API void igScrollbar(ImGuiAxis axis)
 {
    return ImGui::Scrollbar(axis);
 }
-CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p_scroll_v,float avail_v,float contents_v,ImDrawFlags flags)
+CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,ImS64* p_scroll_v,ImS64 avail_v,ImS64 contents_v,ImDrawFlags flags)
 {
    return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,flags);
 }
@@ -4725,6 +4500,10 @@ CIMGUI_API void igErrorCheckEndFrameRecover(ImGuiErrorLogCallback log_callback,v
 {
    return ImGui::ErrorCheckEndFrameRecover(log_callback,user_data);
 }
+CIMGUI_API void igErrorCheckEndWindowRecover(ImGuiErrorLogCallback log_callback,void* user_data)
+{
+    return ImGui::ErrorCheckEndWindowRecover(log_callback,user_data);
+}
 CIMGUI_API void igDebugDrawItemRect(ImU32 col)
 {
    return ImGui::DebugDrawItemRect(col);
@@ -4737,17 +4516,17 @@ CIMGUI_API void igShowFontAtlas(ImFontAtlas* atlas)
 {
    return ImGui::ShowFontAtlas(atlas);
 }
+CIMGUI_API void igDebugHookIdInfo(ImGuiID id,ImGuiDataType data_type,const void* data_id,const void* data_id_end)
+{
+    return ImGui::DebugHookIdInfo(id,data_type,data_id,data_id_end);
+}
 CIMGUI_API void igDebugNodeColumns(ImGuiOldColumns* columns)
 {
    return ImGui::DebugNodeColumns(columns);
 }
-CIMGUI_API void igDebugNodeDockNode(ImGuiDockNode* node,const char* label)
+CIMGUI_API void igDebugNodeDrawList(ImGuiWindow* window,const ImDrawList* draw_list,const char* label)
 {
-    return ImGui::DebugNodeDockNode(node,label);
-}
-CIMGUI_API void igDebugNodeDrawList(ImGuiWindow* window,ImGuiViewportP* viewport,const ImDrawList* draw_list,const char* label)
-{
-    return ImGui::DebugNodeDrawList(window,viewport,draw_list,label);
+    return ImGui::DebugNodeDrawList(window,draw_list,label);
 }
 CIMGUI_API void igDebugNodeDrawCmdShowMeshAndBoundingBox(ImDrawList* out_draw_list,const ImDrawList* draw_list,const ImDrawCmd* draw_cmd,bool show_mesh,bool show_aabb)
 {
@@ -4785,6 +4564,10 @@ CIMGUI_API void igDebugNodeWindowsList(ImVector_ImGuiWindowPtr* windows,const ch
 {
    return ImGui::DebugNodeWindowsList(windows,label);
 }
+CIMGUI_API void igDebugNodeWindowsListByBeginStackParent(ImGuiWindow** windows,int windows_size,ImGuiWindow* parent_in_begin_stack)
+{
+    return ImGui::DebugNodeWindowsListByBeginStackParent(windows,windows_size,parent_in_begin_stack);
+}
 CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport)
 {
    return ImGui::DebugNodeViewport(viewport);
--- a/cimgui.h
+++ b/cimgui.h
--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
@@ -376,7 +376,7 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 							loca = table.remove(loca,1)
 						end
 						if not loca then
-							print(string.format("%q , %q ",itemold,itemfirstline),#itemfirstline)
+							print("not loca",string.format("%q , %q ",itemold,itemfirstline),#itemfirstline)
 							for k,v in pairs(linenumdict) do
 								if k:match(itemfirstline) then
 									print(string.format("%q",k),#k)
@@ -618,16 +618,18 @@ local function parseFunction(self,stname,itt,namespace,locat)
 	end
 	
 	--get typ, name and defaults
-	local functype_re =        "^%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)"
-    local functype_reex =     "^(%s*[%w%s%*]+)%(%*([%w_]+)%)(%([^%(%)]*%))"
-    local functype_arg_rest = "^(%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)),*(.*)"
+	local functype_re =        "^%s*[%w%s%*]+%(%*%s*[%w_]+%)%([^%(%)]*%)"
+    local functype_reex =     "^(%s*[%w%s%*]+)%(%*%s*([%w_]+)%)(%([^%(%)]*%))"
 	local argsTa2 = {}
 	local noname_counter = 0
 	for i,ar in ipairs(argsTa) do
 		local typ,name,retf,sigf,reftoptr,defa,ar1
+		local has_cdecl = ar:match"__cdecl"
+		if has_cdecl then ar = ar:gsub("__cdecl","") end
 		if ar:match(functype_re) then
 			local t1,namef,t2 = ar:match(functype_reex)
-            typ, name = t1.."(*)"..t2, namef
+			local f_ = has_cdecl and "(__cdecl*)" or "(*)"
+            typ, name = t1..f_..t2, namef
            retf = t1
            sigf = t2
 		else
@@ -662,7 +664,7 @@ local function parseFunction(self,stname,itt,namespace,locat)
                name = name:gsub("(%[%d*%])","")
            end
 		end
-		argsTa2[i] = {type=typ,name=name,default=defa,reftoptr=reftoptr,ret=retf,signature=sigf}
+		argsTa2[i] = {type=typ,name=name,default=defa,reftoptr=reftoptr,ret=retf,signature=sigf,has_cdecl=has_cdecl}
 		if ar:match("&") and not ar:match("const") then
            --only post error if not manual
            local cname = self.getCname(stname,funcname, namespace) --cimguiname
@@ -682,9 +684,10 @@ local function parseFunction(self,stname,itt,namespace,locat)
 		signat = "("
 		for i,v in ipairs(argsArr) do
 			if v.ret then --function pointer
-				asp = asp .. v.ret .. "(*" .. v.name .. ")" .. v.signature .. ","
+				local f_ = v.has_cdecl and "(__cdecl*" or "(*"
+				asp = asp .. v.ret .. f_ .. v.name .. ")" .. v.signature .. ","
 				caar = caar .. v.name .. ","
-				signat = signat .. v.ret .. "(*)" .. clean_names_from_signature(self,v.signature) .. ","
+				signat = signat .. v.ret .. f_..")" .. clean_names_from_signature(self,v.signature) .. ","
 			else
 				local siz = v.type:match("(%[%d*%])") or ""
 				local typ = v.type:gsub("(%[%d*%])","")
@@ -1158,13 +1161,14 @@ function M.Parser()
 		local cdefs2 = {}
 		for i,cdef in ipairs(cdefs) do
 			if self.linenumdict[cdef[1]] then
-				--print("linenumdict alredy defined for", cdef[1],type(self.linenumdict[cdef[1]]))
+				--print("linenumdict already defined for", cdef[1],type(self.linenumdict[cdef[1]]))
 				if type(self.linenumdict[cdef[1]])=="string" then
 					self.linenumdict[cdef[1]] = {self.linenumdict[cdef[1]], cdef[2]}
 				else -- must be table already
 					table.insert(self.linenumdict[cdef[1]],cdef[2])
 				end
 			else
+				--print("nuevo linenumdict es",cdef[1],cdef[2])
 				self.linenumdict[cdef[1]]=cdef[2]
 			end
 			table.insert(cdefs2,cdef[1])
@@ -1361,7 +1365,12 @@ function M.Parser()
 					or (it.re_name == "typedef_st_re" and it.item:match("%b{}%s*(%S+)%s*;"))
 					--TODO nesting namespace and class
 					local parname = get_parents_name(it)
-					self.embeded_structs[embededst] = parname..embededst
+					if it.parent.re_name == "struct_re" then
+						--needed by cimnodes with struct tag name equals member name
+						self.embeded_structs[embededst] = "struct "..parname..embededst
+					else
+						self.embeded_structs[embededst] = parname..embededst
+					end
 				end
 			elseif it.re_name == "namespace_re" or it.re_name == "union_re" or it.re_name == "functype_re" then
 				--nop
@@ -2079,7 +2088,7 @@ end
 M.func_header_generate = func_header_generate
 --[=[
 -- tests
-local line = [[struct ImDrawListSharedData
+local code = [[struct ImDrawListSharedData
 {
    ImVec2 TexUvWhitePixel;
    ImFont* Font;
@@ -2093,11 +2102,16 @@ local line = [[struct ImDrawListSharedData
    ImDrawListSharedData();
    void SetCircleSegmentMaxError(float max_error);
 };]]
+local code = [[static inline void      ImQsort(void* base, size_t count, size_t size_of_element, int(__cdecl *compare_func)(void const*, void const*)) { if (count > 1) qsort(base, count, size_of_element, compare_func); }
+]]
 local parser = M.Parser()
-parser:insert(line)
+for line in code:gmatch("[^\n]+") do
+	print("inserting",line)
+	parser:insert(line,"11")
+end
 parser:do_parse()
--M.prtable(parser)
-M.prtable(parser:gen_structs_and_enums_table())
+M.prtable(parser)
+--M.prtable(parser:gen_structs_and_enums_table())
 --]=]
 --print(clean_spaces[[ImVec2 ArcFastVtx[12 * 1];]])

--- a/generator/generator.lua
+++ b/generator/generator.lua
@@ -14,7 +14,7 @@ local CPRE,CTEST
 --get implementations
 local implementations = {}
 for i=3,#script_args do
-    if script_args[i]:match(COMPILER == cl and "^/" or "^%-") then
+    if script_args[i]:match(COMPILER == "cl" and "^/" or "^%-") then
        local key, value = script_args[i]:match("^(.+)=(.+)$")
        if key and value then
            CFLAGS = CFLAGS .. " " .. key .. "=\"" .. value:gsub("\"", "\\\"") .. "\"";
@@ -30,7 +30,7 @@ if COMPILER == "gcc" or COMPILER == "clang" then
    CPRE = COMPILER..[[ -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]] .. CFLAGS
    CTEST = COMPILER.." --version"
 elseif COMPILER == "cl" then
-    CPRE = COMPILER..[[ /E /DIMGUI_DISABLE_OBSOLETE_FUNCTIONS /DIMGUI_API="" /DIMGUI_IMPL_API="" ]] .. CFLAGS
+    CPRE = COMPILER..[[ /E /DIMGUI_DISABLE_OBSOLETE_FUNCTIONS /DIMGUI_DEBUG_PARANOID /DIMGUI_API="" /DIMGUI_IMPL_API="" ]] .. CFLAGS
    CTEST = COMPILER
 else
    print("Working without compiler ")
@@ -136,14 +136,16 @@ local func_implementation = cpp2ffi.func_implementation

 -------------------functions for getting and setting defines
 local function get_defines(t)
-    if COMPILER == "cl" then print"can't get defines with cl compiler"; return {} end
-    print(COMPILER..[[ -E -dM -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]]..IMGUI_PATH..[[/imgui.h]] .. CFLAGS)
-    local pipe,err = io.popen(COMPILER..[[ -E -dM -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]]..IMGUI_PATH..[[/imgui.h]] .. CFLAGS,"r")
+    local compiler_cmd = COMPILER == "cl"
+                         and COMPILER..[[ /TP /nologo /c /Fo"NUL" /I "]]..IMGUI_PATH..[[" print_defines.cpp]]..CFLAGS
+                         or COMPILER..[[ -E -dM -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]]..IMGUI_PATH..[[/imgui.h]]..CFLAGS
+    print(compiler_cmd)
+    local pipe,err = io.popen(compiler_cmd,"r")
    local defines = {}
    while true do
        local line = pipe:read"*l"
        if not line then break end
-        local key,value = line:match([[#define%s+(%S+)%s*(.*)]])
+        local key,value = line:match([[^#define%s+(%S+)%s*(.*)]])
        if not key then --or not value then 
            --print(line)
        else
@@ -159,7 +161,7 @@ local function get_defines(t)
        local aa = defines[v]
        while true do
            local tmp = defines[aa]
-            if not tmp then 
+            if not tmp then
                break
            else
                aa = tmp
@@ -336,34 +338,13 @@ end
 -----------------------------do it----------------------
 --------------------------------------------------------
 --get imgui.h version and IMGUI_HAS_DOCK--------------------------
--get some defines wont work for cl ----------------
+--defines for the cl compiler must be present in the print_defines.cpp file
 gdefines = get_defines{"IMGUI_VERSION","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR"}
--this will work for cl
-local pipe,err = io.open(IMGUI_PATH.."/imgui.h","r")
-if not pipe then
-    error("could not open file:"..err)
-end
-local imgui_version,has_dock,has_imstr 
-while true do
-    local line = pipe:read"*l"
-	if not line then break end
-	if not imgui_version then
-		imgui_version = line:match([[#define%s+IMGUI_VERSION%s+(".+")]])
-	end
-	if not has_dock then
-		has_dock = line:match([[#define%s+IMGUI_HAS_DOCK]])--%s*(".+")]])
-	end
-	if not has_imstr then
-		has_imstr = line:match([[#define%s+IMGUI_HAS_IMSTR]])--%s*(".+")]])
-	end
-    if imgui_version and has_dock and has_imstr then break end
-end
-pipe:close()

-if has_dock then gdefines.IMGUI_HAS_DOCK = true end
-if has_imstr then gdefines.IMGUI_HAS_IMSTR = true end
+if gdefines.IMGUI_HAS_DOCK then gdefines.IMGUI_HAS_DOCK = true end
+if gdefines.IMGUI_HAS_IMSTR then gdefines.IMGUI_HAS_IMSTR = true end

-cimgui_header = cimgui_header:gsub("XXX",imgui_version)
+cimgui_header = cimgui_header:gsub("XXX",gdefines.IMGUI_VERSION)
 if INTERNAL_GENERATION then
 	cimgui_header = cimgui_header..[[//with imgui_internal.h api
 ]]
@@ -379,7 +360,7 @@ if gdefines.IMGUI_HAS_DOCK then
 end
 print("IMGUI_HAS_IMSTR",gdefines.IMGUI_HAS_IMSTR)
 print("IMGUI_HAS_DOCK",gdefines.IMGUI_HAS_DOCK)
-print("IMGUI_VERSION",imgui_version)
+print("IMGUI_VERSION",gdefines.IMGUI_VERSION)


 --funtion for parsing imgui headers
--- a/generator/output/cimgui_impl.h
+++ b/generator/output/cimgui_impl.h
@@ -38,6 +38,7 @@ CIMGUI_API bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window,void* sdl_gl_con
 CIMGUI_API bool ImGui_ImplSDL2_InitForVulkan(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL2_InitForD3D(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL2_InitForMetal(SDL_Window* window);
+CIMGUI_API bool ImGui_ImplSDL2_InitForSDLRenderer(SDL_Window* window);
 CIMGUI_API void ImGui_ImplSDL2_Shutdown();
 CIMGUI_API void ImGui_ImplSDL2_NewFrame();
 CIMGUI_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);
--- a/generator/output/definitions.json
+++ b/generator/output/definitions.json
--- a/generator/output/definitions.lua
+++ b/generator/output/definitions.lua
--- a/generator/output/impl_definitions.json
+++ b/generator/output/impl_definitions.json
@@ -17,7 +17,7 @@
      "cimguiname": "ImGui_ImplGlfw_CharCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_CharCallback",
-      "location": "imgui_impl_glfw:44",
+      "location": "imgui_impl_glfw:40",
      "ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,unsigned int)",
@@ -42,7 +42,7 @@
      "cimguiname": "ImGui_ImplGlfw_CursorEnterCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_CursorEnterCallback",
-      "location": "imgui_impl_glfw:40",
+      "location": "imgui_impl_glfw:36",
      "ov_cimguiname": "ImGui_ImplGlfw_CursorEnterCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int)",
@@ -67,7 +67,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InitForOpenGL",
-      "location": "imgui_impl_glfw:30",
+      "location": "imgui_impl_glfw:26",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -92,7 +92,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForOther",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InitForOther",
-      "location": "imgui_impl_glfw:32",
+      "location": "imgui_impl_glfw:28",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForOther",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -117,7 +117,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForVulkan",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InitForVulkan",
-      "location": "imgui_impl_glfw:31",
+      "location": "imgui_impl_glfw:27",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForVulkan",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -154,7 +154,7 @@
      "cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_KeyCallback",
-      "location": "imgui_impl_glfw:43",
+      "location": "imgui_impl_glfw:39",
      "ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int,int)",
@@ -179,7 +179,7 @@
      "cimguiname": "ImGui_ImplGlfw_MonitorCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_MonitorCallback",
-      "location": "imgui_impl_glfw:45",
+      "location": "imgui_impl_glfw:41",
      "ov_cimguiname": "ImGui_ImplGlfw_MonitorCallback",
      "ret": "void",
      "signature": "(GLFWmonitor*,int)",
@@ -212,7 +212,7 @@
      "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
-      "location": "imgui_impl_glfw:41",
+      "location": "imgui_impl_glfw:37",
      "ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int)",
@@ -228,7 +228,7 @@
      "cimguiname": "ImGui_ImplGlfw_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_NewFrame",
-      "location": "imgui_impl_glfw:34",
+      "location": "imgui_impl_glfw:30",
      "ov_cimguiname": "ImGui_ImplGlfw_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -257,7 +257,7 @@
      "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_ScrollCallback",
-      "location": "imgui_impl_glfw:42",
+      "location": "imgui_impl_glfw:38",
      "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,double,double)",
@@ -273,7 +273,7 @@
      "cimguiname": "ImGui_ImplGlfw_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_Shutdown",
-      "location": "imgui_impl_glfw:33",
+      "location": "imgui_impl_glfw:29",
      "ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -298,7 +298,7 @@
      "cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_WindowFocusCallback",
-      "location": "imgui_impl_glfw:39",
+      "location": "imgui_impl_glfw:35",
      "ov_cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int)",
@@ -314,7 +314,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
-      "location": "imgui_impl_opengl2:32",
+      "location": "imgui_impl_opengl2:31",
      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
@@ -330,7 +330,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_CreateFontsTexture",
-      "location": "imgui_impl_opengl2:30",
+      "location": "imgui_impl_opengl2:29",
      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
@@ -346,7 +346,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl2:33",
+      "location": "imgui_impl_opengl2:32",
      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
@@ -362,7 +362,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
-      "location": "imgui_impl_opengl2:31",
+      "location": "imgui_impl_opengl2:30",
      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
@@ -378,7 +378,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_Init",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_Init",
-      "location": "imgui_impl_opengl2:24",
+      "location": "imgui_impl_opengl2:23",
      "ov_cimguiname": "ImGui_ImplOpenGL2_Init",
      "ret": "bool",
      "signature": "()",
@@ -394,7 +394,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_NewFrame",
-      "location": "imgui_impl_opengl2:26",
+      "location": "imgui_impl_opengl2:25",
      "ov_cimguiname": "ImGui_ImplOpenGL2_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -415,7 +415,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_RenderDrawData",
-      "location": "imgui_impl_opengl2:27",
+      "location": "imgui_impl_opengl2:26",
      "ov_cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
@@ -431,7 +431,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_Shutdown",
-      "location": "imgui_impl_opengl2:25",
+      "location": "imgui_impl_opengl2:24",
      "ov_cimguiname": "ImGui_ImplOpenGL2_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -447,7 +447,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
-      "location": "imgui_impl_opengl3:33",
+      "location": "imgui_impl_opengl3:32",
      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
@@ -463,7 +463,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_CreateFontsTexture",
-      "location": "imgui_impl_opengl3:31",
+      "location": "imgui_impl_opengl3:30",
      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
@@ -479,7 +479,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl3:34",
+      "location": "imgui_impl_opengl3:33",
      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
@@ -495,7 +495,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
-      "location": "imgui_impl_opengl3:32",
+      "location": "imgui_impl_opengl3:31",
      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
@@ -518,7 +518,7 @@
        "glsl_version": "((void*)0)"
      },
      "funcname": "ImGui_ImplOpenGL3_Init",
-      "location": "imgui_impl_opengl3:25",
+      "location": "imgui_impl_opengl3:24",
      "ov_cimguiname": "ImGui_ImplOpenGL3_Init",
      "ret": "bool",
      "signature": "(const char*)",
@@ -534,7 +534,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_NewFrame",
-      "location": "imgui_impl_opengl3:27",
+      "location": "imgui_impl_opengl3:26",
      "ov_cimguiname": "ImGui_ImplOpenGL3_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -555,7 +555,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_RenderDrawData",
-      "location": "imgui_impl_opengl3:28",
+      "location": "imgui_impl_opengl3:27",
      "ov_cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
@@ -571,7 +571,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_Shutdown",
-      "location": "imgui_impl_opengl3:26",
+      "location": "imgui_impl_opengl3:25",
      "ov_cimguiname": "ImGui_ImplOpenGL3_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -592,7 +592,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForD3D",
-      "location": "imgui_impl_sdl:28",
+      "location": "imgui_impl_sdl:26",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -613,7 +613,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForMetal",
-      "location": "imgui_impl_sdl:29",
+      "location": "imgui_impl_sdl:27",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -638,13 +638,34 @@
      "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForOpenGL",
-      "location": "imgui_impl_sdl:26",
+      "location": "imgui_impl_sdl:24",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "ret": "bool",
      "signature": "(SDL_Window*,void*)",
      "stname": ""
    }
  ],
+  "ImGui_ImplSDL2_InitForSDLRenderer": [
+    {
+      "args": "(SDL_Window* window)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "SDL_Window*"
+        }
+      ],
+      "argsoriginal": "(SDL_Window* window)",
+      "call_args": "(window)",
+      "cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
+      "defaults": {},
+      "funcname": "ImGui_ImplSDL2_InitForSDLRenderer",
+      "location": "imgui_impl_sdl:28",
+      "ov_cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
+      "ret": "bool",
+      "signature": "(SDL_Window*)",
+      "stname": ""
+    }
+  ],
  "ImGui_ImplSDL2_InitForVulkan": [
    {
      "args": "(SDL_Window* window)",
@@ -659,7 +680,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForVulkan",
-      "location": "imgui_impl_sdl:27",
+      "location": "imgui_impl_sdl:25",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -675,7 +696,7 @@
      "cimguiname": "ImGui_ImplSDL2_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_NewFrame",
-      "location": "imgui_impl_sdl:31",
+      "location": "imgui_impl_sdl:30",
      "ov_cimguiname": "ImGui_ImplSDL2_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -696,7 +717,7 @@
      "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_ProcessEvent",
-      "location": "imgui_impl_sdl:32",
+      "location": "imgui_impl_sdl:31",
      "ov_cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "ret": "bool",
      "signature": "(const SDL_Event*)",
@@ -712,7 +733,7 @@
      "cimguiname": "ImGui_ImplSDL2_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_Shutdown",
-      "location": "imgui_impl_sdl:30",
+      "location": "imgui_impl_sdl:29",
      "ov_cimguiname": "ImGui_ImplSDL2_Shutdown",
      "ret": "void",
      "signature": "()",
--- a/generator/output/impl_definitions.lua
+++ b/generator/output/impl_definitions.lua
@@ -14,7 +14,7 @@ defs["ImGui_ImplGlfw_CharCallback"][1]["call_args"] = "(window,c)"
 defs["ImGui_ImplGlfw_CharCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CharCallback"
 defs["ImGui_ImplGlfw_CharCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CharCallback"][1]["funcname"] = "ImGui_ImplGlfw_CharCallback"
-defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:44"
+defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:40"
 defs["ImGui_ImplGlfw_CharCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CharCallback"
 defs["ImGui_ImplGlfw_CharCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CharCallback"][1]["signature"] = "(GLFWwindow*,unsigned int)"
@@ -35,7 +35,7 @@ defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["call_args"] = "(window,entered)"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CursorEnterCallback"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["funcname"] = "ImGui_ImplGlfw_CursorEnterCallback"
-defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["location"] = "imgui_impl_glfw:40"
+defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["location"] = "imgui_impl_glfw:36"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CursorEnterCallback"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["signature"] = "(GLFWwindow*,int)"
@@ -56,7 +56,7 @@ defs["ImGui_ImplGlfw_InitForOpenGL"][1]["call_args"] = "(window,install_callback
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOpenGL"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["funcname"] = "ImGui_ImplGlfw_InitForOpenGL"
-defs["ImGui_ImplGlfw_InitForOpenGL"][1]["location"] = "imgui_impl_glfw:30"
+defs["ImGui_ImplGlfw_InitForOpenGL"][1]["location"] = "imgui_impl_glfw:26"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForOpenGL"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["ret"] = "bool"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["signature"] = "(GLFWwindow*,bool)"
@@ -77,7 +77,7 @@ defs["ImGui_ImplGlfw_InitForOther"][1]["call_args"] = "(window,install_callbacks
 defs["ImGui_ImplGlfw_InitForOther"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOther"
 defs["ImGui_ImplGlfw_InitForOther"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForOther"][1]["funcname"] = "ImGui_ImplGlfw_InitForOther"
-defs["ImGui_ImplGlfw_InitForOther"][1]["location"] = "imgui_impl_glfw:32"
+defs["ImGui_ImplGlfw_InitForOther"][1]["location"] = "imgui_impl_glfw:28"
 defs["ImGui_ImplGlfw_InitForOther"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForOther"
 defs["ImGui_ImplGlfw_InitForOther"][1]["ret"] = "bool"
 defs["ImGui_ImplGlfw_InitForOther"][1]["signature"] = "(GLFWwindow*,bool)"
@@ -98,7 +98,7 @@ defs["ImGui_ImplGlfw_InitForVulkan"][1]["call_args"] = "(window,install_callback
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForVulkan"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["funcname"] = "ImGui_ImplGlfw_InitForVulkan"
-defs["ImGui_ImplGlfw_InitForVulkan"][1]["location"] = "imgui_impl_glfw:31"
+defs["ImGui_ImplGlfw_InitForVulkan"][1]["location"] = "imgui_impl_glfw:27"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForVulkan"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["ret"] = "bool"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["signature"] = "(GLFWwindow*,bool)"
@@ -128,7 +128,7 @@ defs["ImGui_ImplGlfw_KeyCallback"][1]["call_args"] = "(window,key,scancode,actio
 defs["ImGui_ImplGlfw_KeyCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_KeyCallback"][1]["funcname"] = "ImGui_ImplGlfw_KeyCallback"
-defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:43"
+defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:39"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["signature"] = "(GLFWwindow*,int,int,int,int)"
@@ -149,7 +149,7 @@ defs["ImGui_ImplGlfw_MonitorCallback"][1]["call_args"] = "(monitor,event)"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MonitorCallback"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["funcname"] = "ImGui_ImplGlfw_MonitorCallback"
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:45"
+defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:41"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MonitorCallback"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["signature"] = "(GLFWmonitor*,int)"
@@ -176,7 +176,7 @@ defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["call_args"] = "(window,button,act
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["funcname"] = "ImGui_ImplGlfw_MouseButtonCallback"
-defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:41"
+defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:37"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["signature"] = "(GLFWwindow*,int,int,int)"
@@ -191,7 +191,7 @@ defs["ImGui_ImplGlfw_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplGlfw_NewFrame"][1]["cimguiname"] = "ImGui_ImplGlfw_NewFrame"
 defs["ImGui_ImplGlfw_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_NewFrame"][1]["funcname"] = "ImGui_ImplGlfw_NewFrame"
-defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:34"
+defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:30"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_NewFrame"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_NewFrame"][1]["signature"] = "()"
@@ -215,7 +215,7 @@ defs["ImGui_ImplGlfw_ScrollCallback"][1]["call_args"] = "(window,xoffset,yoffset
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["funcname"] = "ImGui_ImplGlfw_ScrollCallback"
-defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:42"
+defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:38"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["signature"] = "(GLFWwindow*,double,double)"
@@ -230,7 +230,7 @@ defs["ImGui_ImplGlfw_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplGlfw_Shutdown"][1]["cimguiname"] = "ImGui_ImplGlfw_Shutdown"
 defs["ImGui_ImplGlfw_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_Shutdown"][1]["funcname"] = "ImGui_ImplGlfw_Shutdown"
-defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:33"
+defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:29"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_Shutdown"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_Shutdown"][1]["signature"] = "()"
@@ -251,7 +251,7 @@ defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["call_args"] = "(window,focused)"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_WindowFocusCallback"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["funcname"] = "ImGui_ImplGlfw_WindowFocusCallback"
-defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["location"] = "imgui_impl_glfw:39"
+defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["location"] = "imgui_impl_glfw:35"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_WindowFocusCallback"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["signature"] = "(GLFWwindow*,int)"
@@ -266,7 +266,7 @@ defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
-defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl2:32"
+defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl2:31"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["signature"] = "()"
@@ -281,7 +281,7 @@ defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
-defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl2:30"
+defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl2:29"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["signature"] = "()"
@@ -296,7 +296,7 @@ defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
-defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl2:33"
+defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl2:32"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["signature"] = "()"
@@ -311,7 +311,7 @@ defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
-defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl2:31"
+defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl2:30"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["signature"] = "()"
@@ -326,7 +326,7 @@ defs["ImGui_ImplOpenGL2_Init"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_Init"][1]["cimguiname"] = "ImGui_ImplOpenGL2_Init"
 defs["ImGui_ImplOpenGL2_Init"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_Init"][1]["funcname"] = "ImGui_ImplOpenGL2_Init"
-defs["ImGui_ImplOpenGL2_Init"][1]["location"] = "imgui_impl_opengl2:24"
+defs["ImGui_ImplOpenGL2_Init"][1]["location"] = "imgui_impl_opengl2:23"
 defs["ImGui_ImplOpenGL2_Init"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_Init"
 defs["ImGui_ImplOpenGL2_Init"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_Init"][1]["signature"] = "()"
@@ -341,7 +341,7 @@ defs["ImGui_ImplOpenGL2_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplOpenGL2_NewFrame"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["funcname"] = "ImGui_ImplOpenGL2_NewFrame"
-defs["ImGui_ImplOpenGL2_NewFrame"][1]["location"] = "imgui_impl_opengl2:26"
+defs["ImGui_ImplOpenGL2_NewFrame"][1]["location"] = "imgui_impl_opengl2:25"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_NewFrame"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["signature"] = "()"
@@ -359,7 +359,7 @@ defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["call_args"] = "(draw_data)"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["cimguiname"] = "ImGui_ImplOpenGL2_RenderDrawData"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["funcname"] = "ImGui_ImplOpenGL2_RenderDrawData"
-defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["location"] = "imgui_impl_opengl2:27"
+defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["location"] = "imgui_impl_opengl2:26"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_RenderDrawData"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["signature"] = "(ImDrawData*)"
@@ -374,7 +374,7 @@ defs["ImGui_ImplOpenGL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplOpenGL2_Shutdown"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["funcname"] = "ImGui_ImplOpenGL2_Shutdown"
-defs["ImGui_ImplOpenGL2_Shutdown"][1]["location"] = "imgui_impl_opengl2:25"
+defs["ImGui_ImplOpenGL2_Shutdown"][1]["location"] = "imgui_impl_opengl2:24"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_Shutdown"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["signature"] = "()"
@@ -389,7 +389,7 @@ defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
-defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl3:33"
+defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl3:32"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["signature"] = "()"
@@ -404,7 +404,7 @@ defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
-defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl3:31"
+defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl3:30"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["signature"] = "()"
@@ -419,7 +419,7 @@ defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
-defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl3:34"
+defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl3:33"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["signature"] = "()"
@@ -434,7 +434,7 @@ defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
-defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl3:32"
+defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl3:31"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["signature"] = "()"
@@ -453,7 +453,7 @@ defs["ImGui_ImplOpenGL3_Init"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Init"
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"]["glsl_version"] = "((void*)0)"
 defs["ImGui_ImplOpenGL3_Init"][1]["funcname"] = "ImGui_ImplOpenGL3_Init"
-defs["ImGui_ImplOpenGL3_Init"][1]["location"] = "imgui_impl_opengl3:25"
+defs["ImGui_ImplOpenGL3_Init"][1]["location"] = "imgui_impl_opengl3:24"
 defs["ImGui_ImplOpenGL3_Init"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_Init"
 defs["ImGui_ImplOpenGL3_Init"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_Init"][1]["signature"] = "(const char*)"
@@ -468,7 +468,7 @@ defs["ImGui_ImplOpenGL3_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["funcname"] = "ImGui_ImplOpenGL3_NewFrame"
-defs["ImGui_ImplOpenGL3_NewFrame"][1]["location"] = "imgui_impl_opengl3:27"
+defs["ImGui_ImplOpenGL3_NewFrame"][1]["location"] = "imgui_impl_opengl3:26"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["signature"] = "()"
@@ -486,7 +486,7 @@ defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["call_args"] = "(draw_data)"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["funcname"] = "ImGui_ImplOpenGL3_RenderDrawData"
-defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["location"] = "imgui_impl_opengl3:28"
+defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["location"] = "imgui_impl_opengl3:27"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["signature"] = "(ImDrawData*)"
@@ -501,7 +501,7 @@ defs["ImGui_ImplOpenGL3_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["funcname"] = "ImGui_ImplOpenGL3_Shutdown"
-defs["ImGui_ImplOpenGL3_Shutdown"][1]["location"] = "imgui_impl_opengl3:26"
+defs["ImGui_ImplOpenGL3_Shutdown"][1]["location"] = "imgui_impl_opengl3:25"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["signature"] = "()"
@@ -519,7 +519,7 @@ defs["ImGui_ImplSDL2_InitForD3D"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForD3D"][1]["funcname"] = "ImGui_ImplSDL2_InitForD3D"
-defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl:28"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl:26"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["signature"] = "(SDL_Window*)"
@@ -537,7 +537,7 @@ defs["ImGui_ImplSDL2_InitForMetal"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForMetal"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForMetal"][1]["funcname"] = "ImGui_ImplSDL2_InitForMetal"
-defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl:29"
+defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl:27"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForMetal"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["signature"] = "(SDL_Window*)"
@@ -558,12 +558,30 @@ defs["ImGui_ImplSDL2_InitForOpenGL"][1]["call_args"] = "(window,sdl_gl_context)"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForOpenGL"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["funcname"] = "ImGui_ImplSDL2_InitForOpenGL"
-defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl:26"
+defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl:24"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForOpenGL"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["signature"] = "(SDL_Window*,void*)"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["stname"] = ""
 defs["ImGui_ImplSDL2_InitForOpenGL"]["(SDL_Window*,void*)"] = defs["ImGui_ImplSDL2_InitForOpenGL"][1]
+defs["ImGui_ImplSDL2_InitForSDLRenderer"] = {}
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1] = {}
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["args"] = "(SDL_Window* window)"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["argsT"] = {}
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["argsT"][1] = {}
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["argsT"][1]["name"] = "window"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["argsT"][1]["type"] = "SDL_Window*"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["argsoriginal"] = "(SDL_Window* window)"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["call_args"] = "(window)"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["defaults"] = {}
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["funcname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["location"] = "imgui_impl_sdl:28"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["ret"] = "bool"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["signature"] = "(SDL_Window*)"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["stname"] = ""
+defs["ImGui_ImplSDL2_InitForSDLRenderer"]["(SDL_Window*)"] = defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]
 defs["ImGui_ImplSDL2_InitForVulkan"] = {}
 defs["ImGui_ImplSDL2_InitForVulkan"][1] = {}
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["args"] = "(SDL_Window* window)"
@@ -576,7 +594,7 @@ defs["ImGui_ImplSDL2_InitForVulkan"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForVulkan"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["funcname"] = "ImGui_ImplSDL2_InitForVulkan"
-defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl:27"
+defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl:25"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForVulkan"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["signature"] = "(SDL_Window*)"
@@ -591,7 +609,7 @@ defs["ImGui_ImplSDL2_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_NewFrame"][1]["funcname"] = "ImGui_ImplSDL2_NewFrame"
-defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl:31"
+defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl:30"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_NewFrame"][1]["signature"] = "()"
@@ -609,7 +627,7 @@ defs["ImGui_ImplSDL2_ProcessEvent"][1]["call_args"] = "(event)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["cimguiname"] = "ImGui_ImplSDL2_ProcessEvent"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["funcname"] = "ImGui_ImplSDL2_ProcessEvent"
-defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl:32"
+defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl:31"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_ProcessEvent"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["signature"] = "(const SDL_Event*)"
@@ -624,7 +642,7 @@ defs["ImGui_ImplSDL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplSDL2_Shutdown"
 defs["ImGui_ImplSDL2_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_Shutdown"][1]["funcname"] = "ImGui_ImplSDL2_Shutdown"
-defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl:30"
+defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl:29"
 defs["ImGui_ImplSDL2_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_Shutdown"
 defs["ImGui_ImplSDL2_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_Shutdown"][1]["signature"] = "()"
--- a/generator/output/overloads.txt
+++ b/generator/output/overloads.txt
@@ -121,8 +121,8 @@ igGetColorU32	3
 3	ImU32	igGetColorU32_U32 (ImU32)
 igGetForegroundDrawList	3
 1	ImDrawList*	igGetForegroundDrawList_Nil ()
-2	ImDrawList*	igGetForegroundDrawList_ViewportPtr (ImGuiViewport*)
-3	ImDrawList*	igGetForegroundDrawList_WindowPtr (ImGuiWindow*)
+2	ImDrawList*	igGetForegroundDrawList_WindowPtr (ImGuiWindow*)
+3	ImDrawList*	igGetForegroundDrawList_ViewportPtr (ImGuiViewport*)
 igGetID	3
 1	ImGuiID	igGetID_Str (const char*)
 2	ImGuiID	igGetID_StrStr (const char*,const char*)
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
--- a/generator/output/structs_and_enums.lua
+++ b/generator/output/structs_and_enums.lua
--- a/generator/output/typedefs_dict.json
+++ b/generator/output/typedefs_dict.json
@@ -23,6 +23,7 @@
  "ImFontConfig": "struct ImFontConfig",
  "ImFontGlyph": "struct ImFontGlyph",
  "ImFontGlyphRangesBuilder": "struct ImFontGlyphRangesBuilder",
+  "ImGuiActivateFlags": "int",
  "ImGuiBackendFlags": "int",
  "ImGuiButtonFlags": "int",
  "ImGuiCol": "int",
@@ -35,16 +36,10 @@
  "ImGuiContext": "struct ImGuiContext",
  "ImGuiContextHook": "struct ImGuiContextHook",
  "ImGuiContextHookCallback": "void(*)(ImGuiContext* ctx,ImGuiContextHook* hook);",
-  "ImGuiDataAuthority": "int",
  "ImGuiDataType": "int",
  "ImGuiDataTypeInfo": "struct ImGuiDataTypeInfo",
  "ImGuiDataTypeTempStorage": "struct ImGuiDataTypeTempStorage",
  "ImGuiDir": "int",
-  "ImGuiDockContext": "struct ImGuiDockContext",
-  "ImGuiDockNode": "struct ImGuiDockNode",
-  "ImGuiDockNodeFlags": "int",
-  "ImGuiDockNodeSettings": "struct ImGuiDockNodeSettings",
-  "ImGuiDockRequest": "struct ImGuiDockRequest",
  "ImGuiDragDropFlags": "int",
  "ImGuiErrorLogCallback": "void(*)(void* user_data,const char* fmt,...);",
  "ImGuiFocusedFlags": "int",
@@ -56,7 +51,6 @@
  "ImGuiInputTextCallbackData": "struct ImGuiInputTextCallbackData",
  "ImGuiInputTextFlags": "int",
  "ImGuiInputTextState": "struct ImGuiInputTextState",
-  "ImGuiItemAddFlags": "int",
  "ImGuiItemFlags": "int",
  "ImGuiItemStatusFlags": "int",
  "ImGuiKey": "int",
@@ -64,6 +58,8 @@
  "ImGuiLastItemData": "struct ImGuiLastItemData",
  "ImGuiLayoutType": "int",
  "ImGuiListClipper": "struct ImGuiListClipper",
+  "ImGuiListClipperData": "struct ImGuiListClipperData",
+  "ImGuiListClipperRange": "struct ImGuiListClipperRange",
  "ImGuiMemAllocFunc": "void*(*)(size_t sz,void* user_data);",
  "ImGuiMemFreeFunc": "void(*)(void* ptr,void* user_data);",
  "ImGuiMenuColumns": "struct ImGuiMenuColumns",
@@ -84,11 +80,10 @@
  "ImGuiOldColumns": "struct ImGuiOldColumns",
  "ImGuiOnceUponAFrame": "struct ImGuiOnceUponAFrame",
  "ImGuiPayload": "struct ImGuiPayload",
-  "ImGuiPlatformIO": "struct ImGuiPlatformIO",
-  "ImGuiPlatformMonitor": "struct ImGuiPlatformMonitor",
  "ImGuiPopupData": "struct ImGuiPopupData",
  "ImGuiPopupFlags": "int",
  "ImGuiPtrOrIndex": "struct ImGuiPtrOrIndex",
+  "ImGuiScrollFlags": "int",
  "ImGuiSelectableFlags": "int",
  "ImGuiSeparatorFlags": "int",
  "ImGuiSettingsHandler": "struct ImGuiSettingsHandler",
@@ -97,7 +92,9 @@
  "ImGuiSizeCallbackData": "struct ImGuiSizeCallbackData",
  "ImGuiSliderFlags": "int",
  "ImGuiSortDirection": "int",
+  "ImGuiStackLevelInfo": "struct ImGuiStackLevelInfo",
  "ImGuiStackSizes": "struct ImGuiStackSizes",
+  "ImGuiStackTool": "struct ImGuiStackTool",
  "ImGuiStorage": "struct ImGuiStorage",
  "ImGuiStoragePair": "struct ImGuiStoragePair",
  "ImGuiStyle": "struct ImGuiStyle",
@@ -132,8 +129,6 @@
  "ImGuiViewportFlags": "int",
  "ImGuiViewportP": "struct ImGuiViewportP",
  "ImGuiWindow": "struct ImGuiWindow",
-  "ImGuiWindowClass": "struct ImGuiWindowClass",
-  "ImGuiWindowDockStyle": "struct ImGuiWindowDockStyle",
  "ImGuiWindowFlags": "int",
  "ImGuiWindowSettings": "struct ImGuiWindowSettings",
  "ImGuiWindowStackData": "struct ImGuiWindowStackData",
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -23,6 +23,7 @@ defs["ImFontBuilderIO"] = "struct ImFontBuilderIO"
 defs["ImFontConfig"] = "struct ImFontConfig"
 defs["ImFontGlyph"] = "struct ImFontGlyph"
 defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder"
+defs["ImGuiActivateFlags"] = "int"
 defs["ImGuiBackendFlags"] = "int"
 defs["ImGuiButtonFlags"] = "int"
 defs["ImGuiCol"] = "int"
@@ -35,16 +36,10 @@ defs["ImGuiConfigFlags"] = "int"
 defs["ImGuiContext"] = "struct ImGuiContext"
 defs["ImGuiContextHook"] = "struct ImGuiContextHook"
 defs["ImGuiContextHookCallback"] = "void(*)(ImGuiContext* ctx,ImGuiContextHook* hook);"
-defs["ImGuiDataAuthority"] = "int"
 defs["ImGuiDataType"] = "int"
 defs["ImGuiDataTypeInfo"] = "struct ImGuiDataTypeInfo"
 defs["ImGuiDataTypeTempStorage"] = "struct ImGuiDataTypeTempStorage"
 defs["ImGuiDir"] = "int"
-defs["ImGuiDockContext"] = "struct ImGuiDockContext"
-defs["ImGuiDockNode"] = "struct ImGuiDockNode"
-defs["ImGuiDockNodeFlags"] = "int"
-defs["ImGuiDockNodeSettings"] = "struct ImGuiDockNodeSettings"
-defs["ImGuiDockRequest"] = "struct ImGuiDockRequest"
 defs["ImGuiDragDropFlags"] = "int"
 defs["ImGuiErrorLogCallback"] = "void(*)(void* user_data,const char* fmt,...);"
 defs["ImGuiFocusedFlags"] = "int"
@@ -56,7 +51,6 @@ defs["ImGuiInputTextCallback"] = "int(*)(ImGuiInputTextCallbackData* data);"
 defs["ImGuiInputTextCallbackData"] = "struct ImGuiInputTextCallbackData"
 defs["ImGuiInputTextFlags"] = "int"
 defs["ImGuiInputTextState"] = "struct ImGuiInputTextState"
-defs["ImGuiItemAddFlags"] = "int"
 defs["ImGuiItemFlags"] = "int"
 defs["ImGuiItemStatusFlags"] = "int"
 defs["ImGuiKey"] = "int"
@@ -64,6 +58,8 @@ defs["ImGuiKeyModFlags"] = "int"
 defs["ImGuiLastItemData"] = "struct ImGuiLastItemData"
 defs["ImGuiLayoutType"] = "int"
 defs["ImGuiListClipper"] = "struct ImGuiListClipper"
+defs["ImGuiListClipperData"] = "struct ImGuiListClipperData"
+defs["ImGuiListClipperRange"] = "struct ImGuiListClipperRange"
 defs["ImGuiMemAllocFunc"] = "void*(*)(size_t sz,void* user_data);"
 defs["ImGuiMemFreeFunc"] = "void(*)(void* ptr,void* user_data);"
 defs["ImGuiMenuColumns"] = "struct ImGuiMenuColumns"
@@ -84,11 +80,10 @@ defs["ImGuiOldColumnFlags"] = "int"
 defs["ImGuiOldColumns"] = "struct ImGuiOldColumns"
 defs["ImGuiOnceUponAFrame"] = "struct ImGuiOnceUponAFrame"
 defs["ImGuiPayload"] = "struct ImGuiPayload"
-defs["ImGuiPlatformIO"] = "struct ImGuiPlatformIO"
-defs["ImGuiPlatformMonitor"] = "struct ImGuiPlatformMonitor"
 defs["ImGuiPopupData"] = "struct ImGuiPopupData"
 defs["ImGuiPopupFlags"] = "int"
 defs["ImGuiPtrOrIndex"] = "struct ImGuiPtrOrIndex"
+defs["ImGuiScrollFlags"] = "int"
 defs["ImGuiSelectableFlags"] = "int"
 defs["ImGuiSeparatorFlags"] = "int"
 defs["ImGuiSettingsHandler"] = "struct ImGuiSettingsHandler"
@@ -97,7 +92,9 @@ defs["ImGuiSizeCallback"] = "void(*)(ImGuiSizeCallbackData* data);"
 defs["ImGuiSizeCallbackData"] = "struct ImGuiSizeCallbackData"
 defs["ImGuiSliderFlags"] = "int"
 defs["ImGuiSortDirection"] = "int"
+defs["ImGuiStackLevelInfo"] = "struct ImGuiStackLevelInfo"
 defs["ImGuiStackSizes"] = "struct ImGuiStackSizes"
+defs["ImGuiStackTool"] = "struct ImGuiStackTool"
 defs["ImGuiStorage"] = "struct ImGuiStorage"
 defs["ImGuiStoragePair"] = "struct ImGuiStoragePair"
 defs["ImGuiStyle"] = "struct ImGuiStyle"
@@ -132,8 +129,6 @@ defs["ImGuiViewport"] = "struct ImGuiViewport"
 defs["ImGuiViewportFlags"] = "int"
 defs["ImGuiViewportP"] = "struct ImGuiViewportP"
 defs["ImGuiWindow"] = "struct ImGuiWindow"
-defs["ImGuiWindowClass"] = "struct ImGuiWindowClass"
-defs["ImGuiWindowDockStyle"] = "struct ImGuiWindowDockStyle"
 defs["ImGuiWindowFlags"] = "int"
 defs["ImGuiWindowSettings"] = "struct ImGuiWindowSettings"
 defs["ImGuiWindowStackData"] = "struct ImGuiWindowStackData"
--- a/generator/print_defines.cpp
+++ b/generator/print_defines.cpp
@@ -0,0 +1,25 @@
+#include "imgui.h"
+
+#define CIMGUI_STRINGIZE_(x) #x
+#define CIMGUI_STRINGIZE(x) CIMGUI_STRINGIZE_(x)
+#define CIMGUI_DEFSTRING(x) "#define " #x " " CIMGUI_STRINGIZE(x)
+
+#ifdef IMGUI_VERSION
+#pragma message(CIMGUI_DEFSTRING(IMGUI_VERSION))
+#endif
+
+#ifdef IMGUI_HAS_DOCK
+#pragma message(CIMGUI_DEFSTRING(IMGUI_HAS_DOCK))
+#endif
+
+#ifdef IMGUI_HAS_IMSTR
+#pragma message(CIMGUI_DEFSTRING(IMGUI_HAS_IMSTR))
+#endif
+
+#ifdef FLT_MIN
+#pragma message(CIMGUI_DEFSTRING(FLT_MIN))
+#endif
+
+#ifdef FLT_MAX
+#pragma message(CIMGUI_DEFSTRING(FLT_MAX))
+#endif
--- a/2
+++ b/2
Author	SHA1	Message	Date
Victor Bombi	afce852875	Merge branch 'docking_inter'	2021-12-24 11:54:12 +01:00
Victor Bombi	a21aa1d613	pull imgui 1.86 and generate	2021-12-24 11:34:47 +01:00
Victor Bombi	e938d7e0f5	Merge branch 'docking_inter'	2021-12-06 19:41:17 +01:00
Victor Bombi	ff3bb81b34	cpp2ffi: allow __cdecl keyword in functype	2021-12-06 19:38:53 +01:00
Victor Bombi	05d7db048c	Merge branch 'docking_inter'	2021-10-18 19:17:22 +02:00
Victor Bombi	ae00a9b604	pull imgui docking 1.85 and generate	2021-10-18 18:14:44 +02:00
Victor Bombi	b679737444	Merge branch 'docking_inter'	2021-09-13 11:43:10 +02:00
Victor Bombi	d9916720aa	generation	2021-09-13 11:39:44 +02:00
Victor Bombi	66e28665da	cpp2ffi: add struct keyword (needed when struct tag name equals member name)	2021-09-13 11:39:14 +02:00
N/A	9768b42785	Fix flag arguments parsed wrong due to a bug in compiler check	2021-09-10 11:10:15 +02:00
N/A	ec64ca94cc	Disable unnecessary pragmas that break generator with the cl compiler	2021-09-10 11:10:15 +02:00
N/A	e1ccdc1764	Implement defines extraction with cl compiler	2021-09-10 11:10:15 +02:00
Victor Bombi	00946c45e4	Merge pull request #190 from THE-FYP/fix-cl Fix generation with MSVC	2021-09-10 11:05:41 +02:00
N/A	9ac28a2d94	Fix flag arguments parsed wrong due to a bug in compiler check	2021-09-09 23:01:57 +03:00
N/A	d0e4aaa2c0	Disable unnecessary pragmas that break generator with the cl compiler	2021-09-09 22:55:55 +03:00
N/A	7362cca7ec	Implement defines extraction with cl compiler	2021-09-09 22:49:28 +03:00
Victor Bombi	17ffa736d3	backend_test: use custom imgui gl3w	2021-08-22 13:50:21 +02:00
Victor Bombi	873c03c367	backend_test: use custom imgui gl3w	2021-08-22 13:48:02 +02:00
Victor Bombi	f16cdc74aa	really pull imgui	2021-08-22 12:12:46 +02:00
Victor Bombi	27c328b506	pull imgui 1.84.1 and generate	2021-08-22 12:12:19 +02:00
Victor Bombi	6a98f4bbed	Merge branch 'docking_inter'	2021-04-07 16:48:35 +02:00
Victor Bombi	a6b16c6da5	Merge branch 'docking_inter'	2021-04-06 18:16:55 +02:00
Victor Bombi	ea9720b412	Merge branch 'docking_inter'	2021-03-21 12:17:59 +01:00
Victor Bombi	2951194915	Merge branch 'docking_inter'	2021-03-21 09:48:38 +01:00
Victor Bombi	83f729b093	pull imgui master 1.82	2021-03-16 13:05:20 +01:00
Victor Bombi	34a48996e6	Merge branch 'docking_inter' # Conflicts: # cimgui.cpp # cimgui.h # generator/output/definitions.json # generator/output/definitions.lua # generator/output/structs_and_enums.json # generator/output/structs_and_enums.lua # imgui	2021-03-16 13:00:24 +01:00
Victor Bombi	c401f71eea	Merge branch 'docking_inter'	2021-03-04 13:33:42 +01:00
Victor Bombi	1ffc9e53c5	Merge branch 'docking_inter'	2021-03-04 12:46:16 +01:00
Victor Bombi	ceda975a5b	Merge branch 'docking_inter'	2021-03-01 20:19:21 +01:00
Victor Bombi	25aa25bd83	Merge branch 'docking_inter'	2021-02-11 14:58:25 +01:00
Victor Bombi	ba9ec30e64	Merge branch 'docking_inter'	2021-02-05 18:12:21 +01:00
Victor Bombi	6791a95f79	Merge branch 'docking_inter'	2021-01-27 10:54:09 +01:00
Victor Bombi	1bdfc0964e	pull submodule imgui master	2021-01-24 13:15:57 +01:00
Victor Bombi	7b9f0c7499	pull imgui master and generate	2021-01-24 11:34:52 +01:00