pull imgui master 1.82

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
2025-08-10 11:58:30 +01:00 · 2021-03-16 13:05:20 +01:00 · 2021-03-16 13:00:24 +01:00 · 2021-03-16 12:45:48 +01:00 · 2021-03-04 13:33:42 +01:00 · 2021-03-04 13:30:37 +01:00
21 changed files with 5281 additions and 10364 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/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ endif (IMGUI_STATIC)
 target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1)
 if (WIN32)
    target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t__declspec\(dllexport\))
+    list(APPEND IMGUI_LIBRARIES imm32)
 else (WIN32)
    target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t)
 endif (WIN32)
--- a/1
+++ b/1
@@ -6,6 +6,7 @@ OBJS = cimgui.o
 OBJS += ./imgui/imgui.o
 OBJS += ./imgui/imgui_draw.o
 OBJS += ./imgui/imgui_demo.o
+OBJS += ./imgui/imgui_tables.o
 OBJS += ./imgui/imgui_widgets.o

 CXXFLAGS=-O2 -fno-exceptions -fno-rtti
--- 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.80 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.82 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/main.c
+++ b/backend_test/main.c
@@ -11,7 +11,13 @@
 #include <GL/gl.h>
 #include <GL/glu.h>

-
+#ifdef IMGUI_HAS_IMSTR
+#define igBegin igBegin_Strv
+#define igSliderFloat igSliderFloat_Strv
+#define igCheckbox igCheckbox_Strv
+#define igColorEdit3 igColorEdit3_Strv
+#define igButton igButton_Strv
+#endif

 SDL_Window *window = NULL;

--- 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.80" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.82" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
-//docking branch

 #include "./imgui/imgui.h"
 #ifdef CIMGUI_FREETYPE
@@ -160,14 +159,6 @@ CIMGUI_API ImDrawList* igGetWindowDrawList()
 {
    return ImGui::GetWindowDrawList();
 }
-CIMGUI_API float igGetWindowDpiScale()
-{
-    return ImGui::GetWindowDpiScale();
-}
-CIMGUI_API ImGuiViewport* igGetWindowViewport()
-{
-    return ImGui::GetWindowViewport();
-}
 CIMGUI_API void igGetWindowPos(ImVec2 *pOut)
 {
    *pOut = ImGui::GetWindowPos();
@@ -212,10 +203,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 igSetWindowPosVec2(const ImVec2 pos,ImGuiCond cond)
 {
    return ImGui::SetWindowPos(pos,cond);
@@ -954,6 +941,14 @@ CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSele
 {
    return ImGui::Selectable(label,p_selected,flags,size);
 }
+CIMGUI_API bool igBeginListBox(const char* label,const ImVec2 size)
+{
+    return ImGui::BeginListBox(label,size);
+}
+CIMGUI_API void igEndListBox()
+{
+    return ImGui::EndListBox();
+}
 CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items)
 {
    return ImGui::ListBox(label,current_item,items,items_count,height_in_items);
@@ -962,18 +957,6 @@ CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*ite
 {
    return ImGui::ListBox(label,current_item,items_getter,data,items_count,height_in_items);
 }
-CIMGUI_API bool igListBoxHeaderVec2(const char* label,const ImVec2 size)
-{
-    return ImGui::ListBoxHeader(label,size);
-}
-CIMGUI_API bool igListBoxHeaderInt(const char* label,int items_count,int height_in_items)
-{
-    return ImGui::ListBoxHeader(label,items_count,height_in_items);
-}
-CIMGUI_API void igListBoxFooter()
-{
-    return ImGui::ListBoxFooter();
-}
 CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride)
 {
    return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride);
@@ -1117,7 +1100,7 @@ CIMGUI_API bool igTableSetColumnIndex(int column_n)
 {
    return ImGui::TableSetColumnIndex(column_n);
 }
-CIMGUI_API void igTableSetupColumn(const char* label,ImGuiTableColumnFlags flags,float init_width_or_weight,ImU32 user_id)
+CIMGUI_API void igTableSetupColumn(const char* label,ImGuiTableColumnFlags flags,float init_width_or_weight,ImGuiID user_id)
 {
    return ImGui::TableSetupColumn(label,flags,init_width_or_weight,user_id);
 }
@@ -1217,30 +1200,6 @@ CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label)
 {
    return ImGui::SetTabItemClosed(tab_or_docked_window_label);
 }
-CIMGUI_API void igDockSpace(ImGuiID id,const ImVec2 size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
-{
-    return ImGui::DockSpace(id,size,flags,window_class);
-}
-CIMGUI_API ImGuiID igDockSpaceOverViewport(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);
@@ -1261,6 +1220,10 @@ CIMGUI_API void igLogButtons()
 {
    return ImGui::LogButtons();
 }
+CIMGUI_API void igLogTextV(const char* fmt,va_list args)
+{
+    return ImGui::LogTextV(fmt,args);
+}
 CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags)
 {
    return ImGui::BeginDragDropSource(flags);
@@ -1373,6 +1336,10 @@ CIMGUI_API void igSetItemAllowOverlap()
 {
    return ImGui::SetItemAllowOverlap();
 }
+CIMGUI_API ImGuiViewport* igGetMainViewport()
+{
+    return ImGui::GetMainViewport();
+}
 CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size)
 {
    return ImGui::IsRectVisible(size);
@@ -1397,14 +1364,6 @@ CIMGUI_API ImDrawList* igGetForegroundDrawListNil()
 {
    return ImGui::GetForegroundDrawList();
 }
-CIMGUI_API ImDrawList* igGetBackgroundDrawListViewportPtr(ImGuiViewport* viewport)
-{
-    return ImGui::GetBackgroundDrawList(viewport);
-}
-CIMGUI_API ImDrawList* igGetForegroundDrawListViewportPtr(ImGuiViewport* viewport)
-{
-    return ImGui::GetForegroundDrawList(viewport);
-}
 CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData()
 {
    return ImGui::GetDrawListSharedData();
@@ -1565,10 +1524,14 @@ CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t
 {
    return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert,sz_drawidx);
 }
-CIMGUI_API void igSetAllocatorFunctions(void*(*alloc_func)(size_t sz,void* user_data),void(*free_func)(void* ptr,void* user_data),void* user_data)
+CIMGUI_API void igSetAllocatorFunctions(ImGuiMemAllocFunc alloc_func,ImGuiMemFreeFunc free_func,void* user_data)
 {
    return ImGui::SetAllocatorFunctions(alloc_func,free_func,user_data);
 }
+CIMGUI_API void igGetAllocatorFunctions(ImGuiMemAllocFunc* p_alloc_func,ImGuiMemFreeFunc* p_free_func,void** p_user_data)
+{
+    return ImGui::GetAllocatorFunctions(p_alloc_func,p_free_func,p_user_data);
+}
 CIMGUI_API void* igMemAlloc(size_t size)
 {
    return ImGui::MemAlloc(size);
@@ -1577,34 +1540,6 @@ CIMGUI_API void igMemFree(void* ptr)
 {
    return ImGui::MemFree(ptr);
 }
-CIMGUI_API ImGuiPlatformIO* igGetPlatformIO()
-{
-    return &ImGui::GetPlatformIO();
-}
-CIMGUI_API ImGuiViewport* igGetMainViewport()
-{
-    return ImGui::GetMainViewport();
-}
-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)();
@@ -1669,14 +1604,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)();
@@ -2021,13 +1948,13 @@ CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2
 {
    return self->AddLine(p1,p2,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness)
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawFlags flags,float thickness)
 {
-    return self->AddRect(p_min,p_max,col,rounding,rounding_corners,thickness);
+    return self->AddRect(p_min,p_max,col,rounding,flags,thickness);
 }
-CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
+CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawFlags flags)
 {
-    return self->AddRectFilled(p_min,p_max,col,rounding,rounding_corners);
+    return self->AddRectFilled(p_min,p_max,col,rounding,flags);
 }
 CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left)
 {
@@ -2073,9 +2000,9 @@ CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,fl
 {
    return self->AddText(font,font_size,pos,col,text_begin,text_end,wrap_width,cpu_fine_clip_rect);
 }
-CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)
+CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,ImDrawFlags flags,float thickness)
 {
-    return self->AddPolyline(points,num_points,col,closed,thickness);
+    return self->AddPolyline(points,num_points,col,flags,thickness);
 }
 CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col)
 {
@@ -2097,9 +2024,9 @@ CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_textur
 {
    return self->AddImageQuad(user_texture_id,p1,p2,p3,p4,uv1,uv2,uv3,uv4,col);
 }
-CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
+CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawFlags flags)
 {
-    return self->AddImageRounded(user_texture_id,p_min,p_max,uv_min,uv_max,col,rounding,rounding_corners);
+    return self->AddImageRounded(user_texture_id,p_min,p_max,uv_min,uv_max,col,rounding,flags);
 }
 CIMGUI_API void ImDrawList_PathClear(ImDrawList* self)
 {
@@ -2117,9 +2044,9 @@ CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* self,ImU32 col)
 {
    return self->PathFillConvex(col);
 }
-CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,float thickness)
+CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,ImDrawFlags flags,float thickness)
 {
-    return self->PathStroke(col,closed,thickness);
+    return self->PathStroke(col,flags,thickness);
 }
 CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments)
 {
@@ -2137,9 +2064,9 @@ CIMGUI_API void ImDrawList_PathBezierQuadraticCurveTo(ImDrawList* self,const ImV
 {
    return self->PathBezierQuadraticCurveTo(p2,p3,num_segments);
 }
-CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners)
+CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawFlags flags)
 {
-    return self->PathRect(rect_min,rect_max,rounding,rounding_corners);
+    return self->PathRect(rect_min,rect_max,rounding,flags);
 }
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data)
 {
@@ -2221,6 +2148,18 @@ CIMGUI_API void ImDrawList__OnChangedVtxOffset(ImDrawList* self)
 {
    return self->_OnChangedVtxOffset();
 }
+CIMGUI_API int ImDrawList__CalcCircleAutoSegmentCount(ImDrawList* self,float radius)
+{
+    return self->_CalcCircleAutoSegmentCount(radius);
+}
+CIMGUI_API void ImDrawList__PathArcToFastEx(ImDrawList* self,const ImVec2 center,float radius,int a_min_sample,int a_max_sample,int a_step)
+{
+    return self->_PathArcToFastEx(center,radius,a_min_sample,a_max_sample,a_step);
+}
+CIMGUI_API void ImDrawList__PathArcToN(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments)
+{
+    return self->_PathArcToN(center,radius,a_min,a_max,num_segments);
+}
 CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void)
 {
    return IM_NEW(ImDrawData)();
@@ -2493,22 +2432,6 @@ CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self,unsigned int c_begin,unsi
 {
    return self->IsGlyphRangeUnused(c_begin,c_last);
 }
-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 ImGuiViewport* ImGuiViewport_ImGuiViewport(void)
 {
    return IM_NEW(ImGuiViewport)();
@@ -2521,13 +2444,9 @@ CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self)
 {
    *pOut = self->GetCenter();
 }
-CIMGUI_API void ImGuiViewport_GetWorkPos(ImVec2 *pOut,ImGuiViewport* self)
+CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* self)
 {
-    *pOut = self->GetWorkPos();
-}
-CIMGUI_API void ImGuiViewport_GetWorkSize(ImVec2 *pOut,ImGuiViewport* self)
-{
-    *pOut = self->GetWorkSize();
+    *pOut = self->GetWorkCenter();
 }
 CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed)
 {
@@ -2889,6 +2808,10 @@ CIMGUI_API float ImRect_GetHeight(ImRect* self)
 {
    return self->GetHeight();
 }
+CIMGUI_API float ImRect_GetArea(ImRect* self)
+{
+    return self->GetArea();
+}
 CIMGUI_API void ImRect_GetTL(ImVec2 *pOut,ImRect* self)
 {
    *pOut = self->GetTL();
@@ -3009,9 +2932,9 @@ CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error)
+CIMGUI_API void ImDrawListSharedData_SetCircleTessellationMaxError(ImDrawListSharedData* self,float max_error)
 {
-    return self->SetCircleSegmentMaxError(max_error);
+    return self->SetCircleTessellationMaxError(max_error);
 }
 CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self)
 {
@@ -3021,6 +2944,10 @@ CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
 {
    return self->ClearFreeMemory();
 }
+CIMGUI_API int ImDrawDataBuilder_GetDrawListCount(ImDrawDataBuilder* self)
+{
+    return self->GetDrawListCount();
+}
 CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
 {
    return self->FlattenIntoSingleLayer();
@@ -3181,66 +3108,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 ImGuiDockNodeFlags ImGuiDockNode_GetMergedFlags(ImGuiDockNode* self)
-{
-    return self->GetMergedFlags();
-}
-CIMGUI_API void ImGuiDockNode_Rect(ImRect *pOut,ImGuiDockNode* self)
-{
-    *pOut = self->Rect();
-}
-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)();
@@ -3257,9 +3124,9 @@ CIMGUI_API void ImGuiViewportP_GetWorkRect(ImRect *pOut,ImGuiViewportP* self)
 {
    *pOut = self->GetWorkRect();
 }
-CIMGUI_API void ImGuiViewportP_ClearRequestFlags(ImGuiViewportP* self)
+CIMGUI_API void ImGuiViewportP_UpdateWorkRect(ImGuiViewportP* self)
 {
-    return self->ClearRequestFlags();
+    return self->UpdateWorkRect();
 }
 CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void)
 {
@@ -3545,6 +3412,14 @@ CIMGUI_API ImDrawList* igGetForegroundDrawListWindowPtr(ImGuiWindow* window)
 {
    return ImGui::GetForegroundDrawList(window);
 }
+CIMGUI_API ImDrawList* igGetBackgroundDrawListViewportPtr(ImGuiViewport* viewport)
+{
+    return ImGui::GetBackgroundDrawList(viewport);
+}
+CIMGUI_API ImDrawList* igGetForegroundDrawListViewportPtr(ImGuiViewport* viewport)
+{
+    return ImGui::GetForegroundDrawList(viewport);
+}
 CIMGUI_API void igInitialize(ImGuiContext* context)
 {
    return ImGui::Initialize(context);
@@ -3561,10 +3436,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();
@@ -3573,26 +3444,18 @@ CIMGUI_API void igUpdateMouseMovingWindowEndFrame()
 {
    return ImGui::UpdateMouseMovingWindowEndFrame();
 }
-CIMGUI_API void igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook)
+CIMGUI_API ImGuiID igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook)
 {
    return ImGui::AddContextHook(context,hook);
 }
+CIMGUI_API void igRemoveContextHook(ImGuiContext* context,ImGuiID hook_to_remove)
+{
+    return ImGui::RemoveContextHook(context,hook_to_remove);
+}
 CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType type)
 {
    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 igMarkIniSettingsDirtyNil()
 {
    return ImGui::MarkIniSettingsDirty();
@@ -3773,6 +3636,14 @@ CIMGUI_API void igLogToBuffer(int auto_open_depth)
 {
    return ImGui::LogToBuffer(auto_open_depth);
 }
+CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end)
+{
+    return ImGui::LogRenderedText(ref_pos,text,text_end);
+}
+CIMGUI_API void igLogSetNextTextDecoration(const char* prefix,const char* suffix)
+{
+    return ImGui::LogSetNextTextDecoration(prefix,suffix);
+}
 CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg,bool border,ImGuiWindowFlags flags)
 {
    return ImGui::BeginChildEx(name,id,size_arg,border,flags);
@@ -3849,13 +3720,9 @@ CIMGUI_API void igActivateItem(ImGuiID id)
 {
    return ImGui::ActivateItem(id);
 }
-CIMGUI_API void igSetNavID(ImGuiID id,int nav_layer,ImGuiID focus_scope_id)
+CIMGUI_API void igSetNavID(ImGuiID id,int nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel)
 {
-    return ImGui::SetNavID(id,nav_layer,focus_scope_id);
-}
-CIMGUI_API void igSetNavIDWithRectRel(ImGuiID id,int nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel)
-{
-    return ImGui::SetNavIDWithRectRel(id,nav_layer,focus_scope_id,rect_rel);
+    return ImGui::SetNavID(id,nav_layer,focus_scope_id,rect_rel);
 }
 CIMGUI_API void igPushFocusScope(ImGuiID id)
 {
@@ -3909,146 +3776,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 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);
@@ -4105,6 +3832,10 @@ CIMGUI_API void igTableOpenContextMenu(int column_n)
 {
    return ImGui::TableOpenContextMenu(column_n);
 }
+CIMGUI_API void igTableSetColumnEnabled(int column_n,bool enabled)
+{
+    return ImGui::TableSetColumnEnabled(column_n,enabled);
+}
 CIMGUI_API void igTableSetColumnWidth(int column_n,float width)
 {
    return ImGui::TableSetColumnWidth(column_n,width);
@@ -4129,6 +3860,10 @@ CIMGUI_API void igTablePopBackgroundChannel()
 {
    return ImGui::TablePopBackgroundChannel();
 }
+CIMGUI_API ImGuiTable* igGetCurrentTable()
+{
+    return ImGui::GetCurrentTable();
+}
 CIMGUI_API ImGuiTable* igTableFindByID(ImGuiID id)
 {
    return ImGui::TableFindByID(id);
@@ -4273,22 +4008,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);
@@ -4305,9 +4032,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)
 {
@@ -4349,9 +4076,9 @@ CIMGUI_API void igRenderFrameBorder(ImVec2 p_min,ImVec2 p_max,float rounding)
 {
    return ImGui::RenderFrameBorder(p_min,p_max,rounding);
 }
-CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,int rounding_corners_flags)
+CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,ImDrawFlags flags)
 {
-    return ImGui::RenderColorRectWithAlphaCheckerboard(draw_list,p_min,p_max,fill_col,grid_step,grid_off,rounding,rounding_corners_flags);
+    return ImGui::RenderColorRectWithAlphaCheckerboard(draw_list,p_min,p_max,fill_col,grid_step,grid_off,rounding,flags);
 }
 CIMGUI_API void igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags)
 {
@@ -4361,10 +4088,6 @@ CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_e
 {
    return ImGui::FindRenderedTextEnd(text,text_end);
 }
-CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end)
-{
-    return ImGui::LogRenderedText(ref_pos,text,text_end);
-}
 CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale)
 {
    return ImGui::RenderArrow(draw_list,pos,col,dir,scale);
@@ -4385,10 +4108,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);
@@ -4409,9 +4128,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)
 {
@@ -4421,9 +4140,9 @@ 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,ImDrawCornerFlags rounding_corners)
+CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p_scroll_v,float avail_v,float contents_v,ImDrawFlags flags)
 {
-    return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,rounding_corners);
+    return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,flags);
 }
 CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 size,const ImVec2 uv0,const ImVec2 uv1,const ImVec2 padding,const ImVec4 bg_col,const ImVec4 tint_col)
 {
@@ -4577,13 +4296,9 @@ 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)
 {
@@ -4621,9 +4336,13 @@ CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport)
 {
    return ImGui::DebugNodeViewport(viewport);
 }
-CIMGUI_API bool igImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas)
+CIMGUI_API void igDebugRenderViewportThumbnail(ImDrawList* draw_list,ImGuiViewportP* viewport,const ImRect bb)
 {
-    return ImFontAtlasBuildWithStbTruetype(atlas);
+    return ImGui::DebugRenderViewportThumbnail(draw_list,viewport,bb);
+}
+CIMGUI_API const ImFontBuilderIO* igImFontAtlasGetBuilderForStbTruetype()
+{
+    return ImFontAtlasGetBuilderForStbTruetype();
 }
 CIMGUI_API void igImFontAtlasBuildInit(ImFontAtlas* atlas)
 {
@@ -4641,9 +4360,13 @@ CIMGUI_API void igImFontAtlasBuildFinish(ImFontAtlas* atlas)
 {
    return ImFontAtlasBuildFinish(atlas);
 }
-CIMGUI_API void igImFontAtlasBuildRender1bppRectFromString(ImFontAtlas* atlas,int atlas_x,int atlas_y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value)
+CIMGUI_API void igImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value)
 {
-    return ImFontAtlasBuildRender1bppRectFromString(atlas,atlas_x,atlas_y,w,h,in_str,in_marker_char,in_marker_pixel_value);
+    return ImFontAtlasBuildRender8bppRectFromString(atlas,x,y,w,h,in_str,in_marker_char,in_marker_pixel_value);
+}
+CIMGUI_API void igImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned int in_marker_pixel_value)
+{
+    return ImFontAtlasBuildRender32bppRectFromString(atlas,x,y,w,h,in_str,in_marker_char,in_marker_pixel_value);
 }
 CIMGUI_API void igImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256],float in_multiply_factor)
 {
--- a/cimgui.h
+++ b/cimgui.h
--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
@@ -165,8 +165,11 @@ local function parse_enum_value(value, allenums,dontpost)
 		--already in allenums
 		if allenums[clean(value)] then return allenums[clean(value)] end
 		--must be several and operators
-		--precedence order (hope not ())
-		assert(not value:match("[%(%)]"))
+		------------precedence order (hope not ())
+		--first drop outer ()
+		value = value:gsub("^(%()",""):gsub("(%))$","")
+		assert(not value:match("[%(%)]"),value)
+		
 		local several,seps = strsplit(value,"([<>&|~%+]+)") 
 		--M.prtable(value,several,seps)
 		assert(#seps+1==#several)
@@ -182,6 +185,9 @@ local function parse_enum_value(value, allenums,dontpost)
 				local val2 = clean(several[i+1])
 				if allenums[val1] then val1 = allenums[val1] end
 				if allenums[val2] then val2 = allenums[val2] end
+				--clean 1u
+				if type(val1)=="string" then val1 = val1:gsub("(%d)(u)$","%1") end
+				if type(val2)=="string" then val2 = val2:gsub("(%d)(u)$","%1") end
 				--for getting numbers from "1ULL"
 				if type(val1)=="string" then val1 = loadstring("return "..val1)() end
 				if type(val2)=="string" then val2 = loadstring("return "..val2)() end
@@ -281,7 +287,7 @@ local function getRE()
 	typedef_re = "^\n*%s*(typedef[^;]+;)",
 	typedef_st_re = "^\n*(typedef%s+struct%s*%b{}.-;)",
 	functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%(%s*%*%s*[%w_]+%s*%)%s*%b()%s*;)",
-	functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%([^*]*%*%s*[%w_]+%s*%)%s*%b()%s*;)",
+	functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%([^*]*%*?%s*[%w_]+%s*%)%s*%b()%s*;)",
 	--vardef_re = "^\n*([^;{}%(%)]+;)",
 	--change for things as
 	--[[ImU8 Used4kPagesMap[((sizeof(ImWchar16) == 2 ? 0xFFFF : 0x10FFFF)+1)/4096/8];]]
@@ -414,14 +420,13 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 end
 M.parseItems = parseItems
 local function name_overloadsAlgo(v)
+
    local aa = {}
    local bb = {}
    local done = {}
    local maxnum = 0
    for i,t in ipairs(v) do
        bb[i] = ""
-        --local signature = t.signature:sub(2,-2) -- without parenthesis
-		--inside parenthesis
 		local signature = t.signature:match("%b()")
 		signature = signature:sub(2,-2)
 		--add const function
@@ -430,47 +435,52 @@ local function name_overloadsAlgo(v)
 		end
        aa[i] = {}
        local num = 1
-        --for typec in t.signature:gmatch(".-([^,%(%s]+)[,%)]") do
-        --for typec in t.signature:gmatch(".-([^,%(]+)[,%)]") do
-        --for typec in signature:gmatch(".-([^,]+),?") do
        for typec in signature:gsub("(%(.-%))", function(x) return x:gsub(",","\0") end):gmatch(".-([^,]+),?") do
-            --typec = typec:gsub
            aa[i][num] = typec:gsub("%z+", ",")
            num = num + 1
        end
        num = num - 1
        maxnum = (num > maxnum) and num or maxnum
    end
-    
+
    for l=1,maxnum do
        local keys = {}
        local diferent = true
        local equal = true
        for i=1,#v do
            aa[i][l] = aa[i][l] or "nil"
-            keys[aa[i][l]] = 1 + (aa[i][l] and keys[aa[i][l]] or 0)
+            keys[aa[i][l]] = 1 + (keys[aa[i][l]] or 0)
            if not done[i] then
-            for j=i+1,#v do
-                if not done[j] then
-                if aa[i][l] == aa[j][l] then
-                    diferent = false
-                else
-                    equal = false
+                for j=i+1,#v do
+                    if not done[j] then
+                        if aa[i][l] == aa[j][l] then
+                            diferent = false
+                        else
+                            equal = false
+                        end
+                    end
                end
-                end
-            end
            end
        end
        if not equal then -- not all the same
            for i=1,#v do
                if not done[i] then
                    bb[i] = bb[i]..(aa[i][l]=="nil" and "" or aa[i][l])
-                    if keys[aa[i][l]] == 1 then
-                        done[i] = true
-                    end
+                    -- if keys[aa[i][l]] == 1 then
+                        -- done[i] = true
+                    -- end
                end
            end
        end
+		--test done
+		for i=1,#v do
+			done[i] = true
+			for j=1,#v do
+				if i~=j and bb[i]==bb[j] then
+					done[i] = false
+				end
+			end
+		end
    end
 	--avoid empty postfix which will be reserved to generic
 	for i,v in ipairs(bb) do if v=="" then bb[i]="Nil" end end
@@ -493,6 +503,7 @@ local function typetoStr(typ)
    typ = typ:gsub("float","Float")
    typ = typ:gsub("uInt","Uint")
    typ = typ:gsub("ImGui","")
+    --typ = typ:gsub("ImStr","STR")
    typ = typ:gsub("Im","")
    typ = typ:gsub("[<>]","")
    return typ
@@ -769,6 +780,84 @@ local function AdjustArguments(FP)
        end
    end
 end
+local function ADDIMSTR_S(FP)
+    local defsT = FP.defsT
+    local newcdefs = {}
+    for numcdef,t in ipairs(FP.funcdefs) do
+		newcdefs[#newcdefs+1] = t
+        if t.cimguiname then
+        local cimf = defsT[t.cimguiname]
+        local defT = cimf[t.signature]
+
+        --if isIMSTR return generate _S version
+		local isIMSTR = false
+		for i,arg in ipairs(defT.argsT) do
+			if arg.type == "ImStrv" then isIMSTR=true;break end
+		end
+        --if defT.ret=="ImVec2" or defT.ret=="ImVec4" or defT.ret=="ImColor" then
+		--if isIMSTR then print(t.cimguiname,defT.ov_cimguiname,defT.argsoriginal,"isIMSTR") end
+		if isIMSTR then
+            --passing as a pointer arg
+            local defT2 = {}
+            --first strings
+            for k,v in pairs(defT) do
+                defT2[k] = v
+            end
+            --then argsT table
+            defT2.argsT = {}
+            for k,v in ipairs(defT.argsT) do
+				local typ = v.type == "ImStrv" and "const char*" or v.type
+                table.insert(defT2.argsT,{type=typ,name=v.name})
+            end
+			--defaults table
+			defT2.defaults = {}
+			for k,v in pairs(defT.defaults) do
+				defT2.defaults[k] = v
+            end
+            defT2.args = defT2.args:gsub("ImStrv","const char*")
+			--recreate call_args for wrapping into ImStrv
+			local caar
+			if #defT.argsT > 0 then
+				caar = "("
+				for i,v in ipairs(defT.argsT) do
+					local name = v.name 
+					if v.ret then --function pointer
+						caar = caar .. name .. ","
+					else
+						local callname = v.reftoptr and "*"..name or name 
+						caar = caar .. callname .. ","
+					end
+				end
+				caar = caar:sub(1,-2)..")"
+			else
+				caar = "()"
+			end
+			defT2.call_args = caar 
+			------------------
+            defT2.signature = defT.signature:gsub("ImStrv","const char*") --.."_S"
+            defT2.ov_cimguiname = defT2.ov_cimguiname .. "_Strv"
+            defT2.isIMSTR_S = 1
+			-- check there is not an equal version in imgui_stname
+			local doadd = true
+			for i,dd in ipairs(cimf) do
+				if dd.signature == defT2.signature then 
+					doadd = false;
+					print("skip _S addition",defT2.cimguiname)
+					break 
+				end
+			end
+			--add _S version
+			if doadd then
+			cimf[#cimf+1] = defT2
+			cimf[defT2.signature] = defT2
+			newcdefs[#newcdefs+1] = {stname=t.stname,funcname=t.funcname,args=defT2.args,signature=defT2.signature,cimguiname=defT2.cimguiname,ret =defT2.ret}
+			end
+        end
+		else print("not cimguiname in");M.prtable(t)
+        end
+    end
+	FP.funcdefs = newcdefs
+end
 local function ADDnonUDT(FP)
    local defsT = FP.defsT
    --local newcdefs = {}
@@ -995,16 +1084,25 @@ function M.Parser()
 				local value,key = line:match("typedef%s+(.+)%s+([%w_]+);")
 				if key and value then
 					self.typedefs_dict[key] = value
-				else --try function typedef
+				else --try function pointer typedef
 					local key = line:match("%(%*([%w_]+)%)%([^%(%)]*%)")
 					if key then
 						local linet = line
 						linet = linet:gsub("typedef ","")
 						linet = linet:gsub("%(%*("..key..")%)","(*)")
 						self.typedefs_dict[key] = linet
-					elseif not line:match"typedef%s*struct" then --discard typedef struct
-						print("typedef not found")
-						print(key,value,line)
+					else
+						--try function typedef
+						key = line:match("%(([%w_]+)%)%([^%(%)]*%)")
+						if key then
+							local linet = line
+							linet = linet:gsub("typedef ","")
+							linet = linet:gsub("%(("..key..")%)","()")
+							self.typedefs_dict[key] = linet
+						elseif not line:match"typedef%s*struct" then --discard typedef struct
+							print("typedef not found")
+							print(key,value,line)
+						end
 					end
 				end
 			end
@@ -1491,6 +1589,7 @@ function M.Parser()
        for k,v in pairs(self.alltypes) do print(k, typetoStr(k) ) end
    end
    function par:compute_overloads()
+		--ADDIMSTR_S(self)
        local strt = {}
        local numoverloaded = 0
        self.alltypes = {}
@@ -1506,8 +1605,15 @@ function M.Parser()
                for i,t in ipairs(v) do
                    --take overloaded name from manual table or algorythm
                    t.ov_cimguiname = self.getCname_overload(t.stname,t.funcname,t.signature,t.namespace) or k..typetoStr(post[i])
+					--check ...
+					if( t.ov_cimguiname:match"%.%.%.") then
+						print("... in ov",t.ov_cimguiname)
+						for i,dd in ipairs(v) do
+							print(dd.signature,post[i])
+						end
+						error"Bad check ..."
+					end
                    table.insert(strt,string.format("%d\t%s\t%s %s",i,t.ret,t.ov_cimguiname,t.signature))
-                    --M.prtable(typesc[i],post)
                end
                --check not two names are equal (produced by bad cimguiname_overload)
                for i=1,#v-1 do 
@@ -1525,8 +1631,10 @@ function M.Parser()
 		end)
        --print(numoverloaded, "overloaded")
        table.insert(strt,string.format("%d overloaded",numoverloaded))
+		ADDIMSTR_S(self)
 		AdjustArguments(self)
 		ADDnonUDT(self)
+
 		--ADDdestructors(self)
        self.overloadstxt  = table.concat(strt,"\n")
    end
--- a/generator/generator.lua
+++ b/generator/generator.lua
@@ -313,6 +313,9 @@ local function cimgui_generation(parser)
 	if gdefines.IMGUI_HAS_DOCK then
 		cstructsstr = cstructsstr.."\n#define IMGUI_HAS_DOCK       1\n"
 	end
+	if gdefines.IMGUI_HAS_IMSTR then
+		cstructsstr = cstructsstr.."\n#define IMGUI_HAS_IMSTR       1\n"
+	end
 	
    hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
    local cfuncsstr = func_header_generate(parser)
@@ -333,13 +336,13 @@ end
 --------------------------------------------------------
 --get imgui.h version and IMGUI_HAS_DOCK--------------------------
 --get some defines wont work for cl ----------------
-gdefines = get_defines{"IMGUI_VERSION","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK"}
+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/imgui.h","r")
 if not pipe then
    error("could not open file:"..err)
 end
-local imgui_version,has_dock
+local imgui_version,has_dock,has_imstr 
 while true do
    local line = pipe:read"*l"
 	if not line then break end
@@ -349,11 +352,15 @@ while true do
 	if not has_dock then
 		has_dock = line:match([[#define%s+IMGUI_HAS_DOCK]])--%s*(".+")]])
 	end
-    if imgui_version and has_dock then break 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

 cimgui_header = cimgui_header:gsub("XXX",imgui_version)
 if INTERNAL_GENERATION then
@@ -369,6 +376,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)

--- a/generator/output/cimgui_impl.h
+++ b/generator/output/cimgui_impl.h
@@ -1,20 +1,18 @@
 typedef struct SDL_Window SDL_Window;
-typedef struct GLFWmonitor GLFWmonitor;
 typedef struct GLFWwindow GLFWwindow;

 struct GLFWwindow;
-struct GLFWmonitor;

 struct SDL_Window;
 typedef union SDL_Event SDL_Event;CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
 CIMGUI_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window,bool install_callbacks);
+CIMGUI_API bool ImGui_ImplGlfw_InitForOther(GLFWwindow* window,bool install_callbacks);
 CIMGUI_API void ImGui_ImplGlfw_Shutdown();
 CIMGUI_API void ImGui_ImplGlfw_NewFrame();
 CIMGUI_API void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window,int button,int action,int mods);
 CIMGUI_API void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window,double xoffset,double yoffset);
 CIMGUI_API void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window,int key,int scancode,int action,int mods);
 CIMGUI_API void ImGui_ImplGlfw_CharCallback(GLFWwindow* window,unsigned int c);
-CIMGUI_API void ImGui_ImplGlfw_MonitorCallback(GLFWmonitor* monitor,int event);
 CIMGUI_API bool ImGui_ImplOpenGL3_Init(const char* glsl_version);
 CIMGUI_API void ImGui_ImplOpenGL3_Shutdown();
 CIMGUI_API void ImGui_ImplOpenGL3_NewFrame();
--- 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:40",
+      "location": "imgui_impl_glfw:36",
      "ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,unsigned int)",
@@ -42,13 +42,38 @@
      "cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InitForOpenGL",
-      "location": "imgui_impl_glfw:29",
+      "location": "imgui_impl_glfw:24",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
      "stname": ""
    }
  ],
+  "ImGui_ImplGlfw_InitForOther": [
+    {
+      "args": "(GLFWwindow* window,bool install_callbacks)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "GLFWwindow*"
+        },
+        {
+          "name": "install_callbacks",
+          "type": "bool"
+        }
+      ],
+      "argsoriginal": "(GLFWwindow* window,bool install_callbacks)",
+      "call_args": "(window,install_callbacks)",
+      "cimguiname": "ImGui_ImplGlfw_InitForOther",
+      "defaults": {},
+      "funcname": "ImGui_ImplGlfw_InitForOther",
+      "location": "imgui_impl_glfw:26",
+      "ov_cimguiname": "ImGui_ImplGlfw_InitForOther",
+      "ret": "bool",
+      "signature": "(GLFWwindow*,bool)",
+      "stname": ""
+    }
+  ],
  "ImGui_ImplGlfw_InitForVulkan": [
    {
      "args": "(GLFWwindow* window,bool install_callbacks)",
@@ -67,7 +92,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForVulkan",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InitForVulkan",
-      "location": "imgui_impl_glfw:30",
+      "location": "imgui_impl_glfw:25",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForVulkan",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -104,38 +129,13 @@
      "cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_KeyCallback",
-      "location": "imgui_impl_glfw:39",
+      "location": "imgui_impl_glfw:35",
      "ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int,int)",
      "stname": ""
    }
  ],
-  "ImGui_ImplGlfw_MonitorCallback": [
-    {
-      "args": "(GLFWmonitor* monitor,int event)",
-      "argsT": [
-        {
-          "name": "monitor",
-          "type": "GLFWmonitor*"
-        },
-        {
-          "name": "event",
-          "type": "int"
-        }
-      ],
-      "argsoriginal": "(GLFWmonitor* monitor,int event)",
-      "call_args": "(monitor,event)",
-      "cimguiname": "ImGui_ImplGlfw_MonitorCallback",
-      "defaults": {},
-      "funcname": "ImGui_ImplGlfw_MonitorCallback",
-      "location": "imgui_impl_glfw:41",
-      "ov_cimguiname": "ImGui_ImplGlfw_MonitorCallback",
-      "ret": "void",
-      "signature": "(GLFWmonitor*,int)",
-      "stname": ""
-    }
-  ],
  "ImGui_ImplGlfw_MouseButtonCallback": [
    {
      "args": "(GLFWwindow* window,int button,int action,int mods)",
@@ -162,7 +162,7 @@
      "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
-      "location": "imgui_impl_glfw:37",
+      "location": "imgui_impl_glfw:33",
      "ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int)",
@@ -178,7 +178,7 @@
      "cimguiname": "ImGui_ImplGlfw_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_NewFrame",
-      "location": "imgui_impl_glfw:32",
+      "location": "imgui_impl_glfw:28",
      "ov_cimguiname": "ImGui_ImplGlfw_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -207,7 +207,7 @@
      "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_ScrollCallback",
-      "location": "imgui_impl_glfw:38",
+      "location": "imgui_impl_glfw:34",
      "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,double,double)",
@@ -223,7 +223,7 @@
      "cimguiname": "ImGui_ImplGlfw_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_Shutdown",
-      "location": "imgui_impl_glfw:31",
+      "location": "imgui_impl_glfw:27",
      "ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -239,7 +239,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
-      "location": "imgui_impl_opengl2:31",
+      "location": "imgui_impl_opengl2:30",
      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
@@ -255,7 +255,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_CreateFontsTexture",
-      "location": "imgui_impl_opengl2:29",
+      "location": "imgui_impl_opengl2:28",
      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
@@ -271,7 +271,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl2:32",
+      "location": "imgui_impl_opengl2:31",
      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
@@ -287,7 +287,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
-      "location": "imgui_impl_opengl2:30",
+      "location": "imgui_impl_opengl2:29",
      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
@@ -303,7 +303,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_Init",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_Init",
-      "location": "imgui_impl_opengl2:23",
+      "location": "imgui_impl_opengl2:22",
      "ov_cimguiname": "ImGui_ImplOpenGL2_Init",
      "ret": "bool",
      "signature": "()",
@@ -319,7 +319,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_NewFrame",
-      "location": "imgui_impl_opengl2:25",
+      "location": "imgui_impl_opengl2:24",
      "ov_cimguiname": "ImGui_ImplOpenGL2_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -340,7 +340,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_RenderDrawData",
-      "location": "imgui_impl_opengl2:26",
+      "location": "imgui_impl_opengl2:25",
      "ov_cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
@@ -356,7 +356,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_Shutdown",
-      "location": "imgui_impl_opengl2:24",
+      "location": "imgui_impl_opengl2:23",
      "ov_cimguiname": "ImGui_ImplOpenGL2_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -372,7 +372,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
-      "location": "imgui_impl_opengl3:37",
+      "location": "imgui_impl_opengl3:36",
      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
@@ -388,7 +388,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_CreateFontsTexture",
-      "location": "imgui_impl_opengl3:35",
+      "location": "imgui_impl_opengl3:34",
      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
@@ -404,7 +404,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl3:38",
+      "location": "imgui_impl_opengl3:37",
      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
@@ -420,7 +420,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
-      "location": "imgui_impl_opengl3:36",
+      "location": "imgui_impl_opengl3:35",
      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
@@ -443,7 +443,7 @@
        "glsl_version": "((void*)0)"
      },
      "funcname": "ImGui_ImplOpenGL3_Init",
-      "location": "imgui_impl_opengl3:29",
+      "location": "imgui_impl_opengl3:28",
      "ov_cimguiname": "ImGui_ImplOpenGL3_Init",
      "ret": "bool",
      "signature": "(const char*)",
@@ -459,7 +459,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_NewFrame",
-      "location": "imgui_impl_opengl3:31",
+      "location": "imgui_impl_opengl3:30",
      "ov_cimguiname": "ImGui_ImplOpenGL3_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -480,7 +480,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_RenderDrawData",
-      "location": "imgui_impl_opengl3:32",
+      "location": "imgui_impl_opengl3:31",
      "ov_cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
@@ -496,7 +496,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_Shutdown",
-      "location": "imgui_impl_opengl3:30",
+      "location": "imgui_impl_opengl3:29",
      "ov_cimguiname": "ImGui_ImplOpenGL3_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -517,7 +517,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForD3D",
-      "location": "imgui_impl_sdl:27",
+      "location": "imgui_impl_sdl:25",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -538,7 +538,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForMetal",
-      "location": "imgui_impl_sdl:28",
+      "location": "imgui_impl_sdl:26",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -563,7 +563,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForOpenGL",
-      "location": "imgui_impl_sdl:25",
+      "location": "imgui_impl_sdl:23",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "ret": "bool",
      "signature": "(SDL_Window*,void*)",
@@ -584,7 +584,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForVulkan",
-      "location": "imgui_impl_sdl:26",
+      "location": "imgui_impl_sdl:24",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -605,7 +605,7 @@
      "cimguiname": "ImGui_ImplSDL2_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_NewFrame",
-      "location": "imgui_impl_sdl:30",
+      "location": "imgui_impl_sdl:28",
      "ov_cimguiname": "ImGui_ImplSDL2_NewFrame",
      "ret": "void",
      "signature": "(SDL_Window*)",
@@ -626,7 +626,7 @@
      "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_ProcessEvent",
-      "location": "imgui_impl_sdl:31",
+      "location": "imgui_impl_sdl:29",
      "ov_cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "ret": "bool",
      "signature": "(const SDL_Event*)",
@@ -642,7 +642,7 @@
      "cimguiname": "ImGui_ImplSDL2_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_Shutdown",
-      "location": "imgui_impl_sdl:29",
+      "location": "imgui_impl_sdl:27",
      "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:40"
+defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:36"
 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,12 +35,33 @@ 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:29"
+defs["ImGui_ImplGlfw_InitForOpenGL"][1]["location"] = "imgui_impl_glfw:24"
 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)"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["stname"] = ""
 defs["ImGui_ImplGlfw_InitForOpenGL"]["(GLFWwindow*,bool)"] = defs["ImGui_ImplGlfw_InitForOpenGL"][1]
+defs["ImGui_ImplGlfw_InitForOther"] = {}
+defs["ImGui_ImplGlfw_InitForOther"][1] = {}
+defs["ImGui_ImplGlfw_InitForOther"][1]["args"] = "(GLFWwindow* window,bool install_callbacks)"
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"] = {}
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1] = {}
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1]["name"] = "window"
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1]["type"] = "GLFWwindow*"
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2] = {}
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2]["name"] = "install_callbacks"
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2]["type"] = "bool"
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsoriginal"] = "(GLFWwindow* window,bool install_callbacks)"
+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:26"
+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)"
+defs["ImGui_ImplGlfw_InitForOther"][1]["stname"] = ""
+defs["ImGui_ImplGlfw_InitForOther"]["(GLFWwindow*,bool)"] = defs["ImGui_ImplGlfw_InitForOther"][1]
 defs["ImGui_ImplGlfw_InitForVulkan"] = {}
 defs["ImGui_ImplGlfw_InitForVulkan"][1] = {}
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["args"] = "(GLFWwindow* window,bool install_callbacks)"
@@ -56,7 +77,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:30"
+defs["ImGui_ImplGlfw_InitForVulkan"][1]["location"] = "imgui_impl_glfw:25"
 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)"
@@ -86,33 +107,12 @@ 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:39"
+defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:35"
 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)"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["stname"] = ""
 defs["ImGui_ImplGlfw_KeyCallback"]["(GLFWwindow*,int,int,int,int)"] = defs["ImGui_ImplGlfw_KeyCallback"][1]
-defs["ImGui_ImplGlfw_MonitorCallback"] = {}
-defs["ImGui_ImplGlfw_MonitorCallback"][1] = {}
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["args"] = "(GLFWmonitor* monitor,int event)"
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["argsT"] = {}
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["argsT"][1] = {}
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["argsT"][1]["name"] = "monitor"
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["argsT"][1]["type"] = "GLFWmonitor*"
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["argsT"][2] = {}
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["argsT"][2]["name"] = "event"
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["argsT"][2]["type"] = "int"
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["argsoriginal"] = "(GLFWmonitor* monitor,int event)"
-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: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)"
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["stname"] = ""
-defs["ImGui_ImplGlfw_MonitorCallback"]["(GLFWmonitor*,int)"] = defs["ImGui_ImplGlfw_MonitorCallback"][1]
 defs["ImGui_ImplGlfw_MouseButtonCallback"] = {}
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1] = {}
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["args"] = "(GLFWwindow* window,int button,int action,int mods)"
@@ -134,7 +134,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:37"
+defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:33"
 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)"
@@ -149,7 +149,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:32"
+defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:28"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_NewFrame"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_NewFrame"][1]["signature"] = "()"
@@ -173,7 +173,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:38"
+defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:34"
 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)"
@@ -188,7 +188,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:31"
+defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:27"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_Shutdown"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_Shutdown"][1]["signature"] = "()"
@@ -203,7 +203,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:31"
+defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl2:30"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["signature"] = "()"
@@ -218,7 +218,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:29"
+defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl2:28"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["signature"] = "()"
@@ -233,7 +233,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:32"
+defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl2:31"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["signature"] = "()"
@@ -248,7 +248,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:30"
+defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl2:29"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["signature"] = "()"
@@ -263,7 +263,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:23"
+defs["ImGui_ImplOpenGL2_Init"][1]["location"] = "imgui_impl_opengl2:22"
 defs["ImGui_ImplOpenGL2_Init"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_Init"
 defs["ImGui_ImplOpenGL2_Init"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_Init"][1]["signature"] = "()"
@@ -278,7 +278,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:25"
+defs["ImGui_ImplOpenGL2_NewFrame"][1]["location"] = "imgui_impl_opengl2:24"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_NewFrame"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["signature"] = "()"
@@ -296,7 +296,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:26"
+defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["location"] = "imgui_impl_opengl2:25"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_RenderDrawData"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["signature"] = "(ImDrawData*)"
@@ -311,7 +311,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:24"
+defs["ImGui_ImplOpenGL2_Shutdown"][1]["location"] = "imgui_impl_opengl2:23"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_Shutdown"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["signature"] = "()"
@@ -326,7 +326,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:37"
+defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl3:36"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["signature"] = "()"
@@ -341,7 +341,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:35"
+defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl3:34"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["signature"] = "()"
@@ -356,7 +356,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:38"
+defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl3:37"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["signature"] = "()"
@@ -371,7 +371,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:36"
+defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl3:35"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["signature"] = "()"
@@ -390,7 +390,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:29"
+defs["ImGui_ImplOpenGL3_Init"][1]["location"] = "imgui_impl_opengl3:28"
 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*)"
@@ -405,7 +405,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:31"
+defs["ImGui_ImplOpenGL3_NewFrame"][1]["location"] = "imgui_impl_opengl3:30"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["signature"] = "()"
@@ -423,7 +423,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:32"
+defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["location"] = "imgui_impl_opengl3:31"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["signature"] = "(ImDrawData*)"
@@ -438,7 +438,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:30"
+defs["ImGui_ImplOpenGL3_Shutdown"][1]["location"] = "imgui_impl_opengl3:29"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["signature"] = "()"
@@ -456,7 +456,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:27"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl:25"
 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*)"
@@ -474,7 +474,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:28"
+defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl:26"
 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*)"
@@ -495,7 +495,7 @@ 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:25"
+defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl:23"
 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*)"
@@ -513,7 +513,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:26"
+defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl:24"
 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*)"
@@ -531,7 +531,7 @@ defs["ImGui_ImplSDL2_NewFrame"][1]["call_args"] = "(window)"
 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:30"
+defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl:28"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_NewFrame"][1]["signature"] = "(SDL_Window*)"
@@ -549,7 +549,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:31"
+defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl:29"
 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*)"
@@ -564,7 +564,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:29"
+defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl:27"
 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	igGetColorU32U32 (ImU32)
 igGetForegroundDrawList	3
 1	ImDrawList*	igGetForegroundDrawListNil ()
-2	ImDrawList*	igGetForegroundDrawListViewportPtr (ImGuiViewport*)
-3	ImDrawList*	igGetForegroundDrawListWindowPtr (ImGuiWindow*)
+2	ImDrawList*	igGetForegroundDrawListWindowPtr (ImGuiWindow*)
+3	ImDrawList*	igGetForegroundDrawListViewportPtr (ImGuiViewport*)
 igGetID	3
 1	ImGuiID	igGetIDStr (const char*)
 2	ImGuiID	igGetIDStrStr (const char*,const char*)
@@ -164,9 +164,6 @@ igItemSize	2
 igListBox	2
 1	bool	igListBoxStr_arr (const char*,int*,const char* const[],int,int)
 2	bool	igListBoxFnBoolPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
-igListBoxHeader	2
-1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
-2	bool	igListBoxHeaderInt (const char*,int,int)
 igMarkIniSettingsDirty	2
 1	void	igMarkIniSettingsDirtyNil ()
 2	void	igMarkIniSettingsDirtyWindowPtr (ImGuiWindow*)
@@ -248,4 +245,4 @@ igValue	4
 2	void	igValueInt (const char*,int)
 3	void	igValueUint (const char*,unsigned int)
 4	void	igValueFloat (const char*,float,const char*)
-175 overloaded
+173 overloaded
--- 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
@@ -5,9 +5,9 @@
  "ImDrawChannel": "struct ImDrawChannel",
  "ImDrawCmd": "struct ImDrawCmd",
  "ImDrawCmdHeader": "struct ImDrawCmdHeader",
-  "ImDrawCornerFlags": "int",
  "ImDrawData": "struct ImDrawData",
  "ImDrawDataBuilder": "struct ImDrawDataBuilder",
+  "ImDrawFlags": "int",
  "ImDrawIdx": "unsigned short",
  "ImDrawList": "struct ImDrawList",
  "ImDrawListFlags": "int",
@@ -19,6 +19,7 @@
  "ImFontAtlas": "struct ImFontAtlas",
  "ImFontAtlasCustomRect": "struct ImFontAtlasCustomRect",
  "ImFontAtlasFlags": "int",
+  "ImFontBuilderIO": "struct ImFontBuilderIO",
  "ImFontConfig": "struct ImFontConfig",
  "ImFontGlyph": "struct ImFontGlyph",
  "ImFontGlyphRangesBuilder": "struct ImFontGlyphRangesBuilder",
@@ -33,16 +34,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",
@@ -61,6 +56,8 @@
  "ImGuiLastItemDataBackup": "struct ImGuiLastItemDataBackup",
  "ImGuiLayoutType": "int",
  "ImGuiListClipper": "struct ImGuiListClipper",
+  "ImGuiMemAllocFunc": "void*(*)(size_t sz,void* user_data);",
+  "ImGuiMemFreeFunc": "void(*)(void* ptr,void* user_data);",
  "ImGuiMenuColumns": "struct ImGuiMenuColumns",
  "ImGuiMetricsConfig": "struct ImGuiMetricsConfig",
  "ImGuiMouseButton": "int",
@@ -79,8 +76,6 @@
  "ImGuiOldColumns": "struct ImGuiOldColumns",
  "ImGuiOnceUponAFrame": "struct ImGuiOnceUponAFrame",
  "ImGuiPayload": "struct ImGuiPayload",
-  "ImGuiPlatformIO": "struct ImGuiPlatformIO",
-  "ImGuiPlatformMonitor": "struct ImGuiPlatformMonitor",
  "ImGuiPopupData": "struct ImGuiPopupData",
  "ImGuiPopupFlags": "int",
  "ImGuiPtrOrIndex": "struct ImGuiPtrOrIndex",
@@ -126,8 +121,6 @@
  "ImGuiViewportFlags": "int",
  "ImGuiViewportP": "struct ImGuiViewportP",
  "ImGuiWindow": "struct ImGuiWindow",
-  "ImGuiWindowClass": "struct ImGuiWindowClass",
-  "ImGuiWindowDockStyle": "struct ImGuiWindowDockStyle",
  "ImGuiWindowFlags": "int",
  "ImGuiWindowSettings": "struct ImGuiWindowSettings",
  "ImGuiWindowTempData": "struct ImGuiWindowTempData",
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -5,9 +5,9 @@ defs["ImDrawCallback"] = "void(*)(const ImDrawList* parent_list,const ImDrawCmd*
 defs["ImDrawChannel"] = "struct ImDrawChannel"
 defs["ImDrawCmd"] = "struct ImDrawCmd"
 defs["ImDrawCmdHeader"] = "struct ImDrawCmdHeader"
-defs["ImDrawCornerFlags"] = "int"
 defs["ImDrawData"] = "struct ImDrawData"
 defs["ImDrawDataBuilder"] = "struct ImDrawDataBuilder"
+defs["ImDrawFlags"] = "int"
 defs["ImDrawIdx"] = "unsigned short"
 defs["ImDrawList"] = "struct ImDrawList"
 defs["ImDrawListFlags"] = "int"
@@ -19,6 +19,7 @@ defs["ImFont"] = "struct ImFont"
 defs["ImFontAtlas"] = "struct ImFontAtlas"
 defs["ImFontAtlasCustomRect"] = "struct ImFontAtlasCustomRect"
 defs["ImFontAtlasFlags"] = "int"
+defs["ImFontBuilderIO"] = "struct ImFontBuilderIO"
 defs["ImFontConfig"] = "struct ImFontConfig"
 defs["ImFontGlyph"] = "struct ImFontGlyph"
 defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder"
@@ -33,16 +34,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"
@@ -61,6 +56,8 @@ defs["ImGuiKeyModFlags"] = "int"
 defs["ImGuiLastItemDataBackup"] = "struct ImGuiLastItemDataBackup"
 defs["ImGuiLayoutType"] = "int"
 defs["ImGuiListClipper"] = "struct ImGuiListClipper"
+defs["ImGuiMemAllocFunc"] = "void*(*)(size_t sz,void* user_data);"
+defs["ImGuiMemFreeFunc"] = "void(*)(void* ptr,void* user_data);"
 defs["ImGuiMenuColumns"] = "struct ImGuiMenuColumns"
 defs["ImGuiMetricsConfig"] = "struct ImGuiMetricsConfig"
 defs["ImGuiMouseButton"] = "int"
@@ -79,8 +76,6 @@ 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"
@@ -126,8 +121,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["ImGuiWindowTempData"] = "struct ImGuiWindowTempData"
--- a/2
+++ b/2
--- a/test/main.c
+++ b/test/main.c
@@ -2,6 +2,14 @@
 #include <assert.h>
 #include "../cimgui.h"

+#ifdef IMGUI_HAS_IMSTR
+#define igBegin igBegin_Strv
+#define igSliderFloat igSliderFloat_Strv
+#define igCheckbox igCheckbox_Strv
+#define igColorEdit3 igColorEdit3_Strv
+#define igButton igButton_Strv
+#endif
+
 int main(void)
 {
  assert(igDebugCheckVersionAndDataLayout(igGetVersion(), sizeof(ImGuiIO), sizeof(ImGuiStyle),
Author	SHA1	Message	Date
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	ccdae842e4	pull imgui docking 1.82 and generate	2021-03-16 12:45:48 +01:00
Victor Bombi	c401f71eea	Merge branch 'docking_inter'	2021-03-04 13:33:42 +01:00
Victor Bombi	c22606a7f0	test and backend_test/main.c changes for compiling with ImStrv	2021-03-04 13:30:37 +01:00
Victor Bombi	6552b43aae	cpp2ffi: ImStr -> ImStrv	2021-03-04 13:30:37 +01:00
Victor Bombi	3d4277be4d	CMakeLists: win32 add imm32 library	2021-03-04 13:30:37 +01:00
Victor Bombi	1ffc9e53c5	Merge branch 'docking_inter'	2021-03-04 12:46:16 +01:00
Victor Bombi	13aac22a35	cpp2ffi: allow function typedefs (not only function pointer typedefs)	2021-03-04 12:44:49 +01:00
Victor Bombi	ceda975a5b	Merge branch 'docking_inter'	2021-03-01 20:19:21 +01:00
Victor Bombi	aa0baa777c	Makefile: add imgui_tables.cpp	2021-03-01 20:16:56 +01:00
Victor Bombi	25aa25bd83	Merge branch 'docking_inter'	2021-02-11 14:58:25 +01:00
Victor Bombi	41b397020a	readme update	2021-02-11 14:50:09 +01:00
Victor Bombi	c1890d4c00	pull imgui docking 1.81	2021-02-11 10:32:01 +01:00
Victor Bombi	7756c4f53f	pull imgui docking 1.81 and generate	2021-02-11 10:31:31 +01:00
Victor Bombi	ba9ec30e64	Merge branch 'docking_inter'	2021-02-05 18:12:21 +01:00
Victor Bombi	2638737f2c	cpp2ffi: parse_enum_value drop outer () (ImGuizmo needed it)	2021-02-05 18:04:22 +01:00
Victor Bombi	6aa3f1decd	cpp2ffi: const char* versions of ImStr take now a postfix _Strv	2021-02-05 16:06:10 +01:00
Victor Bombi	bc708a092d	cpp2ffi: char* -> Str, ImStr -> STR for backward compability	2021-02-05 16:06:10 +01:00
Victor Bombi	9ac7cd93e1	test, backend_test adapt to new naming	2021-02-05 16:06:10 +01:00
Victor Bombi	2838c0317a	cpp2ffi: changes for name prefixing the const char* versions of ImStr	2021-02-05 16:06:09 +01:00
Victor Bombi	c57efd953f	cpp2ffi: dont expect const ImStr	2021-02-05 16:06:09 +01:00
Victor Bombi	a48009b062	test and backend_test modifications for IMGUI_HAS_IMSTR	2021-02-05 16:06:09 +01:00
Victor Bombi	383ebf3a7a	cpp2ffi: ADDiMSTR_S before overload naming and copy defaults, overload_Algo improvement	2021-02-05 16:06:09 +01:00
Victor Bombi	afdbb6b799	test and backend_test prepared for IMGUI_HAS_IMSTR	2021-02-05 16:06:09 +01:00
Victor Bombi	a64de2e303	cpp2ffi: add ADDIMSTR_S function for making const char* versions of ImStr arguments	2021-02-05 16:06:09 +01:00
Victor Bombi	a9928295db	generator: keep IMGUI_HAS_IMSTR definition	2021-02-05 16:06:09 +01:00
Victor Bombi	ce239ed53f	cpp2ffi: overload naming char* -> Chpt (was Str) avoids clash with ImStr - > Str	2021-02-05 16:06:09 +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