pull imgui 1.89.1 and generate

pull imgui 1.89.1 docking and generate
generator.lua: use IMGUI_VERSION_NUM
2025-08-10 11:58:30 +01:00 · 2022-11-26 09:10:06 +01:00 · 2022-11-26 08:32:02 +01:00 · 2022-11-25 10:27:13 +01:00 · 2022-11-16 17:13:33 +01:00 · 2022-11-16 11:15:37 +01:00
17 changed files with 4631 additions and 10762 deletions
--- 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.89 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.89.1 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/example_glfw_opengl3/CMakeLists.txt
+++ b/backend_test/example_glfw_opengl3/CMakeLists.txt
@@ -0,0 +1,103 @@
+Project(cimgui_glfw)
+cmake_minimum_required(VERSION 3.11)
+if(WIN32) # to mingw work as all the others
+	set(CMAKE_SHARED_LIBRARY_PREFIX "")
+endif(WIN32)
+
+set (CMAKE_CXX_STANDARD 11)
+
+# general settings
+if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../imgui/backends)
+	set(BAKENDS_FOLDER "../../imgui/backends/")
+else()
+	set(BAKENDS_FOLDER "../../imgui/examples/")
+endif()
+
+if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../imgui/imgui_tables.cpp)
+	set(TABLES_SOURCE "../../imgui/imgui_tables.cpp")
+else()
+	set(TABLES_SOURCE "")
+endif()
+
+include_directories(../../imgui)
+add_definitions("-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")
+
+include_directories(../../)
+set(IMGUI_SOURCES 
+../../cimgui.cpp 
+../../imgui/imgui.cpp 
+../../imgui/imgui_draw.cpp 
+../../imgui/imgui_demo.cpp 
+../../imgui/imgui_widgets.cpp
+${TABLES_SOURCE} 
+)
+
+set(IMGUI_SOURCES_sdl)
+set(IMGUI_LIBRARIES )
+
+if (WIN32)
+    add_definitions("-DIMGUI_IMPL_API=extern \"C\" __declspec\(dllexport\)")
+else(WIN32)
+    add_definitions("-DIMGUI_IMPL_API=extern \"C\" ")
+endif(WIN32)
+
+add_compile_definitions("IMGUI_IMPL_OPENGL_LOADER_GL3W")
+
+# optional adding freetype
+option(IMGUI_FREETYPE "add Freetype2" OFF)
+
+if(IMGUI_FREETYPE)
+	FIND_PACKAGE(freetype REQUIRED PATHS ${FREETYPE_PATH})
+	list(APPEND IMGUI_LIBRARIES freetype)
+	list(APPEND IMGUI_SOURCES ../../imgui/misc/freetype/imgui_freetype.cpp)
+	add_definitions("-DCIMGUI_FREETYPE=1")
+endif(IMGUI_FREETYPE)
+
+# opengl3
+list(APPEND IMGUI_SOURCES ${BAKENDS_FOLDER}imgui_impl_opengl3.cpp)
+include_directories(../../imgui/examples/libs/gl3w)
+if(WIN32)
+       list(APPEND IMGUI_LIBRARIES opengl32)
+else(WIN32) # Unix
+       list(APPEND IMGUI_LIBRARIES GL)
+endif(WIN32)
+
+# GLFW
+list(APPEND IMGUI_SOURCES ${BAKENDS_FOLDER}imgui_impl_glfw.cpp)
+
+set(GLFW_VERSION 3.3.8)
+include(FetchContent)
+	FetchContent_Declare(
+    glfw
+    URL https://github.com/glfw/glfw/archive/refs/tags/${GLFW_VERSION}.tar.gz)
+
+FetchContent_GetProperties(glfw)
+if (NOT glfw_POPULATED)
+	set(FETCHCONTENT_QUIET NO)
+    FetchContent_Populate(glfw)
+	set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+	set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+	add_subdirectory(${glfw_SOURCE_DIR} ${glfw_BINARY_DIR})
+endif()
+
+
+# glfw/imgui gets confused if it is not statically built.
+IF (WIN32)
+  add_library(cimgui STATIC ${IMGUI_SOURCES})
+ELSE()
+  add_library(cimgui SHARED ${IMGUI_SOURCES})
+ENDIF()
+
+target_link_libraries(cimgui ${IMGUI_LIBRARIES} glfw)
+
+
+# using library
+include_directories(../../generator/output/)
+add_executable(${PROJECT_NAME} main.c)
+target_compile_definitions(${PROJECT_NAME} PUBLIC -DCIMGUI_USE_OPENGL3 -DCIMGUI_USE_GLFW)
+if (MINGW)
+	target_link_options(${PROJECT_NAME} PRIVATE "-mconsole")
+endif()
+target_link_libraries(${PROJECT_NAME} ${IMGUI_SDL_LIBRARY} cimgui)
+
+
--- a/backend_test/example_glfw_opengl3/main.c
+++ b/backend_test/example_glfw_opengl3/main.c
@@ -0,0 +1,169 @@
+#define CIMGUI_DEFINE_ENUMS_AND_STRUCTS
+#include "cimgui.h"
+#include "cimgui_impl.h"
+#include <GLFW/glfw3.h>
+#include <stdio.h>
+#ifdef _MSC_VER
+#include <windows.h>
+#endif
+#include <GL/gl.h>
+
+
+#ifdef IMGUI_HAS_IMSTR
+#define igBegin igBegin_Str
+#define igSliderFloat igSliderFloat_Str
+#define igCheckbox igCheckbox_Str
+#define igColorEdit3 igColorEdit3_Str
+#define igButton igButton_Str
+#endif
+
+GLFWwindow *window;
+
+int main(int argc, char *argv[])
+{
+
+  if (!glfwInit())
+    return -1;
+
+  // Decide GL+GLSL versions
+  glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE);
+  glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+  glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+  glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
+
+#if __APPLE__
+  // GL 3.2 Core + GLSL 150
+  const char *glsl_version = "#version 150";
+#else
+  // GL 3.2 + GLSL 130
+  const char *glsl_version = "#version 130";
+#endif
+
+  // just an extra window hint for resize
+  glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
+
+  window = glfwCreateWindow(1024, 768, "Hello World!", NULL, NULL);
+  if (!window) 
+  {
+    printf("Failed to create window! Terminating!\n");
+    glfwTerminate();
+    return -1;
+  }
+
+  glfwMakeContextCurrent(window);
+
+  // enable vsync
+  glfwSwapInterval(1);
+
+  // check opengl version sdl uses
+  printf("opengl version: %s\n", (char *)glGetString(GL_VERSION));
+
+  // setup imgui
+  igCreateContext(NULL);
+
+  // set docking
+  ImGuiIO *ioptr = igGetIO();
+  ioptr->ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;   // Enable Keyboard Controls
+  //ioptr->ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;  // Enable Gamepad Controls
+#ifdef IMGUI_HAS_DOCK
+  ioptr->ConfigFlags |= ImGuiConfigFlags_DockingEnable;       // Enable Docking
+  ioptr->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;     // Enable Multi-Viewport / Platform Windows
+#endif
+
+  ImGui_ImplGlfw_InitForOpenGL(window, true);
+  ImGui_ImplOpenGL3_Init(glsl_version);
+
+  igStyleColorsDark(NULL);
+  // ImFontAtlas_AddFontDefault(io.Fonts, NULL);
+
+  bool showDemoWindow = true;
+  bool showAnotherWindow = false;
+  ImVec4 clearColor;
+  clearColor.x = 0.45f;
+  clearColor.y = 0.55f;
+  clearColor.z = 0.60f;
+  clearColor.w = 1.00f;
+
+  // main event loop
+  bool quit = false;
+  while (!glfwWindowShouldClose(window))
+  {
+
+    glfwPollEvents();
+
+    // start imgui frame
+    ImGui_ImplOpenGL3_NewFrame();
+    ImGui_ImplGlfw_NewFrame();
+    igNewFrame();
+
+    if (showDemoWindow)
+      igShowDemoWindow(&showDemoWindow);
+
+    // show a simple window that we created ourselves.
+    {
+      static float f = 0.0f;
+      static int counter = 0;
+
+      igBegin("Hello, world!", NULL, 0);
+      igText("This is some useful text");
+      igCheckbox("Demo window", &showDemoWindow);
+      igCheckbox("Another window", &showAnotherWindow);
+
+      igSliderFloat("Float", &f, 0.0f, 1.0f, "%.3f", 0);
+      igColorEdit3("clear color", (float *)&clearColor, 0);
+
+      ImVec2 buttonSize;
+      buttonSize.x = 0;
+      buttonSize.y = 0;
+      if (igButton("Button", buttonSize))
+        counter++;
+      igSameLine(0.0f, -1.0f);
+      igText("counter = %d", counter);
+
+      igText("Application average %.3f ms/frame (%.1f FPS)",
+             1000.0f / igGetIO()->Framerate, igGetIO()->Framerate);
+      igEnd();
+    }
+
+    if (showAnotherWindow) 
+    {
+      igBegin("imgui Another Window", &showAnotherWindow, 0);
+      igText("Hello from imgui");
+      ImVec2 buttonSize;
+      buttonSize.x = 0;
+      buttonSize.y = 0;
+      if (igButton("Close me", buttonSize)) {
+        showAnotherWindow = false;
+      }
+      igEnd();
+    }
+
+    // render
+    igRender();
+    glfwMakeContextCurrent(window);
+    glViewport(0, 0, (int)ioptr->DisplaySize.x, (int)ioptr->DisplaySize.y);
+    glClearColor(clearColor.x, clearColor.y, clearColor.z, clearColor.w);
+    glClear(GL_COLOR_BUFFER_BIT);
+    ImGui_ImplOpenGL3_RenderDrawData(igGetDrawData());
+#ifdef IMGUI_HAS_DOCK
+    if (ioptr->ConfigFlags & ImGuiConfigFlags_ViewportsEnable) 
+    {
+      GLFWwindow *backup_current_window = glfwGetCurrentContext();
+      igUpdatePlatformWindows();
+      igRenderPlatformWindowsDefault(NULL, NULL);
+      glfwMakeContextCurrent(backup_current_window);
+    }
+#endif
+    glfwSwapBuffers(window);
+  }
+
+  // clean up
+  ImGui_ImplOpenGL3_Shutdown();
+  ImGui_ImplGlfw_Shutdown();
+  igDestroyContext(NULL);
+
+  glfwDestroyWindow(window);
+  glfwTerminate();
+
+  return 0;
+}
--- 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.89" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.89.1 WIP" 18910 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
-//docking branch
 #ifdef IMGUI_ENABLE_FREETYPE
 #ifndef CIMGUI_FREETYPE
 #error "IMGUI_FREETYPE should be defined for Freetype linking"
@@ -176,10 +175,6 @@ CIMGUI_API ImDrawList* igGetWindowDrawList()
 {
    return ImGui::GetWindowDrawList();
 }
-CIMGUI_API float igGetWindowDpiScale()
-{
-    return ImGui::GetWindowDpiScale();
-}
 CIMGUI_API void igGetWindowPos(ImVec2 *pOut)
 {
    *pOut = ImGui::GetWindowPos();
@@ -196,10 +191,6 @@ CIMGUI_API float igGetWindowHeight()
 {
    return ImGui::GetWindowHeight();
 }
-CIMGUI_API ImGuiViewport* igGetWindowViewport()
-{
-    return ImGui::GetWindowViewport();
-}
 CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot)
 {
    return ImGui::SetNextWindowPos(pos,cond,pivot);
@@ -232,10 +223,6 @@ CIMGUI_API void igSetNextWindowBgAlpha(float alpha)
 {
    return ImGui::SetNextWindowBgAlpha(alpha);
 }
-CIMGUI_API void igSetNextWindowViewport(ImGuiID viewport_id)
-{
-    return ImGui::SetNextWindowViewport(viewport_id);
-}
 CIMGUI_API void igSetWindowPos_Vec2(const ImVec2 pos,ImGuiCond cond)
 {
    return ImGui::SetWindowPos(pos,cond);
@@ -1237,30 +1224,6 @@ CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label)
 {
    return ImGui::SetTabItemClosed(tab_or_docked_window_label);
 }
-CIMGUI_API ImGuiID igDockSpace(ImGuiID id,const ImVec2 size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
-{
-    return ImGui::DockSpace(id,size,flags,window_class);
-}
-CIMGUI_API ImGuiID igDockSpaceOverViewport(const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
-{
-    return ImGui::DockSpaceOverViewport(viewport,flags,window_class);
-}
-CIMGUI_API void igSetNextWindowDockID(ImGuiID dock_id,ImGuiCond cond)
-{
-    return ImGui::SetNextWindowDockID(dock_id,cond);
-}
-CIMGUI_API void igSetNextWindowClass(const ImGuiWindowClass* window_class)
-{
-    return ImGui::SetNextWindowClass(window_class);
-}
-CIMGUI_API ImGuiID igGetWindowDockID()
-{
-    return ImGui::GetWindowDockID();
-}
-CIMGUI_API bool igIsWindowDocked()
-{
-    return ImGui::IsWindowDocked();
-}
 CIMGUI_API void igLogToTTY(int auto_open_depth)
 {
    return ImGui::LogToTTY(auto_open_depth);
@@ -1417,14 +1380,6 @@ CIMGUI_API ImDrawList* igGetForegroundDrawList_Nil()
 {
    return ImGui::GetForegroundDrawList();
 }
-CIMGUI_API ImDrawList* igGetBackgroundDrawList_ViewportPtr(ImGuiViewport* viewport)
-{
-    return ImGui::GetBackgroundDrawList(viewport);
-}
-CIMGUI_API ImDrawList* igGetForegroundDrawList_ViewportPtr(ImGuiViewport* viewport)
-{
-    return ImGui::GetForegroundDrawList(viewport);
-}
 CIMGUI_API bool igIsRectVisible_Nil(const ImVec2 size)
 {
    return ImGui::IsRectVisible(size);
@@ -1621,30 +1576,6 @@ CIMGUI_API void igMemFree(void* ptr)
 {
    return ImGui::MemFree(ptr);
 }
-CIMGUI_API ImGuiPlatformIO* igGetPlatformIO()
-{
-    return &ImGui::GetPlatformIO();
-}
-CIMGUI_API void igUpdatePlatformWindows()
-{
-    return ImGui::UpdatePlatformWindows();
-}
-CIMGUI_API void igRenderPlatformWindowsDefault(void* platform_render_arg,void* renderer_render_arg)
-{
-    return ImGui::RenderPlatformWindowsDefault(platform_render_arg,renderer_render_arg);
-}
-CIMGUI_API void igDestroyPlatformWindows()
-{
-    return ImGui::DestroyPlatformWindows();
-}
-CIMGUI_API ImGuiViewport* igFindViewportByID(ImGuiID id)
-{
-    return ImGui::FindViewportByID(id);
-}
-CIMGUI_API ImGuiViewport* igFindViewportByPlatformHandle(void* platform_handle)
-{
-    return ImGui::FindViewportByPlatformHandle(platform_handle);
-}
 CIMGUI_API ImGuiStyle* ImGuiStyle_ImGuiStyle(void)
 {
    return IM_NEW(ImGuiStyle)();
@@ -1677,10 +1608,6 @@ CIMGUI_API void ImGuiIO_AddMouseWheelEvent(ImGuiIO* self,float wh_x,float wh_y)
 {
    return self->AddMouseWheelEvent(wh_x,wh_y);
 }
-CIMGUI_API void ImGuiIO_AddMouseViewportEvent(ImGuiIO* self,ImGuiID id)
-{
-    return self->AddMouseViewportEvent(id);
-}
 CIMGUI_API void ImGuiIO_AddFocusEvent(ImGuiIO* self,bool focused)
 {
    return self->AddFocusEvent(focused);
@@ -1749,14 +1676,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)();
@@ -2613,22 +2532,6 @@ CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* self)
 {
    *pOut = self->GetWorkCenter();
 }
-CIMGUI_API ImGuiPlatformIO* ImGuiPlatformIO_ImGuiPlatformIO(void)
-{
-    return IM_NEW(ImGuiPlatformIO)();
-}
-CIMGUI_API void ImGuiPlatformIO_destroy(ImGuiPlatformIO* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API ImGuiPlatformMonitor* ImGuiPlatformMonitor_ImGuiPlatformMonitor(void)
-{
-    return IM_NEW(ImGuiPlatformMonitor)();
-}
-CIMGUI_API void ImGuiPlatformMonitor_destroy(ImGuiPlatformMonitor* self)
-{
-    IM_DELETE(self);
-}
 CIMGUI_API ImGuiPlatformImeData* ImGuiPlatformImeData_ImGuiPlatformImeData(void)
 {
    return IM_NEW(ImGuiPlatformImeData)();
@@ -3476,70 +3379,6 @@ CIMGUI_API void ImGuiOldColumns_destroy(ImGuiOldColumns* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API ImGuiDockNode* ImGuiDockNode_ImGuiDockNode(ImGuiID id)
-{
-    return IM_NEW(ImGuiDockNode)(id);
-}
-CIMGUI_API void ImGuiDockNode_destroy(ImGuiDockNode* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API bool ImGuiDockNode_IsRootNode(ImGuiDockNode* self)
-{
-    return self->IsRootNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsDockSpace(ImGuiDockNode* self)
-{
-    return self->IsDockSpace();
-}
-CIMGUI_API bool ImGuiDockNode_IsFloatingNode(ImGuiDockNode* self)
-{
-    return self->IsFloatingNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsCentralNode(ImGuiDockNode* self)
-{
-    return self->IsCentralNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsHiddenTabBar(ImGuiDockNode* self)
-{
-    return self->IsHiddenTabBar();
-}
-CIMGUI_API bool ImGuiDockNode_IsNoTabBar(ImGuiDockNode* self)
-{
-    return self->IsNoTabBar();
-}
-CIMGUI_API bool ImGuiDockNode_IsSplitNode(ImGuiDockNode* self)
-{
-    return self->IsSplitNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsLeafNode(ImGuiDockNode* self)
-{
-    return self->IsLeafNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsEmpty(ImGuiDockNode* self)
-{
-    return self->IsEmpty();
-}
-CIMGUI_API void ImGuiDockNode_Rect(ImRect *pOut,ImGuiDockNode* self)
-{
-    *pOut = self->Rect();
-}
-CIMGUI_API void ImGuiDockNode_SetLocalFlags(ImGuiDockNode* self,ImGuiDockNodeFlags flags)
-{
-    return self->SetLocalFlags(flags);
-}
-CIMGUI_API void ImGuiDockNode_UpdateMergedFlags(ImGuiDockNode* self)
-{
-    return self->UpdateMergedFlags();
-}
-CIMGUI_API ImGuiDockContext* ImGuiDockContext_ImGuiDockContext(void)
-{
-    return IM_NEW(ImGuiDockContext)();
-}
-CIMGUI_API void ImGuiDockContext_destroy(ImGuiDockContext* self)
-{
-    IM_DELETE(self);
-}
 CIMGUI_API ImGuiViewportP* ImGuiViewportP_ImGuiViewportP(void)
 {
    return IM_NEW(ImGuiViewportP)();
@@ -3548,10 +3387,6 @@ CIMGUI_API void ImGuiViewportP_destroy(ImGuiViewportP* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API void ImGuiViewportP_ClearRequestFlags(ImGuiViewportP* self)
-{
-    return self->ClearRequestFlags();
-}
 CIMGUI_API void ImGuiViewportP_CalcWorkRectPos(ImVec2 *pOut,ImGuiViewportP* self,const ImVec2 off_min)
 {
    *pOut = self->CalcWorkRectPos(off_min);
@@ -3784,9 +3619,9 @@ CIMGUI_API void igCalcWindowNextAutoFitSize(ImVec2 *pOut,ImGuiWindow* window)
 {
    *pOut = ImGui::CalcWindowNextAutoFitSize(window);
 }
-CIMGUI_API bool igIsWindowChildOf(ImGuiWindow* window,ImGuiWindow* potential_parent,bool popup_hierarchy,bool dock_hierarchy)
+CIMGUI_API bool igIsWindowChildOf(ImGuiWindow* window,ImGuiWindow* potential_parent,bool popup_hierarchy)
 {
-    return ImGui::IsWindowChildOf(window,potential_parent,popup_hierarchy,dock_hierarchy);
+    return ImGui::IsWindowChildOf(window,potential_parent,popup_hierarchy);
 }
 CIMGUI_API bool igIsWindowWithinBeginStackOf(ImGuiWindow* window,ImGuiWindow* potential_parent)
 {
@@ -3868,6 +3703,14 @@ CIMGUI_API ImDrawList* igGetForegroundDrawList_WindowPtr(ImGuiWindow* window)
 {
    return ImGui::GetForegroundDrawList(window);
 }
+CIMGUI_API ImDrawList* igGetBackgroundDrawList_ViewportPtr(ImGuiViewport* viewport)
+{
+    return ImGui::GetBackgroundDrawList(viewport);
+}
+CIMGUI_API ImDrawList* igGetForegroundDrawList_ViewportPtr(ImGuiViewport* viewport)
+{
+    return ImGui::GetForegroundDrawList(viewport);
+}
 CIMGUI_API void igInitialize()
 {
    return ImGui::Initialize();
@@ -3888,10 +3731,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();
@@ -3912,34 +3751,10 @@ CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType ty
 {
    return ImGui::CallContextHooks(context,type);
 }
-CIMGUI_API void igTranslateWindowsInViewport(ImGuiViewportP* viewport,const ImVec2 old_pos,const ImVec2 new_pos)
-{
-    return ImGui::TranslateWindowsInViewport(viewport,old_pos,new_pos);
-}
-CIMGUI_API void igScaleWindowsInViewport(ImGuiViewportP* viewport,float scale)
-{
-    return ImGui::ScaleWindowsInViewport(viewport,scale);
-}
-CIMGUI_API void igDestroyPlatformWindow(ImGuiViewportP* viewport)
-{
-    return ImGui::DestroyPlatformWindow(viewport);
-}
 CIMGUI_API void igSetWindowViewport(ImGuiWindow* window,ImGuiViewportP* viewport)
 {
    return ImGui::SetWindowViewport(window,viewport);
 }
-CIMGUI_API void igSetCurrentViewport(ImGuiWindow* window,ImGuiViewportP* viewport)
-{
-    return ImGui::SetCurrentViewport(window,viewport);
-}
-CIMGUI_API const ImGuiPlatformMonitor* igGetViewportPlatformMonitor(ImGuiViewport* viewport)
-{
-    return ImGui::GetViewportPlatformMonitor(viewport);
-}
-CIMGUI_API ImGuiViewportP* igFindHoveredViewportFromPlatformWindowStack(const ImVec2 mouse_platform_pos)
-{
-    return ImGui::FindHoveredViewportFromPlatformWindowStack(mouse_platform_pos);
-}
 CIMGUI_API void igMarkIniSettingsDirty_Nil()
 {
    return ImGui::MarkIniSettingsDirty();
@@ -3976,6 +3791,14 @@ CIMGUI_API ImGuiSettingsHandler* igFindSettingsHandler(const char* type_name)
 {
    return ImGui::FindSettingsHandler(type_name);
 }
+CIMGUI_API void igLocalizeRegisterEntries(const ImGuiLocEntry* entries,int count)
+{
+    return ImGui::LocalizeRegisterEntries(entries,count);
+}
+CIMGUI_API const char* igLocalizeGetMsg(ImGuiLocKey key)
+{
+    return ImGui::LocalizeGetMsg(key);
+}
 CIMGUI_API void igSetScrollX_WindowPtr(ImGuiWindow* window,float scroll_x)
 {
    return ImGui::SetScrollX(window,scroll_x);
@@ -4272,10 +4095,18 @@ CIMGUI_API bool igIsLegacyKey(ImGuiKey key)
 {
    return ImGui::IsLegacyKey(key);
 }
+CIMGUI_API bool igIsKeyboardKey(ImGuiKey key)
+{
+    return ImGui::IsKeyboardKey(key);
+}
 CIMGUI_API bool igIsGamepadKey(ImGuiKey key)
 {
    return ImGui::IsGamepadKey(key);
 }
+CIMGUI_API bool igIsMouseKey(ImGuiKey key)
+{
+    return ImGui::IsMouseKey(key);
+}
 CIMGUI_API bool igIsAliasKey(ImGuiKey key)
 {
    return ImGui::IsAliasKey(key);
@@ -4384,162 +4215,6 @@ CIMGUI_API ImGuiKeyRoutingData* igGetShortcutRoutingData(ImGuiKeyChord key_chord
 {
    return ImGui::GetShortcutRoutingData(key_chord);
 }
-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 void igDockContextEndFrame(ImGuiContext* ctx)
-{
-    return ImGui::DockContextEndFrame(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_window,ImGuiDockNode* payload_node,ImGuiDir split_dir,bool split_outer,ImVec2* out_pos)
-{
-    return ImGui::DockContextCalcDropPosForDocking(target,target_node,payload_window,payload_node,split_dir,split_outer,out_pos);
-}
-CIMGUI_API ImGuiDockNode* igDockContextFindNodeByID(ImGuiContext* ctx,ImGuiID id)
-{
-    return ImGui::DockContextFindNodeByID(ctx,id);
-}
-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 bool igDockNodeIsInHierarchyOf(ImGuiDockNode* node,ImGuiDockNode* parent)
-{
-    return ImGui::DockNodeIsInHierarchyOf(node,parent);
-}
-CIMGUI_API int igDockNodeGetDepth(const ImGuiDockNode* node)
-{
-    return ImGui::DockNodeGetDepth(node);
-}
-CIMGUI_API ImGuiID igDockNodeGetWindowMenuButtonId(const ImGuiDockNode* node)
-{
-    return ImGui::DockNodeGetWindowMenuButtonId(node);
-}
-CIMGUI_API ImGuiDockNode* igGetWindowDockNode()
-{
-    return ImGui::GetWindowDockNode();
-}
-CIMGUI_API bool igGetWindowAlwaysWantOwnTabBar(ImGuiWindow* window)
-{
-    return ImGui::GetWindowAlwaysWantOwnTabBar(window);
-}
-CIMGUI_API void igBeginDocked(ImGuiWindow* window,bool* p_open)
-{
-    return ImGui::BeginDocked(window,p_open);
-}
-CIMGUI_API void igBeginDockableDragDropSource(ImGuiWindow* window)
-{
-    return ImGui::BeginDockableDragDropSource(window);
-}
-CIMGUI_API void igBeginDockableDragDropTarget(ImGuiWindow* window)
-{
-    return ImGui::BeginDockableDragDropTarget(window);
-}
-CIMGUI_API void igSetWindowDock(ImGuiWindow* window,ImGuiID dock_id,ImGuiCond cond)
-{
-    return ImGui::SetWindowDock(window,dock_id,cond);
-}
-CIMGUI_API void igDockBuilderDockWindow(const char* window_name,ImGuiID node_id)
-{
-    return ImGui::DockBuilderDockWindow(window_name,node_id);
-}
-CIMGUI_API ImGuiDockNode* igDockBuilderGetNode(ImGuiID node_id)
-{
-    return ImGui::DockBuilderGetNode(node_id);
-}
-CIMGUI_API ImGuiDockNode* igDockBuilderGetCentralNode(ImGuiID node_id)
-{
-    return ImGui::DockBuilderGetCentralNode(node_id);
-}
-CIMGUI_API ImGuiID igDockBuilderAddNode(ImGuiID node_id,ImGuiDockNodeFlags flags)
-{
-    return ImGui::DockBuilderAddNode(node_id,flags);
-}
-CIMGUI_API void igDockBuilderRemoveNode(ImGuiID node_id)
-{
-    return ImGui::DockBuilderRemoveNode(node_id);
-}
-CIMGUI_API void igDockBuilderRemoveNodeDockedWindows(ImGuiID node_id,bool clear_settings_refs)
-{
-    return ImGui::DockBuilderRemoveNodeDockedWindows(node_id,clear_settings_refs);
-}
-CIMGUI_API void igDockBuilderRemoveNodeChildNodes(ImGuiID node_id)
-{
-    return ImGui::DockBuilderRemoveNodeChildNodes(node_id);
-}
-CIMGUI_API void igDockBuilderSetNodePos(ImGuiID node_id,ImVec2 pos)
-{
-    return ImGui::DockBuilderSetNodePos(node_id,pos);
-}
-CIMGUI_API void igDockBuilderSetNodeSize(ImGuiID node_id,ImVec2 size)
-{
-    return ImGui::DockBuilderSetNodeSize(node_id,size);
-}
-CIMGUI_API ImGuiID igDockBuilderSplitNode(ImGuiID node_id,ImGuiDir split_dir,float size_ratio_for_node_at_dir,ImGuiID* out_id_at_dir,ImGuiID* out_id_at_opposite_dir)
-{
-    return ImGui::DockBuilderSplitNode(node_id,split_dir,size_ratio_for_node_at_dir,out_id_at_dir,out_id_at_opposite_dir);
-}
-CIMGUI_API void igDockBuilderCopyDockSpace(ImGuiID src_dockspace_id,ImGuiID dst_dockspace_id,ImVector_const_charPtr* in_window_remap_pairs)
-{
-    return ImGui::DockBuilderCopyDockSpace(src_dockspace_id,dst_dockspace_id,in_window_remap_pairs);
-}
-CIMGUI_API void igDockBuilderCopyNode(ImGuiID src_node_id,ImGuiID dst_node_id,ImVector_ImGuiID* out_node_remap_pairs)
-{
-    return ImGui::DockBuilderCopyNode(src_node_id,dst_node_id,out_node_remap_pairs);
-}
-CIMGUI_API void igDockBuilderCopyWindowSettings(const char* src_name,const char* dst_name)
-{
-    return ImGui::DockBuilderCopyWindowSettings(src_name,dst_name);
-}
-CIMGUI_API void igDockBuilderFinish(ImGuiID node_id)
-{
-    return ImGui::DockBuilderFinish(node_id);
-}
 CIMGUI_API void igPushFocusScope(ImGuiID id)
 {
    return ImGui::PushFocusScope(id);
@@ -4800,22 +4475,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);
@@ -4836,18 +4503,14 @@ 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_Str(ImVec2 *pOut,const char* label,bool has_close_button_or_unsaved_marker)
+CIMGUI_API void igTabItemCalcSize(ImVec2 *pOut,const char* label,bool has_close_button_or_unsaved_marker)
 {
    *pOut = ImGui::TabItemCalcSize(label,has_close_button_or_unsaved_marker);
 }
-CIMGUI_API void igTabItemCalcSize_WindowPtr(ImVec2 *pOut,ImGuiWindow* window)
-{
-    *pOut = ImGui::TabItemCalcSize(window);
-}
 CIMGUI_API void igTabItemBackground(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImU32 col)
 {
    return ImGui::TabItemBackground(draw_list,bb,flags,col);
@@ -4916,10 +4579,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);
@@ -4928,10 +4587,6 @@ CIMGUI_API void igRenderRectFilledWithHole(ImDrawList* draw_list,const ImRect ou
 {
    return ImGui::RenderRectFilledWithHole(draw_list,outer,inner,col,rounding);
 }
-CIMGUI_API ImDrawFlags igCalcRoundingFlagsForRectInRect(const ImRect r_in,const ImRect r_outer,float threshold)
-{
-    return ImGui::CalcRoundingFlagsForRectInRect(r_in,r_outer,threshold);
-}
 CIMGUI_API void igTextEx(const char* text,const char* text_end,ImGuiTextFlags flags)
 {
    return ImGui::TextEx(text,text_end,flags);
@@ -4944,9 +4599,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)
 {
@@ -5004,9 +4659,9 @@ CIMGUI_API bool igSliderBehavior(const ImRect bb,ImGuiID id,ImGuiDataType data_t
 {
    return ImGui::SliderBehavior(bb,id,data_type,p_v,p_min,p_max,format,flags,out_grab_bb);
 }
-CIMGUI_API bool igSplitterBehavior(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* size1,float* size2,float min_size1,float min_size2,float hover_extend,float hover_visibility_delay,ImU32 bg_col)
+CIMGUI_API bool igSplitterBehavior(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* size1,float* size2,float min_size1,float min_size2,float hover_extend,float hover_visibility_delay)
 {
-    return ImGui::SplitterBehavior(bb,id,axis,size1,size2,min_size1,min_size2,hover_extend,hover_visibility_delay,bg_col);
+    return ImGui::SplitterBehavior(bb,id,axis,size1,size2,min_size1,min_size2,hover_extend,hover_visibility_delay);
 }
 CIMGUI_API bool igTreeNodeBehavior(ImGuiID id,ImGuiTreeNodeFlags flags,const char* label,const char* label_end)
 {
@@ -5159,13 +4814,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)
 {
--- a/cimgui.h
+++ b/cimgui.h
@@ -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.89" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.89.1 WIP" 18910 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
-//docking branch
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
 #include <stdio.h>
@@ -62,8 +61,6 @@ typedef struct ImGuiKeyData ImGuiKeyData;
 typedef struct ImGuiListClipper ImGuiListClipper;
 typedef struct ImGuiOnceUponAFrame ImGuiOnceUponAFrame;
 typedef struct ImGuiPayload ImGuiPayload;
-typedef struct ImGuiPlatformIO ImGuiPlatformIO;
-typedef struct ImGuiPlatformMonitor ImGuiPlatformMonitor;
 typedef struct ImGuiPlatformImeData ImGuiPlatformImeData;
 typedef struct ImGuiSizeCallbackData ImGuiSizeCallbackData;
 typedef struct ImGuiStorage ImGuiStorage;
@@ -73,20 +70,16 @@ typedef struct ImGuiTableColumnSortSpecs ImGuiTableColumnSortSpecs;
 typedef struct ImGuiTextBuffer ImGuiTextBuffer;
 typedef struct ImGuiTextFilter ImGuiTextFilter;
 typedef struct ImGuiViewport ImGuiViewport;
-typedef struct ImGuiWindowClass ImGuiWindowClass;
 typedef struct ImBitVector ImBitVector;
 typedef struct ImRect ImRect;
 typedef struct ImDrawDataBuilder ImDrawDataBuilder;
 typedef struct ImGuiColorMod ImGuiColorMod;
 typedef struct ImGuiContextHook ImGuiContextHook;
 typedef struct ImGuiDataTypeInfo ImGuiDataTypeInfo;
-typedef struct ImGuiDockContext ImGuiDockContext;
-typedef struct ImGuiDockRequest ImGuiDockRequest;
-typedef struct ImGuiDockNode ImGuiDockNode;
-typedef struct ImGuiDockNodeSettings ImGuiDockNodeSettings;
 typedef struct ImGuiGroupData ImGuiGroupData;
 typedef struct ImGuiInputTextState ImGuiInputTextState;
 typedef struct ImGuiLastItemData ImGuiLastItemData;
+typedef struct ImGuiLocEntry ImGuiLocEntry;
 typedef struct ImGuiMenuColumns ImGuiMenuColumns;
 typedef struct ImGuiNavItemData ImGuiNavItemData;
 typedef struct ImGuiMetricsConfig ImGuiMetricsConfig;
@@ -109,8 +102,6 @@ typedef struct ImGuiTableColumnsSettings ImGuiTableColumnsSettings;
 typedef struct ImGuiWindow ImGuiWindow;
 typedef struct ImGuiWindowTempData ImGuiWindowTempData;
 typedef struct ImGuiWindowSettings ImGuiWindowSettings;
-typedef struct ImVector_const_charPtr {int Size;int Capacity;const char** Data;} ImVector_const_charPtr;
-
 struct ImDrawChannel;
 struct ImDrawCmd;
 struct ImDrawData;
@@ -132,8 +123,6 @@ struct ImGuiKeyData;
 struct ImGuiListClipper;
 struct ImGuiOnceUponAFrame;
 struct ImGuiPayload;
-struct ImGuiPlatformIO;
-struct ImGuiPlatformMonitor;
 struct ImGuiPlatformImeData;
 struct ImGuiSizeCallbackData;
 struct ImGuiStorage;
@@ -143,7 +132,6 @@ struct ImGuiTableColumnSortSpecs;
 struct ImGuiTextBuffer;
 struct ImGuiTextFilter;
 struct ImGuiViewport;
-struct ImGuiWindowClass;
 typedef int ImGuiCol;
 typedef int ImGuiCond;
 typedef int ImGuiDataType;
@@ -161,7 +149,6 @@ typedef int ImGuiButtonFlags;
 typedef int ImGuiColorEditFlags;
 typedef int ImGuiConfigFlags;
 typedef int ImGuiComboFlags;
-typedef int ImGuiDockNodeFlags;
 typedef int ImGuiDragDropFlags;
 typedef int ImGuiFocusedFlags;
 typedef int ImGuiHoveredFlags;
@@ -228,7 +215,6 @@ typedef enum {
    ImGuiWindowFlags_NoNavInputs = 1 << 18,
    ImGuiWindowFlags_NoNavFocus = 1 << 19,
    ImGuiWindowFlags_UnsavedDocument = 1 << 20,
-    ImGuiWindowFlags_NoDocking = 1 << 21,
    ImGuiWindowFlags_NoNav = ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
    ImGuiWindowFlags_NoDecoration = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse,
    ImGuiWindowFlags_NoInputs = ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
@@ -238,7 +224,6 @@ typedef enum {
    ImGuiWindowFlags_Popup = 1 << 26,
    ImGuiWindowFlags_Modal = 1 << 27,
    ImGuiWindowFlags_ChildMenu = 1 << 28,
-    ImGuiWindowFlags_DockNodeHost = 1 << 29,
 }ImGuiWindowFlags_;
 typedef enum {
    ImGuiInputTextFlags_None = 0,
@@ -421,7 +406,6 @@ typedef enum {
    ImGuiFocusedFlags_RootWindow = 1 << 1,
    ImGuiFocusedFlags_AnyWindow = 1 << 2,
    ImGuiFocusedFlags_NoPopupHierarchy = 1 << 3,
-    ImGuiFocusedFlags_DockHierarchy = 1 << 4,
    ImGuiFocusedFlags_RootAndChildWindows = ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows,
 }ImGuiFocusedFlags_;
 typedef enum {
@@ -430,7 +414,6 @@ typedef enum {
    ImGuiHoveredFlags_RootWindow = 1 << 1,
    ImGuiHoveredFlags_AnyWindow = 1 << 2,
    ImGuiHoveredFlags_NoPopupHierarchy = 1 << 3,
-    ImGuiHoveredFlags_DockHierarchy = 1 << 4,
    ImGuiHoveredFlags_AllowWhenBlockedByPopup = 1 << 5,
    ImGuiHoveredFlags_AllowWhenBlockedByActiveItem = 1 << 7,
    ImGuiHoveredFlags_AllowWhenOverlapped = 1 << 8,
@@ -442,15 +425,6 @@ typedef enum {
    ImGuiHoveredFlags_DelayShort = 1 << 12,
    ImGuiHoveredFlags_NoSharedDelay = 1 << 13,
 }ImGuiHoveredFlags_;
-typedef enum {
-    ImGuiDockNodeFlags_None = 0,
-    ImGuiDockNodeFlags_KeepAliveOnly = 1 << 0,
-    ImGuiDockNodeFlags_NoDockingInCentralNode = 1 << 2,
-    ImGuiDockNodeFlags_PassthruCentralNode = 1 << 3,
-    ImGuiDockNodeFlags_NoSplit = 1 << 4,
-    ImGuiDockNodeFlags_NoResize = 1 << 5,
-    ImGuiDockNodeFlags_AutoHideTabBar = 1 << 6,
-}ImGuiDockNodeFlags_;
 typedef enum {
    ImGuiDragDropFlags_None = 0,
    ImGuiDragDropFlags_SourceNoPreviewTooltip = 1 << 0,
@@ -659,10 +633,6 @@ typedef enum {
    ImGuiConfigFlags_NavNoCaptureKeyboard = 1 << 3,
    ImGuiConfigFlags_NoMouse = 1 << 4,
    ImGuiConfigFlags_NoMouseCursorChange = 1 << 5,
-    ImGuiConfigFlags_DockingEnable = 1 << 6,
-    ImGuiConfigFlags_ViewportsEnable = 1 << 10,
-    ImGuiConfigFlags_DpiEnableScaleViewports= 1 << 14,
-    ImGuiConfigFlags_DpiEnableScaleFonts = 1 << 15,
    ImGuiConfigFlags_IsSRGB = 1 << 20,
    ImGuiConfigFlags_IsTouchScreen = 1 << 21,
 }ImGuiConfigFlags_;
@@ -672,9 +642,6 @@ typedef enum {
    ImGuiBackendFlags_HasMouseCursors = 1 << 1,
    ImGuiBackendFlags_HasSetMousePos = 1 << 2,
    ImGuiBackendFlags_RendererHasVtxOffset = 1 << 3,
-    ImGuiBackendFlags_PlatformHasViewports = 1 << 10,
-    ImGuiBackendFlags_HasMouseHoveredViewport=1 << 11,
-    ImGuiBackendFlags_RendererHasViewports = 1 << 12,
 }ImGuiBackendFlags_;
 typedef enum {
    ImGuiCol_Text,
@@ -715,8 +682,6 @@ typedef enum {
    ImGuiCol_TabActive,
    ImGuiCol_TabUnfocused,
    ImGuiCol_TabUnfocusedActive,
-    ImGuiCol_DockingPreview,
-    ImGuiCol_DockingEmptyBg,
    ImGuiCol_PlotLines,
    ImGuiCol_PlotLinesHovered,
    ImGuiCol_PlotHistogram,
@@ -910,14 +875,6 @@ struct ImGuiIO
    bool FontAllowUserScaling;
    ImFont* FontDefault;
    ImVec2 DisplayFramebufferScale;
-    bool ConfigDockingNoSplit;
-    bool ConfigDockingWithShift;
-    bool ConfigDockingAlwaysTabBar;
-    bool ConfigDockingTransparentPayload;
-    bool ConfigViewportsNoAutoMerge;
-    bool ConfigViewportsNoTaskBarIcon;
-    bool ConfigViewportsNoDecoration;
-    bool ConfigViewportsNoDefaultParent;
    bool MouseDrawCursor;
    bool ConfigMacOSXBehaviors;
    bool ConfigInputTrickleEventQueue;
@@ -958,7 +915,6 @@ struct ImGuiIO
    bool MouseDown[5];
    float MouseWheel;
    float MouseWheelH;
-    ImGuiID MouseHoveredViewport;
    bool KeyCtrl;
    bool KeyShift;
    bool KeyAlt;
@@ -978,7 +934,6 @@ struct ImGuiIO
    bool MouseDownOwnedUnlessPopupClose[5];
    float MouseDownDuration[5];
    float MouseDownDurationPrev[5];
-    ImVec2 MouseDragMaxDistanceAbs[5];
    float MouseDragMaxDistanceSqr[5];
    float PenPressure;
    bool AppFocusLost;
@@ -1010,17 +965,6 @@ struct ImGuiSizeCallbackData
    ImVec2 CurrentSize;
    ImVec2 DesiredSize;
 };
-struct ImGuiWindowClass
-{
-    ImGuiID ClassId;
-    ImGuiID ParentViewportId;
-    ImGuiViewportFlags ViewportFlagsOverrideSet;
-    ImGuiViewportFlags ViewportFlagsOverrideClear;
-    ImGuiTabItemFlags TabItemFlagsOverrideSet;
-    ImGuiDockNodeFlags DockNodeFlagsOverrideSet;
-    bool DockingAlwaysTabBar;
-    bool DockingAllowUnclassed;
-};
 struct ImGuiPayload
 {
    void* Data;
@@ -1198,7 +1142,6 @@ struct ImDrawData
    ImVec2 DisplayPos;
    ImVec2 DisplaySize;
    ImVec2 FramebufferScale;
-    ImGuiViewport* OwnerViewport;
 };
 struct ImFontConfig
 {
@@ -1312,73 +1255,15 @@ typedef enum {
    ImGuiViewportFlags_IsPlatformWindow = 1 << 0,
    ImGuiViewportFlags_IsPlatformMonitor = 1 << 1,
    ImGuiViewportFlags_OwnedByApp = 1 << 2,
-    ImGuiViewportFlags_NoDecoration = 1 << 3,
-    ImGuiViewportFlags_NoTaskBarIcon = 1 << 4,
-    ImGuiViewportFlags_NoFocusOnAppearing = 1 << 5,
-    ImGuiViewportFlags_NoFocusOnClick = 1 << 6,
-    ImGuiViewportFlags_NoInputs = 1 << 7,
-    ImGuiViewportFlags_NoRendererClear = 1 << 8,
-    ImGuiViewportFlags_TopMost = 1 << 9,
-    ImGuiViewportFlags_Minimized = 1 << 10,
-    ImGuiViewportFlags_NoAutoMerge = 1 << 11,
-    ImGuiViewportFlags_CanHostOtherWindows = 1 << 12,
 }ImGuiViewportFlags_;
 struct ImGuiViewport
 {
-    ImGuiID ID;
    ImGuiViewportFlags Flags;
    ImVec2 Pos;
    ImVec2 Size;
    ImVec2 WorkPos;
    ImVec2 WorkSize;
-    float DpiScale;
-    ImGuiID ParentViewportId;
-    ImDrawData* DrawData;
-    void* RendererUserData;
-    void* PlatformUserData;
-    void* PlatformHandle;
    void* PlatformHandleRaw;
-    bool PlatformRequestMove;
-    bool PlatformRequestResize;
-    bool PlatformRequestClose;
-};
-typedef struct ImVector_ImGuiPlatformMonitor {int Size;int Capacity;ImGuiPlatformMonitor* Data;} ImVector_ImGuiPlatformMonitor;
-
-typedef struct ImVector_ImGuiViewportPtr {int Size;int Capacity;ImGuiViewport** Data;} ImVector_ImGuiViewportPtr;
-
-struct ImGuiPlatformIO
-{
-    void (*Platform_CreateWindow)(ImGuiViewport* vp);
-    void (*Platform_DestroyWindow)(ImGuiViewport* vp);
-    void (*Platform_ShowWindow)(ImGuiViewport* vp);
-    void (*Platform_SetWindowPos)(ImGuiViewport* vp, ImVec2 pos);
-    ImVec2 (*Platform_GetWindowPos)(ImGuiViewport* vp);
-    void (*Platform_SetWindowSize)(ImGuiViewport* vp, ImVec2 size);
-    ImVec2 (*Platform_GetWindowSize)(ImGuiViewport* vp);
-    void (*Platform_SetWindowFocus)(ImGuiViewport* vp);
-    bool (*Platform_GetWindowFocus)(ImGuiViewport* vp);
-    bool (*Platform_GetWindowMinimized)(ImGuiViewport* vp);
-    void (*Platform_SetWindowTitle)(ImGuiViewport* vp, const char* str);
-    void (*Platform_SetWindowAlpha)(ImGuiViewport* vp, float alpha);
-    void (*Platform_UpdateWindow)(ImGuiViewport* vp);
-    void (*Platform_RenderWindow)(ImGuiViewport* vp, void* render_arg);
-    void (*Platform_SwapBuffers)(ImGuiViewport* vp, void* render_arg);
-    float (*Platform_GetWindowDpiScale)(ImGuiViewport* vp);
-    void (*Platform_OnChangedViewport)(ImGuiViewport* vp);
-    int (*Platform_CreateVkSurface)(ImGuiViewport* vp, ImU64 vk_inst, const void* vk_allocators, ImU64* out_vk_surface);
-    void (*Renderer_CreateWindow)(ImGuiViewport* vp);
-    void (*Renderer_DestroyWindow)(ImGuiViewport* vp);
-    void (*Renderer_SetWindowSize)(ImGuiViewport* vp, ImVec2 size);
-    void (*Renderer_RenderWindow)(ImGuiViewport* vp, void* render_arg);
-    void (*Renderer_SwapBuffers)(ImGuiViewport* vp, void* render_arg);
-    ImVector_ImGuiPlatformMonitor Monitors;
-    ImVector_ImGuiViewportPtr Viewports;
-};
-struct ImGuiPlatformMonitor
-{
-    ImVec2 MainPos, MainSize;
-    ImVec2 WorkPos, WorkSize;
-    float DpiScale;
 };
 struct ImGuiPlatformImeData
 {
@@ -1394,13 +1279,10 @@ struct ImGuiColorMod;
 struct ImGuiContext;
 struct ImGuiContextHook;
 struct ImGuiDataTypeInfo;
-struct ImGuiDockContext;
-struct ImGuiDockRequest;
-struct ImGuiDockNode;
-struct ImGuiDockNodeSettings;
 struct ImGuiGroupData;
 struct ImGuiInputTextState;
 struct ImGuiLastItemData;
+struct ImGuiLocEntry;
 struct ImGuiMenuColumns;
 struct ImGuiNavItemData;
 struct ImGuiMetricsConfig;
@@ -1423,7 +1305,6 @@ struct ImGuiTableColumnsSettings;
 struct ImGuiWindow;
 struct ImGuiWindowTempData;
 struct ImGuiWindowSettings;
-typedef int ImGuiDataAuthority;
 typedef int ImGuiLayoutType;
 typedef int ImGuiActivateFlags;
 typedef int ImGuiDebugLogFlags;
@@ -1743,9 +1624,6 @@ typedef enum {
    ImGuiNextWindowDataFlags_HasFocus = 1 << 5,
    ImGuiNextWindowDataFlags_HasBgAlpha = 1 << 6,
    ImGuiNextWindowDataFlags_HasScroll = 1 << 7,
-    ImGuiNextWindowDataFlags_HasViewport = 1 << 8,
-    ImGuiNextWindowDataFlags_HasDock = 1 << 9,
-    ImGuiNextWindowDataFlags_HasWindowClass = 1 << 10,
 }ImGuiNextWindowDataFlags_;
 struct ImGuiNextWindowData
 {
@@ -1753,21 +1631,16 @@ struct ImGuiNextWindowData
    ImGuiCond PosCond;
    ImGuiCond SizeCond;
    ImGuiCond CollapsedCond;
-    ImGuiCond DockCond;
    ImVec2 PosVal;
    ImVec2 PosPivotVal;
    ImVec2 SizeVal;
    ImVec2 ContentSizeVal;
    ImVec2 ScrollVal;
-    bool PosUndock;
    bool CollapsedVal;
    ImRect SizeConstraintRect;
    ImGuiSizeCallback SizeCallback;
    void* SizeCallbackUserData;
    float BgAlphaVal;
-    ImGuiID ViewportId;
-    ImGuiID DockId;
-    ImGuiWindowClass WindowClass;
    ImVec2 MenuBarOffsetMinVal;
 };
 typedef enum {
@@ -1832,7 +1705,6 @@ typedef enum {
    ImGuiInputEventType_MousePos,
    ImGuiInputEventType_MouseWheel,
    ImGuiInputEventType_MouseButton,
-    ImGuiInputEventType_MouseViewport,
    ImGuiInputEventType_Key,
    ImGuiInputEventType_Text,
    ImGuiInputEventType_Focus,
@@ -1859,10 +1731,6 @@ typedef struct ImGuiInputEventMouseButton ImGuiInputEventMouseButton;
 struct ImGuiInputEventMouseButton
 { int Button; bool Down;
 };
-typedef struct ImGuiInputEventMouseViewport ImGuiInputEventMouseViewport;
-struct ImGuiInputEventMouseViewport
-{ ImGuiID HoveredViewportID;
-};
 typedef struct ImGuiInputEventKey ImGuiInputEventKey;
 struct ImGuiInputEventKey
 { ImGuiKey Key; bool Down; float AnalogValue;
@@ -1885,7 +1753,6 @@ struct ImGuiInputEvent
        ImGuiInputEventMousePos MousePos;
        ImGuiInputEventMouseWheel MouseWheel;
        ImGuiInputEventMouseButton MouseButton;
-        ImGuiInputEventMouseViewport MouseViewport;
        ImGuiInputEventKey Key;
        ImGuiInputEventText Text;
        ImGuiInputEventAppFocused AppFocused;
@@ -2057,130 +1924,14 @@ struct ImGuiOldColumns
    ImVector_ImGuiOldColumnData Columns;
    ImDrawListSplitter Splitter;
 };
-typedef enum {
-    ImGuiDockNodeFlags_DockSpace = 1 << 10,
-    ImGuiDockNodeFlags_CentralNode = 1 << 11,
-    ImGuiDockNodeFlags_NoTabBar = 1 << 12,
-    ImGuiDockNodeFlags_HiddenTabBar = 1 << 13,
-    ImGuiDockNodeFlags_NoWindowMenuButton = 1 << 14,
-    ImGuiDockNodeFlags_NoCloseButton = 1 << 15,
-    ImGuiDockNodeFlags_NoDocking = 1 << 16,
-    ImGuiDockNodeFlags_NoDockingSplitMe = 1 << 17,
-    ImGuiDockNodeFlags_NoDockingSplitOther = 1 << 18,
-    ImGuiDockNodeFlags_NoDockingOverMe = 1 << 19,
-    ImGuiDockNodeFlags_NoDockingOverOther = 1 << 20,
-    ImGuiDockNodeFlags_NoDockingOverEmpty = 1 << 21,
-    ImGuiDockNodeFlags_NoResizeX = 1 << 22,
-    ImGuiDockNodeFlags_NoResizeY = 1 << 23,
-    ImGuiDockNodeFlags_SharedFlagsInheritMask_ = ~0,
-    ImGuiDockNodeFlags_NoResizeFlagsMask_ = ImGuiDockNodeFlags_NoResize | ImGuiDockNodeFlags_NoResizeX | ImGuiDockNodeFlags_NoResizeY,
-    ImGuiDockNodeFlags_LocalFlagsMask_ = ImGuiDockNodeFlags_NoSplit | ImGuiDockNodeFlags_NoResizeFlagsMask_ | ImGuiDockNodeFlags_AutoHideTabBar | ImGuiDockNodeFlags_DockSpace | ImGuiDockNodeFlags_CentralNode | ImGuiDockNodeFlags_NoTabBar | ImGuiDockNodeFlags_HiddenTabBar | ImGuiDockNodeFlags_NoWindowMenuButton | ImGuiDockNodeFlags_NoCloseButton | ImGuiDockNodeFlags_NoDocking,
-    ImGuiDockNodeFlags_LocalFlagsTransferMask_ = ImGuiDockNodeFlags_LocalFlagsMask_ & ~ImGuiDockNodeFlags_DockSpace,
-    ImGuiDockNodeFlags_SavedFlagsMask_ = ImGuiDockNodeFlags_NoResizeFlagsMask_ | ImGuiDockNodeFlags_DockSpace | ImGuiDockNodeFlags_CentralNode | ImGuiDockNodeFlags_NoTabBar | ImGuiDockNodeFlags_HiddenTabBar | ImGuiDockNodeFlags_NoWindowMenuButton | ImGuiDockNodeFlags_NoCloseButton | ImGuiDockNodeFlags_NoDocking
-}ImGuiDockNodeFlagsPrivate_;
-typedef enum {
-    ImGuiDataAuthority_Auto,
-    ImGuiDataAuthority_DockNode,
-    ImGuiDataAuthority_Window,
-}ImGuiDataAuthority_;
-typedef enum {
-    ImGuiDockNodeState_Unknown,
-    ImGuiDockNodeState_HostWindowHiddenBecauseSingleWindow,
-    ImGuiDockNodeState_HostWindowHiddenBecauseWindowsAreResizing,
-    ImGuiDockNodeState_HostWindowVisible,
-}ImGuiDockNodeState;
-typedef struct ImVector_ImGuiWindowPtr {int Size;int Capacity;ImGuiWindow** Data;} ImVector_ImGuiWindowPtr;
-
-struct ImGuiDockNode
-{
-    ImGuiID ID;
-    ImGuiDockNodeFlags SharedFlags;
-    ImGuiDockNodeFlags LocalFlags;
-    ImGuiDockNodeFlags LocalFlagsInWindows;
-    ImGuiDockNodeFlags MergedFlags;
-    ImGuiDockNodeState State;
-    ImGuiDockNode* ParentNode;
-    ImGuiDockNode* ChildNodes[2];
-    ImVector_ImGuiWindowPtr Windows;
-    ImGuiTabBar* TabBar;
-    ImVec2 Pos;
-    ImVec2 Size;
-    ImVec2 SizeRef;
-    ImGuiAxis SplitAxis;
-    ImGuiWindowClass WindowClass;
-    ImU32 LastBgColor;
-    ImGuiWindow* HostWindow;
-    ImGuiWindow* VisibleWindow;
-    ImGuiDockNode* CentralNode;
-    ImGuiDockNode* OnlyNodeWithWindows;
-    int CountNodeWithWindows;
-    int LastFrameAlive;
-    int LastFrameActive;
-    int LastFrameFocused;
-    ImGuiID LastFocusedNodeId;
-    ImGuiID SelectedTabId;
-    ImGuiID WantCloseTabId;
-    ImGuiDataAuthority AuthorityForPos :3;
-    ImGuiDataAuthority AuthorityForSize :3;
-    ImGuiDataAuthority AuthorityForViewport :3;
-    bool IsVisible :1;
-    bool IsFocused :1;
-    bool IsBgDrawnThisFrame :1;
-    bool HasCloseButton :1;
-    bool HasWindowMenuButton :1;
-    bool HasCentralNodeChild :1;
-    bool WantCloseAll :1;
-    bool WantLockSizeOnce :1;
-    bool WantMouseMove :1;
-    bool WantHiddenTabBarUpdate :1;
-    bool WantHiddenTabBarToggle :1;
-};
-typedef enum {
-    ImGuiWindowDockStyleCol_Text,
-    ImGuiWindowDockStyleCol_Tab,
-    ImGuiWindowDockStyleCol_TabHovered,
-    ImGuiWindowDockStyleCol_TabActive,
-    ImGuiWindowDockStyleCol_TabUnfocused,
-    ImGuiWindowDockStyleCol_TabUnfocusedActive,
-    ImGuiWindowDockStyleCol_COUNT
-}ImGuiWindowDockStyleCol;
-typedef struct ImGuiWindowDockStyle ImGuiWindowDockStyle;
-struct ImGuiWindowDockStyle
-{
-    ImU32 Colors[ImGuiWindowDockStyleCol_COUNT];
-};
-typedef struct ImVector_ImGuiDockRequest {int Size;int Capacity;ImGuiDockRequest* Data;} ImVector_ImGuiDockRequest;
-
-typedef struct ImVector_ImGuiDockNodeSettings {int Size;int Capacity;ImGuiDockNodeSettings* Data;} ImVector_ImGuiDockNodeSettings;
-
-struct ImGuiDockContext
-{
-    ImGuiStorage Nodes;
-    ImVector_ImGuiDockRequest Requests;
-    ImVector_ImGuiDockNodeSettings NodesSettings;
-    bool WantFullRebuild;
-};
 typedef struct ImGuiViewportP ImGuiViewportP;
 struct ImGuiViewportP
 {
    ImGuiViewport _ImGuiViewport;
-    int Idx;
-    int LastFrameActive;
-    int LastFrontMostStampCount;
-    ImGuiID LastNameHash;
-    ImVec2 LastPos;
-    float Alpha;
-    float LastAlpha;
-    short PlatformMonitor;
-    bool PlatformWindowCreated;
-    ImGuiWindow* Window;
    int DrawListsLastFrame[2];
    ImDrawList* DrawLists[2];
    ImDrawData DrawDataP;
    ImDrawDataBuilder DrawDataBuilder;
-    ImVec2 LastPlatformPos;
-    ImVec2 LastPlatformSize;
-    ImVec2 LastRendererSize;
    ImVec2 WorkOffsetMin;
    ImVec2 WorkOffsetMax;
    ImVec2 BuildWorkOffsetMin;
@@ -2191,11 +1942,6 @@ struct ImGuiWindowSettings
    ImGuiID ID;
    ImVec2ih Pos;
    ImVec2ih Size;
-    ImVec2ih ViewportPos;
-    ImGuiID ViewportId;
-    ImGuiID DockId;
-    ImGuiID ClassId;
-    short DockOrder;
    bool Collapsed;
    bool WantApply;
 };
@@ -2211,6 +1957,21 @@ struct ImGuiSettingsHandler
    void (*WriteAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* out_buf);
    void* UserData;
 };
+typedef enum {
+ImGuiLocKey_TableSizeOne=0,
+ImGuiLocKey_TableSizeAllFit=1,
+ImGuiLocKey_TableSizeAllDefault=2,
+ImGuiLocKey_TableResetOrder=3,
+ImGuiLocKey_WindowingMainMenuBar=4,
+ImGuiLocKey_WindowingPopup=5,
+ImGuiLocKey_WindowingUntitled=6,
+ImGuiLocKey_COUNT=7,
+}ImGuiLocKey;
+struct ImGuiLocEntry
+{
+    ImGuiLocKey Key;
+    const char* Text;
+};
 typedef enum {
    ImGuiDebugLogFlags_None = 0,
    ImGuiDebugLogFlags_EventActiveId = 1 << 0,
@@ -2219,9 +1980,7 @@ typedef enum {
    ImGuiDebugLogFlags_EventNav = 1 << 3,
    ImGuiDebugLogFlags_EventClipper = 1 << 4,
    ImGuiDebugLogFlags_EventIO = 1 << 5,
-    ImGuiDebugLogFlags_EventDocking = 1 << 6,
-    ImGuiDebugLogFlags_EventViewport = 1 << 7,
-    ImGuiDebugLogFlags_EventMask_ = ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventDocking | ImGuiDebugLogFlags_EventViewport,
+    ImGuiDebugLogFlags_EventMask_ = ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventIO,
    ImGuiDebugLogFlags_OutputToTTY = 1 << 10,
 }ImGuiDebugLogFlags_;
 struct ImGuiMetricsConfig
@@ -2233,7 +1992,6 @@ struct ImGuiMetricsConfig
    bool ShowTablesRects;
    bool ShowDrawCmdMesh;
    bool ShowDrawCmdBoundingBoxes;
-    bool ShowDockingNodes;
    int ShowWindowsRectsType;
    int ShowTablesRectsType;
 };
@@ -2270,6 +2028,8 @@ struct ImGuiContextHook
 };
 typedef struct ImVector_ImGuiInputEvent {int Size;int Capacity;ImGuiInputEvent* Data;} ImVector_ImGuiInputEvent;

+typedef struct ImVector_ImGuiWindowPtr {int Size;int Capacity;ImGuiWindow** Data;} ImVector_ImGuiWindowPtr;
+
 typedef struct ImVector_ImGuiWindowStackData {int Size;int Capacity;ImGuiWindowStackData* Data;} ImVector_ImGuiWindowStackData;

 typedef struct ImVector_ImGuiColorMod {int Size;int Capacity;ImGuiColorMod* Data;} ImVector_ImGuiColorMod;
@@ -2317,12 +2077,9 @@ struct ImGuiContext
    bool Initialized;
    bool FontAtlasOwnedByContext;
    ImGuiIO IO;
-    ImGuiPlatformIO PlatformIO;
    ImVector_ImGuiInputEvent InputEventsQueue;
    ImVector_ImGuiInputEvent InputEventsTrail;
    ImGuiStyle Style;
-    ImGuiConfigFlags ConfigFlagsCurrFrame;
-    ImGuiConfigFlags ConfigFlagsLastFrame;
    ImFont* Font;
    float FontSize;
    float FontBaseSize;
@@ -2330,7 +2087,6 @@ struct ImGuiContext
    double Time;
    int FrameCount;
    int FrameCountEnded;
-    int FrameCountPlatformEnded;
    int FrameCountRendered;
    bool WithinFrameScope;
    bool WithinFrameScopeWithImplicitWindow;
@@ -2399,13 +2155,6 @@ struct ImGuiContext
    ImVector_ImGuiPopupData BeginPopupStack;
    int BeginMenuCount;
    ImVector_ImGuiViewportPPtr Viewports;
-    float CurrentDpiScale;
-    ImGuiViewportP* CurrentViewport;
-    ImGuiViewportP* MouseViewport;
-    ImGuiViewportP* MouseLastHoveredViewport;
-    ImGuiID PlatformLastFocusedViewportId;
-    ImGuiPlatformMonitor FallbackMonitor;
-    int ViewportFrontMostStampCount;
    ImGuiWindow* NavWindow;
    ImGuiID NavId;
    ImGuiID NavFocusScopeId;
@@ -2517,9 +2266,7 @@ struct ImGuiContext
    ImVector_ImGuiID MenusIdSubmittedThisFrame;
    ImGuiPlatformImeData PlatformImeData;
    ImGuiPlatformImeData PlatformImeDataPrev;
-    ImGuiID PlatformImeViewport;
    char PlatformLocaleDecimalPoint;
-    ImGuiDockContext DockContext;
    bool SettingsLoaded;
    float SettingsDirtyTimer;
    ImGuiTextBuffer SettingsIniData;
@@ -2528,6 +2275,7 @@ struct ImGuiContext
    ImChunkStream_ImGuiTableSettings SettingsTables;
    ImVector_ImGuiContextHook Hooks;
    ImGuiID HookIdNext;
+    const char* LocalizationTable[ImGuiLocKey_COUNT];
    bool LogEnabled;
    ImGuiLogType LogType;
    ImFileHandle LogFile;
@@ -2548,7 +2296,6 @@ struct ImGuiContext
    ImGuiID DebugItemPickerBreakId;
    ImGuiMetricsConfig DebugMetricsConfig;
    ImGuiStackTool DebugStackTool;
-    ImGuiDockNode* DebugHoveredDockNode;
    float FramerateSecPerFrame[60];
    int FramerateSecPerFrameIdx;
    int FramerateSecPerFrameCount;
@@ -2602,12 +2349,8 @@ struct ImGuiWindow
 {
    char* Name;
    ImGuiID ID;
-    ImGuiWindowFlags Flags, FlagsPreviousFrame;
-    ImGuiWindowClass WindowClass;
+    ImGuiWindowFlags Flags;
    ImGuiViewportP* Viewport;
-    ImGuiID ViewportId;
-    ImVec2 ViewportPos;
-    int ViewportAllowPlatformMonitorExtend;
    ImVec2 Pos;
    ImVec2 Size;
    ImVec2 SizeFull;
@@ -2619,7 +2362,6 @@ struct ImGuiWindow
    float WindowBorderSize;
    int NameBufLen;
    ImGuiID MoveId;
-    ImGuiID TabId;
    ImGuiID ChildId;
    ImVec2 Scroll;
    ImVec2 ScrollMax;
@@ -2628,7 +2370,6 @@ struct ImGuiWindow
    ImVec2 ScrollTargetEdgeSnapDist;
    ImVec2 ScrollbarSizes;
    bool ScrollbarX, ScrollbarY;
-    bool ViewportOwned;
    bool Active;
    bool WasActive;
    bool WriteAccessed;
@@ -2658,7 +2399,6 @@ struct ImGuiWindow
    ImGuiCond SetWindowPosAllowFlags : 8;
    ImGuiCond SetWindowSizeAllowFlags : 8;
    ImGuiCond SetWindowCollapsedAllowFlags : 8;
-    ImGuiCond SetWindowDockAllowFlags : 8;
    ImVec2 SetWindowPosVal;
    ImVec2 SetWindowPosPivot;
    ImVector_ImGuiID IDStack;
@@ -2673,13 +2413,11 @@ struct ImGuiWindow
    ImVec2ih HitTestHoleSize;
    ImVec2ih HitTestHoleOffset;
    int LastFrameActive;
-    int LastFrameJustFocused;
    float LastTimeActive;
    float ItemWidthDefault;
    ImGuiStorage StateStorage;
    ImVector_ImGuiOldColumns ColumnsStorage;
    float FontWindowScale;
-    float FontDpiScale;
    int SettingsOffset;
    ImDrawList* DrawList;
    ImDrawList DrawListInst;
@@ -2687,7 +2425,6 @@ struct ImGuiWindow
    ImGuiWindow* ParentWindowInBeginStack;
    ImGuiWindow* RootWindow;
    ImGuiWindow* RootWindowPopupTree;
-    ImGuiWindow* RootWindowDockTree;
    ImGuiWindow* RootWindowForTitleBarHighlight;
    ImGuiWindow* RootWindowForNav;
    ImGuiWindow* NavLastChildNavWindow;
@@ -2697,17 +2434,6 @@ struct ImGuiWindow
    int MemoryDrawListIdxCapacity;
    int MemoryDrawListVtxCapacity;
    bool MemoryCompacted;
-    bool DockIsActive :1;
-    bool DockNodeIsVisible :1;
-    bool DockTabIsVisible :1;
-    bool DockTabWantClose :1;
-    short DockOrder;
-    ImGuiWindowDockStyle DockStyle;
-    ImGuiDockNode* DockNode;
-    ImGuiDockNode* DockNodeAsHost;
-    ImGuiID DockId;
-    ImGuiItemStatusFlags DockTabItemStatusFlags;
-    ImRect DockTabItemRect;
 };
 typedef enum {
    ImGuiTabBarFlags_DockNode = 1 << 20,
@@ -2718,14 +2444,11 @@ typedef enum {
    ImGuiTabItemFlags_SectionMask_ = ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_Trailing,
    ImGuiTabItemFlags_NoCloseButton = 1 << 20,
    ImGuiTabItemFlags_Button = 1 << 21,
-    ImGuiTabItemFlags_Unsorted = 1 << 22,
-    ImGuiTabItemFlags_Preview = 1 << 23,
 }ImGuiTabItemFlagsPrivate_;
 struct ImGuiTabItem
 {
    ImGuiID ID;
    ImGuiTabItemFlags Flags;
-    ImGuiWindow* Window;
    int LastFrameVisible;
    int LastFrameSelected;
    float Offset;
@@ -2987,8 +2710,6 @@ struct ImFontBuilderIO
 {
    bool (*FontBuilder_Build)(ImFontAtlas* atlas);
 };
-#define IMGUI_HAS_DOCK       1
-
 #else
 struct GLFWwindow;
 struct SDL_Window;
@@ -3020,8 +2741,6 @@ typedef ImVector<ImFontConfig> ImVector_ImFontConfig;
 typedef ImVector<ImFontGlyph> ImVector_ImFontGlyph;
 typedef ImVector<ImGuiColorMod> ImVector_ImGuiColorMod;
 typedef ImVector<ImGuiContextHook> ImVector_ImGuiContextHook;
-typedef ImVector<ImGuiDockNodeSettings> ImVector_ImGuiDockNodeSettings;
-typedef ImVector<ImGuiDockRequest> ImVector_ImGuiDockRequest;
 typedef ImVector<ImGuiGroupData> ImVector_ImGuiGroupData;
 typedef ImVector<ImGuiID> ImVector_ImGuiID;
 typedef ImVector<ImGuiInputEvent> ImVector_ImGuiInputEvent;
@@ -3031,7 +2750,6 @@ typedef ImVector<ImGuiListClipperData> ImVector_ImGuiListClipperData;
 typedef ImVector<ImGuiListClipperRange> ImVector_ImGuiListClipperRange;
 typedef ImVector<ImGuiOldColumnData> ImVector_ImGuiOldColumnData;
 typedef ImVector<ImGuiOldColumns> ImVector_ImGuiOldColumns;
-typedef ImVector<ImGuiPlatformMonitor> ImVector_ImGuiPlatformMonitor;
 typedef ImVector<ImGuiPopupData> ImVector_ImGuiPopupData;
 typedef ImVector<ImGuiPtrOrIndex> ImVector_ImGuiPtrOrIndex;
 typedef ImVector<ImGuiSettingsHandler> ImVector_ImGuiSettingsHandler;
@@ -3044,7 +2762,6 @@ typedef ImVector<ImGuiTableColumnSortSpecs> ImVector_ImGuiTableColumnSortSpecs;
 typedef ImVector<ImGuiTableInstanceData> ImVector_ImGuiTableInstanceData;
 typedef ImVector<ImGuiTableTempData> ImVector_ImGuiTableTempData;
 typedef ImVector<ImGuiTextRange> ImVector_ImGuiTextRange;
-typedef ImVector<ImGuiViewport*> ImVector_ImGuiViewportPtr;
 typedef ImVector<ImGuiViewportP*> ImVector_ImGuiViewportPPtr;
 typedef ImVector<ImGuiWindow*> ImVector_ImGuiWindowPtr;
 typedef ImVector<ImGuiWindowStackData> ImVector_ImGuiWindowStackData;
@@ -3054,7 +2771,6 @@ typedef ImVector<ImVec2> ImVector_ImVec2;
 typedef ImVector<ImVec4> ImVector_ImVec4;
 typedef ImVector<ImWchar> ImVector_ImWchar;
 typedef ImVector<char> ImVector_char;
-typedef ImVector<const char*> ImVector_const_charPtr;
 typedef ImVector<float> ImVector_float;
 typedef ImVector<int> ImVector_int;
 typedef ImVector<unsigned char> ImVector_unsigned_char;
@@ -3098,12 +2814,10 @@ CIMGUI_API bool igIsWindowCollapsed(void);
 CIMGUI_API bool igIsWindowFocused(ImGuiFocusedFlags flags);
 CIMGUI_API bool igIsWindowHovered(ImGuiHoveredFlags flags);
 CIMGUI_API ImDrawList* igGetWindowDrawList(void);
-CIMGUI_API float igGetWindowDpiScale(void);
 CIMGUI_API void igGetWindowPos(ImVec2 *pOut);
 CIMGUI_API void igGetWindowSize(ImVec2 *pOut);
 CIMGUI_API float igGetWindowWidth(void);
 CIMGUI_API float igGetWindowHeight(void);
-CIMGUI_API ImGuiViewport* igGetWindowViewport(void);
 CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot);
 CIMGUI_API void igSetNextWindowSize(const ImVec2 size,ImGuiCond cond);
 CIMGUI_API void igSetNextWindowSizeConstraints(const ImVec2 size_min,const ImVec2 size_max,ImGuiSizeCallback custom_callback,void* custom_callback_data);
@@ -3112,7 +2826,6 @@ CIMGUI_API void igSetNextWindowCollapsed(bool collapsed,ImGuiCond cond);
 CIMGUI_API void igSetNextWindowFocus(void);
 CIMGUI_API void igSetNextWindowScroll(const ImVec2 scroll);
 CIMGUI_API void igSetNextWindowBgAlpha(float alpha);
-CIMGUI_API void igSetNextWindowViewport(ImGuiID viewport_id);
 CIMGUI_API void igSetWindowPos_Vec2(const ImVec2 pos,ImGuiCond cond);
 CIMGUI_API void igSetWindowSize_Vec2(const ImVec2 size,ImGuiCond cond);
 CIMGUI_API void igSetWindowCollapsed_Bool(bool collapsed,ImGuiCond cond);
@@ -3354,12 +3067,6 @@ CIMGUI_API bool igBeginTabItem(const char* label,bool* p_open,ImGuiTabItemFlags
 CIMGUI_API void igEndTabItem(void);
 CIMGUI_API bool igTabItemButton(const char* label,ImGuiTabItemFlags flags);
 CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label);
-CIMGUI_API ImGuiID igDockSpace(ImGuiID id,const ImVec2 size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class);
-CIMGUI_API ImGuiID igDockSpaceOverViewport(const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class);
-CIMGUI_API void igSetNextWindowDockID(ImGuiID dock_id,ImGuiCond cond);
-CIMGUI_API void igSetNextWindowClass(const ImGuiWindowClass* window_class);
-CIMGUI_API ImGuiID igGetWindowDockID(void);
-CIMGUI_API bool igIsWindowDocked(void);
 CIMGUI_API void igLogToTTY(int auto_open_depth);
 CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename);
 CIMGUI_API void igLogToClipboard(int auto_open_depth);
@@ -3399,8 +3106,6 @@ CIMGUI_API void igSetItemAllowOverlap(void);
 CIMGUI_API ImGuiViewport* igGetMainViewport(void);
 CIMGUI_API ImDrawList* igGetBackgroundDrawList_Nil(void);
 CIMGUI_API ImDrawList* igGetForegroundDrawList_Nil(void);
-CIMGUI_API ImDrawList* igGetBackgroundDrawList_ViewportPtr(ImGuiViewport* viewport);
-CIMGUI_API ImDrawList* igGetForegroundDrawList_ViewportPtr(ImGuiViewport* viewport);
 CIMGUI_API bool igIsRectVisible_Nil(const ImVec2 size);
 CIMGUI_API bool igIsRectVisible_Vec2(const ImVec2 rect_min,const ImVec2 rect_max);
 CIMGUI_API double igGetTime(void);
@@ -3450,12 +3155,6 @@ CIMGUI_API void igSetAllocatorFunctions(ImGuiMemAllocFunc alloc_func,ImGuiMemFre
 CIMGUI_API void igGetAllocatorFunctions(ImGuiMemAllocFunc* p_alloc_func,ImGuiMemFreeFunc* p_free_func,void** p_user_data);
 CIMGUI_API void* igMemAlloc(size_t size);
 CIMGUI_API void igMemFree(void* ptr);
-CIMGUI_API ImGuiPlatformIO* igGetPlatformIO(void);
-CIMGUI_API void igUpdatePlatformWindows(void);
-CIMGUI_API void igRenderPlatformWindowsDefault(void* platform_render_arg,void* renderer_render_arg);
-CIMGUI_API void igDestroyPlatformWindows(void);
-CIMGUI_API ImGuiViewport* igFindViewportByID(ImGuiID id);
-CIMGUI_API ImGuiViewport* igFindViewportByPlatformHandle(void* platform_handle);
 CIMGUI_API ImGuiStyle* ImGuiStyle_ImGuiStyle(void);
 CIMGUI_API void ImGuiStyle_destroy(ImGuiStyle* self);
 CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor);
@@ -3464,7 +3163,6 @@ CIMGUI_API void ImGuiIO_AddKeyAnalogEvent(ImGuiIO* self,ImGuiKey key,bool down,f
 CIMGUI_API void ImGuiIO_AddMousePosEvent(ImGuiIO* self,float x,float y);
 CIMGUI_API void ImGuiIO_AddMouseButtonEvent(ImGuiIO* self,int button,bool down);
 CIMGUI_API void ImGuiIO_AddMouseWheelEvent(ImGuiIO* self,float wh_x,float wh_y);
-CIMGUI_API void ImGuiIO_AddMouseViewportEvent(ImGuiIO* self,ImGuiID id);
 CIMGUI_API void ImGuiIO_AddFocusEvent(ImGuiIO* self,bool focused);
 CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,unsigned int c);
 CIMGUI_API void ImGuiIO_AddInputCharacterUTF16(ImGuiIO* self,ImWchar16 c);
@@ -3482,8 +3180,6 @@ CIMGUI_API void ImGuiInputTextCallbackData_InsertChars(ImGuiInputTextCallbackDat
 CIMGUI_API void ImGuiInputTextCallbackData_SelectAll(ImGuiInputTextCallbackData* self);
 CIMGUI_API void ImGuiInputTextCallbackData_ClearSelection(ImGuiInputTextCallbackData* self);
 CIMGUI_API bool ImGuiInputTextCallbackData_HasSelection(ImGuiInputTextCallbackData* self);
-CIMGUI_API ImGuiWindowClass* ImGuiWindowClass_ImGuiWindowClass(void);
-CIMGUI_API void ImGuiWindowClass_destroy(ImGuiWindowClass* self);
 CIMGUI_API ImGuiPayload* ImGuiPayload_ImGuiPayload(void);
 CIMGUI_API void ImGuiPayload_destroy(ImGuiPayload* self);
 CIMGUI_API void ImGuiPayload_Clear(ImGuiPayload* self);
@@ -3698,10 +3394,6 @@ CIMGUI_API ImGuiViewport* ImGuiViewport_ImGuiViewport(void);
 CIMGUI_API void ImGuiViewport_destroy(ImGuiViewport* self);
 CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self);
 CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* self);
-CIMGUI_API ImGuiPlatformIO* ImGuiPlatformIO_ImGuiPlatformIO(void);
-CIMGUI_API void ImGuiPlatformIO_destroy(ImGuiPlatformIO* self);
-CIMGUI_API ImGuiPlatformMonitor* ImGuiPlatformMonitor_ImGuiPlatformMonitor(void);
-CIMGUI_API void ImGuiPlatformMonitor_destroy(ImGuiPlatformMonitor* self);
 CIMGUI_API ImGuiPlatformImeData* ImGuiPlatformImeData_ImGuiPlatformImeData(void);
 CIMGUI_API void ImGuiPlatformImeData_destroy(ImGuiPlatformImeData* self);
 CIMGUI_API ImGuiKey igGetKeyIndex(ImGuiKey key);
@@ -3912,25 +3604,8 @@ CIMGUI_API ImGuiOldColumnData* ImGuiOldColumnData_ImGuiOldColumnData(void);
 CIMGUI_API void ImGuiOldColumnData_destroy(ImGuiOldColumnData* self);
 CIMGUI_API ImGuiOldColumns* ImGuiOldColumns_ImGuiOldColumns(void);
 CIMGUI_API void ImGuiOldColumns_destroy(ImGuiOldColumns* self);
-CIMGUI_API ImGuiDockNode* ImGuiDockNode_ImGuiDockNode(ImGuiID id);
-CIMGUI_API void ImGuiDockNode_destroy(ImGuiDockNode* self);
-CIMGUI_API bool ImGuiDockNode_IsRootNode(ImGuiDockNode* self);
-CIMGUI_API bool ImGuiDockNode_IsDockSpace(ImGuiDockNode* self);
-CIMGUI_API bool ImGuiDockNode_IsFloatingNode(ImGuiDockNode* self);
-CIMGUI_API bool ImGuiDockNode_IsCentralNode(ImGuiDockNode* self);
-CIMGUI_API bool ImGuiDockNode_IsHiddenTabBar(ImGuiDockNode* self);
-CIMGUI_API bool ImGuiDockNode_IsNoTabBar(ImGuiDockNode* self);
-CIMGUI_API bool ImGuiDockNode_IsSplitNode(ImGuiDockNode* self);
-CIMGUI_API bool ImGuiDockNode_IsLeafNode(ImGuiDockNode* self);
-CIMGUI_API bool ImGuiDockNode_IsEmpty(ImGuiDockNode* self);
-CIMGUI_API void ImGuiDockNode_Rect(ImRect *pOut,ImGuiDockNode* self);
-CIMGUI_API void ImGuiDockNode_SetLocalFlags(ImGuiDockNode* self,ImGuiDockNodeFlags flags);
-CIMGUI_API void ImGuiDockNode_UpdateMergedFlags(ImGuiDockNode* self);
-CIMGUI_API ImGuiDockContext* ImGuiDockContext_ImGuiDockContext(void);
-CIMGUI_API void ImGuiDockContext_destroy(ImGuiDockContext* self);
 CIMGUI_API ImGuiViewportP* ImGuiViewportP_ImGuiViewportP(void);
 CIMGUI_API void ImGuiViewportP_destroy(ImGuiViewportP* self);
-CIMGUI_API void ImGuiViewportP_ClearRequestFlags(ImGuiViewportP* self);
 CIMGUI_API void ImGuiViewportP_CalcWorkRectPos(ImVec2 *pOut,ImGuiViewportP* self,const ImVec2 off_min);
 CIMGUI_API void ImGuiViewportP_CalcWorkRectSize(ImVec2 *pOut,ImGuiViewportP* self,const ImVec2 off_min,const ImVec2 off_max);
 CIMGUI_API void ImGuiViewportP_UpdateWorkRect(ImGuiViewportP* self);
@@ -3989,7 +3664,7 @@ CIMGUI_API ImGuiWindow* igFindWindowByID(ImGuiID id);
 CIMGUI_API ImGuiWindow* igFindWindowByName(const char* name);
 CIMGUI_API void igUpdateWindowParentAndRootLinks(ImGuiWindow* window,ImGuiWindowFlags flags,ImGuiWindow* parent_window);
 CIMGUI_API void igCalcWindowNextAutoFitSize(ImVec2 *pOut,ImGuiWindow* window);
-CIMGUI_API bool igIsWindowChildOf(ImGuiWindow* window,ImGuiWindow* potential_parent,bool popup_hierarchy,bool dock_hierarchy);
+CIMGUI_API bool igIsWindowChildOf(ImGuiWindow* window,ImGuiWindow* potential_parent,bool popup_hierarchy);
 CIMGUI_API bool igIsWindowWithinBeginStackOf(ImGuiWindow* window,ImGuiWindow* potential_parent);
 CIMGUI_API bool igIsWindowAbove(ImGuiWindow* potential_above,ImGuiWindow* potential_below);
 CIMGUI_API bool igIsWindowNavFocusable(ImGuiWindow* window);
@@ -4010,24 +3685,19 @@ CIMGUI_API ImGuiWindow* igFindBottomMostVisibleWindowWithinBeginStack(ImGuiWindo
 CIMGUI_API void igSetCurrentFont(ImFont* font);
 CIMGUI_API ImFont* igGetDefaultFont(void);
 CIMGUI_API ImDrawList* igGetForegroundDrawList_WindowPtr(ImGuiWindow* window);
+CIMGUI_API ImDrawList* igGetBackgroundDrawList_ViewportPtr(ImGuiViewport* viewport);
+CIMGUI_API ImDrawList* igGetForegroundDrawList_ViewportPtr(ImGuiViewport* viewport);
 CIMGUI_API void igInitialize(void);
 CIMGUI_API void igShutdown(void);
 CIMGUI_API void igUpdateInputEvents(bool trickle_fast_inputs);
 CIMGUI_API void igUpdateHoveredWindowAndCaptureFlags(void);
 CIMGUI_API void igStartMouseMovingWindow(ImGuiWindow* window);
-CIMGUI_API void igStartMouseMovingWindowOrNode(ImGuiWindow* window,ImGuiDockNode* node,bool undock_floating_node);
 CIMGUI_API void igUpdateMouseMovingWindowNewFrame(void);
 CIMGUI_API void igUpdateMouseMovingWindowEndFrame(void);
 CIMGUI_API ImGuiID igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook);
 CIMGUI_API void igRemoveContextHook(ImGuiContext* context,ImGuiID hook_to_remove);
 CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType type);
-CIMGUI_API void igTranslateWindowsInViewport(ImGuiViewportP* viewport,const ImVec2 old_pos,const ImVec2 new_pos);
-CIMGUI_API void igScaleWindowsInViewport(ImGuiViewportP* viewport,float scale);
-CIMGUI_API void igDestroyPlatformWindow(ImGuiViewportP* viewport);
 CIMGUI_API void igSetWindowViewport(ImGuiWindow* window,ImGuiViewportP* viewport);
-CIMGUI_API void igSetCurrentViewport(ImGuiWindow* window,ImGuiViewportP* viewport);
-CIMGUI_API const ImGuiPlatformMonitor* igGetViewportPlatformMonitor(ImGuiViewport* viewport);
-CIMGUI_API ImGuiViewportP* igFindHoveredViewportFromPlatformWindowStack(const ImVec2 mouse_platform_pos);
 CIMGUI_API void igMarkIniSettingsDirty_Nil(void);
 CIMGUI_API void igMarkIniSettingsDirty_WindowPtr(ImGuiWindow* window);
 CIMGUI_API void igClearIniSettings(void);
@@ -4037,6 +3707,8 @@ CIMGUI_API ImGuiWindowSettings* igFindOrCreateWindowSettings(const char* name);
 CIMGUI_API void igAddSettingsHandler(const ImGuiSettingsHandler* handler);
 CIMGUI_API void igRemoveSettingsHandler(const char* type_name);
 CIMGUI_API ImGuiSettingsHandler* igFindSettingsHandler(const char* type_name);
+CIMGUI_API void igLocalizeRegisterEntries(const ImGuiLocEntry* entries,int count);
+CIMGUI_API const char* igLocalizeGetMsg(ImGuiLocKey key);
 CIMGUI_API void igSetScrollX_WindowPtr(ImGuiWindow* window,float scroll_x);
 CIMGUI_API void igSetScrollY_WindowPtr(ImGuiWindow* window,float scroll_y);
 CIMGUI_API void igSetScrollFromPosX_WindowPtr(ImGuiWindow* window,float local_x,float center_x_ratio);
@@ -4111,7 +3783,9 @@ CIMGUI_API void igSetNavID(ImGuiID id,ImGuiNavLayer nav_layer,ImGuiID focus_scop
 CIMGUI_API bool igIsNamedKey(ImGuiKey key);
 CIMGUI_API bool igIsNamedKeyOrModKey(ImGuiKey key);
 CIMGUI_API bool igIsLegacyKey(ImGuiKey key);
+CIMGUI_API bool igIsKeyboardKey(ImGuiKey key);
 CIMGUI_API bool igIsGamepadKey(ImGuiKey key);
+CIMGUI_API bool igIsMouseKey(ImGuiKey key);
 CIMGUI_API bool igIsAliasKey(ImGuiKey key);
 CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiKey key);
 CIMGUI_API ImGuiKeyData* igGetKeyData(ImGuiKey key);
@@ -4139,45 +3813,6 @@ CIMGUI_API bool igShortcut(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFl
 CIMGUI_API bool igSetShortcutRouting(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags);
 CIMGUI_API bool igTestShortcutRouting(ImGuiKeyChord key_chord,ImGuiID owner_id);
 CIMGUI_API ImGuiKeyRoutingData* igGetShortcutRoutingData(ImGuiKeyChord key_chord);
-CIMGUI_API void igDockContextInitialize(ImGuiContext* ctx);
-CIMGUI_API void igDockContextShutdown(ImGuiContext* ctx);
-CIMGUI_API void igDockContextClearNodes(ImGuiContext* ctx,ImGuiID root_id,bool clear_settings_refs);
-CIMGUI_API void igDockContextRebuildNodes(ImGuiContext* ctx);
-CIMGUI_API void igDockContextNewFrameUpdateUndocking(ImGuiContext* ctx);
-CIMGUI_API void igDockContextNewFrameUpdateDocking(ImGuiContext* ctx);
-CIMGUI_API void igDockContextEndFrame(ImGuiContext* ctx);
-CIMGUI_API ImGuiID igDockContextGenNodeID(ImGuiContext* ctx);
-CIMGUI_API void igDockContextQueueDock(ImGuiContext* ctx,ImGuiWindow* target,ImGuiDockNode* target_node,ImGuiWindow* payload,ImGuiDir split_dir,float split_ratio,bool split_outer);
-CIMGUI_API void igDockContextQueueUndockWindow(ImGuiContext* ctx,ImGuiWindow* window);
-CIMGUI_API void igDockContextQueueUndockNode(ImGuiContext* ctx,ImGuiDockNode* node);
-CIMGUI_API bool igDockContextCalcDropPosForDocking(ImGuiWindow* target,ImGuiDockNode* target_node,ImGuiWindow* payload_window,ImGuiDockNode* payload_node,ImGuiDir split_dir,bool split_outer,ImVec2* out_pos);
-CIMGUI_API ImGuiDockNode* igDockContextFindNodeByID(ImGuiContext* ctx,ImGuiID id);
-CIMGUI_API bool igDockNodeBeginAmendTabBar(ImGuiDockNode* node);
-CIMGUI_API void igDockNodeEndAmendTabBar(void);
-CIMGUI_API ImGuiDockNode* igDockNodeGetRootNode(ImGuiDockNode* node);
-CIMGUI_API bool igDockNodeIsInHierarchyOf(ImGuiDockNode* node,ImGuiDockNode* parent);
-CIMGUI_API int igDockNodeGetDepth(const ImGuiDockNode* node);
-CIMGUI_API ImGuiID igDockNodeGetWindowMenuButtonId(const ImGuiDockNode* node);
-CIMGUI_API ImGuiDockNode* igGetWindowDockNode(void);
-CIMGUI_API bool igGetWindowAlwaysWantOwnTabBar(ImGuiWindow* window);
-CIMGUI_API void igBeginDocked(ImGuiWindow* window,bool* p_open);
-CIMGUI_API void igBeginDockableDragDropSource(ImGuiWindow* window);
-CIMGUI_API void igBeginDockableDragDropTarget(ImGuiWindow* window);
-CIMGUI_API void igSetWindowDock(ImGuiWindow* window,ImGuiID dock_id,ImGuiCond cond);
-CIMGUI_API void igDockBuilderDockWindow(const char* window_name,ImGuiID node_id);
-CIMGUI_API ImGuiDockNode* igDockBuilderGetNode(ImGuiID node_id);
-CIMGUI_API ImGuiDockNode* igDockBuilderGetCentralNode(ImGuiID node_id);
-CIMGUI_API ImGuiID igDockBuilderAddNode(ImGuiID node_id,ImGuiDockNodeFlags flags);
-CIMGUI_API void igDockBuilderRemoveNode(ImGuiID node_id);
-CIMGUI_API void igDockBuilderRemoveNodeDockedWindows(ImGuiID node_id,bool clear_settings_refs);
-CIMGUI_API void igDockBuilderRemoveNodeChildNodes(ImGuiID node_id);
-CIMGUI_API void igDockBuilderSetNodePos(ImGuiID node_id,ImVec2 pos);
-CIMGUI_API void igDockBuilderSetNodeSize(ImGuiID node_id,ImVec2 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);
-CIMGUI_API void igDockBuilderCopyDockSpace(ImGuiID src_dockspace_id,ImGuiID dst_dockspace_id,ImVector_const_charPtr* in_window_remap_pairs);
-CIMGUI_API void igDockBuilderCopyNode(ImGuiID src_node_id,ImGuiID dst_node_id,ImVector_ImGuiID* out_node_remap_pairs);
-CIMGUI_API void igDockBuilderCopyWindowSettings(const char* src_name,const char* dst_name);
-CIMGUI_API void igDockBuilderFinish(ImGuiID node_id);
 CIMGUI_API void igPushFocusScope(ImGuiID id);
 CIMGUI_API void igPopFocusScope(void);
 CIMGUI_API ImGuiID igGetCurrentFocusScope(void);
@@ -4243,18 +3878,15 @@ CIMGUI_API ImGuiTableSettings* igTableGetBoundSettings(ImGuiTable* table);
 CIMGUI_API void igTableSettingsAddSettingsHandler(void);
 CIMGUI_API ImGuiTableSettings* igTableSettingsCreate(ImGuiID id,int columns_count);
 CIMGUI_API ImGuiTableSettings* igTableSettingsFindByID(ImGuiID 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);
 CIMGUI_API ImGuiTabItem* igTabBarFindTabByID(ImGuiTabBar* tab_bar,ImGuiID tab_id);
-CIMGUI_API ImGuiTabItem* igTabBarFindMostRecentlySelectedTabForActiveWindow(ImGuiTabBar* tab_bar);
-CIMGUI_API void igTabBarAddTab(ImGuiTabBar* tab_bar,ImGuiTabItemFlags tab_flags,ImGuiWindow* window);
 CIMGUI_API void igTabBarRemoveTab(ImGuiTabBar* tab_bar,ImGuiID tab_id);
 CIMGUI_API void igTabBarCloseTab(ImGuiTabBar* tab_bar,ImGuiTabItem* tab);
 CIMGUI_API void igTabBarQueueReorder(ImGuiTabBar* tab_bar,const ImGuiTabItem* tab,int offset);
 CIMGUI_API void igTabBarQueueReorderFromMousePos(ImGuiTabBar* tab_bar,const ImGuiTabItem* tab,ImVec2 mouse_pos);
 CIMGUI_API bool igTabBarProcessReorder(ImGuiTabBar* tab_bar);
-CIMGUI_API bool igTabItemEx(ImGuiTabBar* tab_bar,const char* label,bool* p_open,ImGuiTabItemFlags flags,ImGuiWindow* docked_window);
-CIMGUI_API void igTabItemCalcSize_Str(ImVec2 *pOut,const char* label,bool has_close_button_or_unsaved_marker);
-CIMGUI_API void igTabItemCalcSize_WindowPtr(ImVec2 *pOut,ImGuiWindow* window);
+CIMGUI_API bool igTabItemEx(ImGuiTabBar* tab_bar,const char* label,bool* p_open,ImGuiTabItemFlags flags);
+CIMGUI_API void igTabItemCalcSize(ImVec2 *pOut,const char* label,bool has_close_button_or_unsaved_marker);
 CIMGUI_API void igTabItemBackground(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImU32 col);
 CIMGUI_API void igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id,bool is_contents_visible,bool* out_just_closed,bool* out_text_clipped);
 CIMGUI_API void igRenderText(ImVec2 pos,const char* text,const char* text_end,bool hide_text_after_hash);
@@ -4272,14 +3904,12 @@ CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDi
 CIMGUI_API void igRenderBullet(ImDrawList* draw_list,ImVec2 pos,ImU32 col);
 CIMGUI_API void igRenderCheckMark(ImDrawList* draw_list,ImVec2 pos,ImU32 col,float sz);
 CIMGUI_API void igRenderArrowPointingAt(ImDrawList* draw_list,ImVec2 pos,ImVec2 half_sz,ImGuiDir direction,ImU32 col);
-CIMGUI_API void igRenderArrowDockMenu(ImDrawList* draw_list,ImVec2 p_min,float sz,ImU32 col);
 CIMGUI_API void igRenderRectFilledRangeH(ImDrawList* draw_list,const ImRect rect,ImU32 col,float x_start_norm,float x_end_norm,float rounding);
 CIMGUI_API void igRenderRectFilledWithHole(ImDrawList* draw_list,const ImRect outer,const ImRect inner,ImU32 col,float rounding);
-CIMGUI_API ImDrawFlags igCalcRoundingFlagsForRectInRect(const ImRect r_in,const ImRect r_outer,float threshold);
 CIMGUI_API void igTextEx(const char* text,const char* text_end,ImGuiTextFlags flags);
 CIMGUI_API bool igButtonEx(const char* label,const ImVec2 size_arg,ImGuiButtonFlags flags);
 CIMGUI_API bool igCloseButton(ImGuiID id,const ImVec2 pos);
-CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2 pos,ImGuiDockNode* dock_node);
+CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2 pos);
 CIMGUI_API bool igArrowButtonEx(const char* str_id,ImGuiDir dir,ImVec2 size_arg,ImGuiButtonFlags flags);
 CIMGUI_API void igScrollbar(ImGuiAxis axis);
 CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,ImS64* p_scroll_v,ImS64 avail_v,ImS64 contents_v,ImDrawFlags flags);
@@ -4294,7 +3924,7 @@ CIMGUI_API bool igCheckboxFlags_U64Ptr(const char* label,ImU64* flags,ImU64 flag
 CIMGUI_API bool igButtonBehavior(const ImRect bb,ImGuiID id,bool* out_hovered,bool* out_held,ImGuiButtonFlags flags);
 CIMGUI_API bool igDragBehavior(ImGuiID id,ImGuiDataType data_type,void* p_v,float v_speed,const void* p_min,const void* p_max,const char* format,ImGuiSliderFlags flags);
 CIMGUI_API bool igSliderBehavior(const ImRect bb,ImGuiID id,ImGuiDataType data_type,void* p_v,const void* p_min,const void* p_max,const char* format,ImGuiSliderFlags flags,ImRect* out_grab_bb);
-CIMGUI_API bool igSplitterBehavior(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* size1,float* size2,float min_size1,float min_size2,float hover_extend,float hover_visibility_delay,ImU32 bg_col);
+CIMGUI_API bool igSplitterBehavior(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* size1,float* size2,float min_size1,float min_size2,float hover_extend,float hover_visibility_delay);
 CIMGUI_API bool igTreeNodeBehavior(ImGuiID id,ImGuiTreeNodeFlags flags,const char* label,const char* label_end);
 CIMGUI_API void igTreePushOverrideID(ImGuiID id);
 CIMGUI_API void igTreeNodeSetOpen(ImGuiID id,bool open);
@@ -4332,8 +3962,7 @@ CIMGUI_API void igDebugStartItemPicker(void);
 CIMGUI_API void igShowFontAtlas(ImFontAtlas* atlas);
 CIMGUI_API void igDebugHookIdInfo(ImGuiID id,ImGuiDataType data_type,const void* data_id,const void* data_id_end);
 CIMGUI_API void igDebugNodeColumns(ImGuiOldColumns* columns);
-CIMGUI_API void igDebugNodeDockNode(ImGuiDockNode* node,const char* label);
-CIMGUI_API void igDebugNodeDrawList(ImGuiWindow* window,ImGuiViewportP* viewport,const ImDrawList* draw_list,const char* label);
+CIMGUI_API void igDebugNodeDrawList(ImGuiWindow* window,const ImDrawList* draw_list,const char* label);
 CIMGUI_API void igDebugNodeDrawCmdShowMeshAndBoundingBox(ImDrawList* out_draw_list,const ImDrawList* draw_list,const ImDrawCmd* draw_cmd,bool show_mesh,bool show_aabb);
 CIMGUI_API void igDebugNodeFont(ImFont* font);
 CIMGUI_API void igDebugNodeFontGlyph(ImFont* font,const ImFontGlyph* glyph);
--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
@@ -129,6 +129,23 @@ local function clean_comments(txt)
 	txt = txt:gsub("%s*//[^\n]*","")
 	return txt,comms
 end
+--dont keep commens above empty line
+local function clean_outercomms(oc)
+	local oc2 = {}
+	for i,v in ipairs(oc) do
+		--print(string.format("%d\n%q",i,v))
+		if v:match"\n%s*\n" then
+			--print(string.format("match:\n%q",v))--,v:match"\n%s*\n"))
+			v=v:gsub("\n%s*\n","")
+			--print("clean",v)
+			oc2 = {}
+		else
+			--print"dont clean"
+		end
+		table.insert(oc2,v)
+	end
+	return table.concat(oc2)--,"\n")
+end
 local function strip(cad)
    return cad:gsub("^%s*(.-)%s*$","%1") --remove initial and final spaces
 end
@@ -317,11 +334,13 @@ local function getRE()
 	functionD_re = "^([^;{}]-%b()[\n%s%w]*%b{}%s-;*)",
 	--functionD_re = "^([^;{}]-%b()[^{}%(%)]*%b{})",
 	functype_re = "^%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)%s*;",
-	comment_re = "^%s*//[^\n]*",
-	comment2_re = "^%s*/%*.-%*/"
+	comment_re = "^\n*%s*//[^\n]*",
+	comment2_re = "^%s*/%*.-%*/",
+	emptyline_re = "^\n%s*\n"
 	}
 	
-	local resN = {"comment2_re","comment_re","functypedef_re","functype_re","function_re","functionD_re","typedef_st_re","struct_re","enum_re","union_re","namespace_re","class_re","typedef_re","vardef_re"}
+	local resN = {"comment2_re","comment_re","emptyline_re",
+	"functypedef_re","functype_re","function_re","functionD_re","typedef_st_re","struct_re","enum_re","union_re","namespace_re","class_re","typedef_re","vardef_re"}
 	
 	return res,resN
 end
@@ -348,7 +367,7 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 			if i then
 				
 				item = txt:sub(i,e)
-				--print("re_name",re_name,item)
+				--print("re_name:",re_name,string.format("%q",item))
 				------------------
 				--[[
 				--if re~=functionD_re then --skip defined functions
@@ -359,7 +378,8 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 				table.insert(items[re_name],item)
 				--]]
 				--------------------
-				if re_name=="comment_re" or re_name=="comment2_re" then
+				if re_name=="comment_re" or re_name=="comment2_re" or re_name=="emptyline_re" then
+					--print("parit",item)
 					--[[
 					table.insert(outercomms,item)
 					-- comments to previous item
@@ -368,6 +388,13 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 						itemarr[#itemarr].comments = prev .. item 
 					end
 					--]]
+					--clean initial spaces
+					--item = item:gsub("^%s*(//.-)$","%1")
+					--if item:match"^[^\n%S]*" then
+						--print("commspace1",string.format("%q",item))
+						item = item:gsub("^[^\n%S]*(//.-)$","%1")
+						--print("commspace2",string.format("%q",item))
+					--end
 					--comments begining with \n will go to next item
 					if item:match("^%s*\n") then
 						table.insert(outercomms,item)
@@ -382,7 +409,8 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 					--item,inercoms = clean_comments(item)
 					local itemold = item
 					item = item:gsub("extern __attribute__%(%(dllexport%)%) ","")
-					local comments = table.concat(outercomms,"\n") --..inercoms
+					local comments = clean_outercomms(outercomms) 
+					--local comments = table.concat(outercomms,"\n") --..inercoms
 					if comments=="" then comments=nil end
 					outercomms = {}
 					local loca
@@ -417,7 +445,7 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 					else
 						error"no linenumdict"
 					end
-					table.insert(itemarr,{re_name=re_name,item=item,locat=loca})--,comments=comments})
+					table.insert(itemarr,{re_name=re_name,item=item,locat=loca,prevcomments=comments})
 					items[re_name] = items[re_name] or {}
 					table.insert(items[re_name],item)
 				end
@@ -1178,7 +1206,7 @@ function M.Parser()
 		end
 		local defines = {}
 		local preprocessed = {}--
-		for line,loca,loca2 in M.location(pipe,names,defines,compiler) do
+		for line,loca,loca2 in M.location(pipe,names,defines,compiler,self.COMMENTS_GENERATION) do
 			self:insert(line, tostring(loca)..":"..tostring(loca2))
 			table.insert(preprocessed,line)--
 		end
@@ -1413,14 +1441,14 @@ function M.Parser()
 					it2 = it2:gsub("%s*=.+;",";")
 				end
 				table.insert(outtab,it2)
-				table.insert(commtab,it.comments or "")
+				table.insert(commtab,{above=it.prevcomments,sameline=it.comments})--it.comments or "")
 				end
 			elseif it.re_name == "struct_re" then
 				--check if has declaration
 				local decl = it.item:match"%b{}%s*([^%s}{]+)%s*;"
 				if decl then
 					table.insert(outtab,"\n    "..it.name.." "..decl..";")
-					table.insert(commtab,it.comments or "")
+					table.insert(commtab,{above=it.prevcomments,sameline=it.comments})--it.comments or "")
 				end
 				local cleanst,structname,strtab,comstab,predec = self:clean_structR1(it,doheader)
 				if doheader then
@@ -1624,7 +1652,11 @@ function M.Parser()
 	end
 	-----------
 	function par:parse_struct_line(line,outtab,comment)
-		comment = comment ~= "" and comment or nil
+		if type(comment)=="string" then
+			comment = comment ~= "" and comment or nil
+		else
+			comment = next(comment) and comment or nil
+		end
 		local functype_re = "^%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)"
 		local functype_reex = "^(%s*[%w%s%*]+%(%*)([%w_]+)(%)%([^%(%)]*%))"
 		line = clean_spaces(line)
@@ -1677,6 +1709,8 @@ function M.Parser()
 			print("enumtype",enumtype) 
 			outtab.enumtypes[enumname] = enumtype
 		end
+		outtab.enum_comments[enumname] = {sameline=it.comments, above=it.prevcomments}
+		outtab.enum_comments[enumname] = next(outtab.enum_comments[enumname]) and outtab.enum_comments[enumname] or nil
 		outtab.enums[enumname] = {}
 		table.insert(enumsordered,enumname)
 		local inner = strip_end(it.item:match("%b{}"):sub(2,-2))
@@ -1698,6 +1732,7 @@ function M.Parser()
 		for j,line in ipairs(enumarr) do
 			local comment
 			line, comment = split_comment(line)
+			comment = comment and comment:gsub("^[^\n%S]*(//.-)$","%1") or nil
 			assert(line~="")
 			local name,value = line:match("%s*([%w_]+)%s*=%s*([^,]+)")
 			if value then
@@ -1725,7 +1760,7 @@ function M.Parser()
 	par.enums_for_table = enums_for_table
 	function par:gen_structs_and_enums_table()
 		print"--------------gen_structs_and_enums_table"
-		local outtab = {enums={},structs={},locations={},enumtypes={}}
+		local outtab = {enums={},structs={},locations={},enumtypes={},struct_comments={},enum_comments={}}
 		self.typedefs_table = {}
 		local enumsordered = {}
 		unnamed_enum_counter = 0
@@ -1759,6 +1794,8 @@ function M.Parser()
 				if not structname then print("NO NAME",cleanst,it.item) end
 				if structname and not self.typenames[structname] then
 					outtab.structs[structname] = {}
+					outtab.struct_comments[structname] = {sameline=it.comments,above=it.prevcomments}
+					outtab.struct_comments[structname] = next(outtab.struct_comments[structname]) and outtab.struct_comments[structname] or nil
 					outtab.locations[structname] = it.locat
 					for j=3,#strtab-1 do
 						self:parse_struct_line(strtab[j],outtab.structs[structname],comstab[j])
@@ -1829,6 +1866,11 @@ function M.Parser()
 				end
 			end
 		end
+		--delete comments tables if not desired
+		if not self.COMMENTS_GENERATION then
+			outtab.enum_comments = nil
+			outtab.struct_comments = nil
+		end
 		self.structs_and_enums_table = outtab
 		return outtab
 	end
@@ -2121,7 +2163,7 @@ M.serializeTableF = function(t)
 	return M.serializeTable("defs",t).."\nreturn defs"
 end
 --iterates lines from a gcc/clang -E in a specific location
-local function location(file,locpathT,defines,COMPILER)
+local function location(file,locpathT,defines,COMPILER,keepemptylines)
 	local define_re = "^#define%s+([^%s]+)%s+(.+)$"
 	local number_re = "^-?[0-9]+u*$"
 	local hex_re = "0x[0-9a-fA-F]+u*$"
@@ -2186,7 +2228,7 @@ local function location(file,locpathT,defines,COMPILER)
                local loc_num_real = loc_num + loc_num_incr
                loc_num_incr = loc_num_incr + 1
 				--if doprint then print(which_locationold,which_location) end
-				if line:match("%S") then --nothing on emptyline
+				if keepemptylines or line:match("%S") then --nothing on emptyline
                if (which_locationold~=which_location) or (loc_num_realold and loc_num_realold < loc_num_real) then
                    --old line complete
 					--doprint = false
@@ -2395,11 +2437,22 @@ M.func_header_generate = func_header_generate

 local code = [[

-enum pedro : int ;
+int pedro;
+//linea1
+
+
+
+//linea2
+enum coco
+{
+uno,
+dos
+};

 ]]																		  
 local parser = M.Parser()
-for line in code:gmatch("[^\n]+") do
+--for line in code:gmatch("[^\n]+") do
+for line in code:gmatch'(.-)\r?\n' do
 	--print("inserting",line)
 	parser:insert(line,"11")
 end
--- a/generator/generator.lua
+++ b/generator/generator.lua
@@ -269,12 +269,12 @@ end
 --------------------------------------------------------
 --get imgui.h version and IMGUI_HAS_DOCK--------------------------
 --defines for the cl compiler must be present in the print_defines.cpp file
-gdefines = get_defines{"IMGUI_VERSION","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR"}
+gdefines = get_defines{"IMGUI_VERSION","IMGUI_VERSION_NUM","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR"}

 if gdefines.IMGUI_HAS_DOCK then gdefines.IMGUI_HAS_DOCK = true end
 if gdefines.IMGUI_HAS_IMSTR then gdefines.IMGUI_HAS_IMSTR = true end

-cimgui_header = cimgui_header:gsub("XXX",gdefines.IMGUI_VERSION)
+cimgui_header = cimgui_header:gsub("XXX",gdefines.IMGUI_VERSION .. " "..(gdefines.IMGUI_VERSION_NUM or ""))
 if INTERNAL_GENERATION then
 	cimgui_header = cimgui_header..[[//with imgui_internal.h api
 ]]
--- 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:46",
+      "location": "imgui_impl_glfw:41",
      "ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,unsigned int)",
@@ -42,7 +42,7 @@
      "cimguiname": "ImGui_ImplGlfw_CursorEnterCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_CursorEnterCallback",
-      "location": "imgui_impl_glfw:41",
+      "location": "imgui_impl_glfw:36",
      "ov_cimguiname": "ImGui_ImplGlfw_CursorEnterCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int)",
@@ -71,7 +71,7 @@
      "cimguiname": "ImGui_ImplGlfw_CursorPosCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_CursorPosCallback",
-      "location": "imgui_impl_glfw:42",
+      "location": "imgui_impl_glfw:37",
      "ov_cimguiname": "ImGui_ImplGlfw_CursorPosCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,double,double)",
@@ -96,7 +96,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InitForOpenGL",
-      "location": "imgui_impl_glfw:27",
+      "location": "imgui_impl_glfw:22",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -121,7 +121,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForOther",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InitForOther",
-      "location": "imgui_impl_glfw:29",
+      "location": "imgui_impl_glfw:24",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForOther",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -146,7 +146,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForVulkan",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InitForVulkan",
-      "location": "imgui_impl_glfw:28",
+      "location": "imgui_impl_glfw:23",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForVulkan",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -167,7 +167,7 @@
      "cimguiname": "ImGui_ImplGlfw_InstallCallbacks",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InstallCallbacks",
-      "location": "imgui_impl_glfw:36",
+      "location": "imgui_impl_glfw:31",
      "ov_cimguiname": "ImGui_ImplGlfw_InstallCallbacks",
      "ret": "void",
      "signature": "(GLFWwindow*)",
@@ -204,7 +204,7 @@
      "cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_KeyCallback",
-      "location": "imgui_impl_glfw:45",
+      "location": "imgui_impl_glfw:40",
      "ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int,int)",
@@ -229,7 +229,7 @@
      "cimguiname": "ImGui_ImplGlfw_MonitorCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_MonitorCallback",
-      "location": "imgui_impl_glfw:47",
+      "location": "imgui_impl_glfw:42",
      "ov_cimguiname": "ImGui_ImplGlfw_MonitorCallback",
      "ret": "void",
      "signature": "(GLFWmonitor*,int)",
@@ -262,7 +262,7 @@
      "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
-      "location": "imgui_impl_glfw:43",
+      "location": "imgui_impl_glfw:38",
      "ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int)",
@@ -278,7 +278,7 @@
      "cimguiname": "ImGui_ImplGlfw_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_NewFrame",
-      "location": "imgui_impl_glfw:31",
+      "location": "imgui_impl_glfw:26",
      "ov_cimguiname": "ImGui_ImplGlfw_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -299,7 +299,7 @@
      "cimguiname": "ImGui_ImplGlfw_RestoreCallbacks",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_RestoreCallbacks",
-      "location": "imgui_impl_glfw:37",
+      "location": "imgui_impl_glfw:32",
      "ov_cimguiname": "ImGui_ImplGlfw_RestoreCallbacks",
      "ret": "void",
      "signature": "(GLFWwindow*)",
@@ -328,7 +328,7 @@
      "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_ScrollCallback",
-      "location": "imgui_impl_glfw:44",
+      "location": "imgui_impl_glfw:39",
      "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,double,double)",
@@ -344,7 +344,7 @@
      "cimguiname": "ImGui_ImplGlfw_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_Shutdown",
-      "location": "imgui_impl_glfw:30",
+      "location": "imgui_impl_glfw:25",
      "ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -369,7 +369,7 @@
      "cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_WindowFocusCallback",
-      "location": "imgui_impl_glfw:40",
+      "location": "imgui_impl_glfw:35",
      "ov_cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int)",
@@ -385,7 +385,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
-      "location": "imgui_impl_opengl2:32",
+      "location": "imgui_impl_opengl2:31",
      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
@@ -401,7 +401,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_CreateFontsTexture",
-      "location": "imgui_impl_opengl2:30",
+      "location": "imgui_impl_opengl2:29",
      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
@@ -417,7 +417,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl2:33",
+      "location": "imgui_impl_opengl2:32",
      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
@@ -433,7 +433,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
-      "location": "imgui_impl_opengl2:31",
+      "location": "imgui_impl_opengl2:30",
      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
@@ -449,7 +449,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_Init",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_Init",
-      "location": "imgui_impl_opengl2:24",
+      "location": "imgui_impl_opengl2:23",
      "ov_cimguiname": "ImGui_ImplOpenGL2_Init",
      "ret": "bool",
      "signature": "()",
@@ -465,7 +465,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_NewFrame",
-      "location": "imgui_impl_opengl2:26",
+      "location": "imgui_impl_opengl2:25",
      "ov_cimguiname": "ImGui_ImplOpenGL2_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -486,7 +486,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_RenderDrawData",
-      "location": "imgui_impl_opengl2:27",
+      "location": "imgui_impl_opengl2:26",
      "ov_cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
@@ -502,7 +502,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_Shutdown",
-      "location": "imgui_impl_opengl2:25",
+      "location": "imgui_impl_opengl2:24",
      "ov_cimguiname": "ImGui_ImplOpenGL2_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -518,7 +518,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
-      "location": "imgui_impl_opengl3:33",
+      "location": "imgui_impl_opengl3:32",
      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
@@ -534,7 +534,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_CreateFontsTexture",
-      "location": "imgui_impl_opengl3:31",
+      "location": "imgui_impl_opengl3:30",
      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
@@ -550,7 +550,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl3:34",
+      "location": "imgui_impl_opengl3:33",
      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
@@ -566,7 +566,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
-      "location": "imgui_impl_opengl3:32",
+      "location": "imgui_impl_opengl3:31",
      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
@@ -589,7 +589,7 @@
        "glsl_version": "nullptr"
      },
      "funcname": "ImGui_ImplOpenGL3_Init",
-      "location": "imgui_impl_opengl3:25",
+      "location": "imgui_impl_opengl3:24",
      "ov_cimguiname": "ImGui_ImplOpenGL3_Init",
      "ret": "bool",
      "signature": "(const char*)",
@@ -605,7 +605,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_NewFrame",
-      "location": "imgui_impl_opengl3:27",
+      "location": "imgui_impl_opengl3:26",
      "ov_cimguiname": "ImGui_ImplOpenGL3_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -626,7 +626,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_RenderDrawData",
-      "location": "imgui_impl_opengl3:28",
+      "location": "imgui_impl_opengl3:27",
      "ov_cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
@@ -642,7 +642,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_Shutdown",
-      "location": "imgui_impl_opengl3:26",
+      "location": "imgui_impl_opengl3:25",
      "ov_cimguiname": "ImGui_ImplOpenGL3_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -663,7 +663,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForD3D",
-      "location": "imgui_impl_sdl:29",
+      "location": "imgui_impl_sdl:27",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -684,7 +684,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForMetal",
-      "location": "imgui_impl_sdl:30",
+      "location": "imgui_impl_sdl:28",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -709,7 +709,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForOpenGL",
-      "location": "imgui_impl_sdl:27",
+      "location": "imgui_impl_sdl:25",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "ret": "bool",
      "signature": "(SDL_Window*,void*)",
@@ -734,7 +734,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForSDLRenderer",
-      "location": "imgui_impl_sdl:31",
+      "location": "imgui_impl_sdl:29",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
      "ret": "bool",
      "signature": "(SDL_Window*,SDL_Renderer*)",
@@ -755,7 +755,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForVulkan",
-      "location": "imgui_impl_sdl:28",
+      "location": "imgui_impl_sdl:26",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -771,7 +771,7 @@
      "cimguiname": "ImGui_ImplSDL2_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_NewFrame",
-      "location": "imgui_impl_sdl:33",
+      "location": "imgui_impl_sdl:31",
      "ov_cimguiname": "ImGui_ImplSDL2_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -792,7 +792,7 @@
      "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_ProcessEvent",
-      "location": "imgui_impl_sdl:34",
+      "location": "imgui_impl_sdl:32",
      "ov_cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "ret": "bool",
      "signature": "(const SDL_Event*)",
@@ -808,7 +808,7 @@
      "cimguiname": "ImGui_ImplSDL2_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_Shutdown",
-      "location": "imgui_impl_sdl:32",
+      "location": "imgui_impl_sdl:30",
      "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:46"
+defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:41"
 defs["ImGui_ImplGlfw_CharCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CharCallback"
 defs["ImGui_ImplGlfw_CharCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CharCallback"][1]["signature"] = "(GLFWwindow*,unsigned int)"
@@ -35,7 +35,7 @@ defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["call_args"] = "(window,entered)"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CursorEnterCallback"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["funcname"] = "ImGui_ImplGlfw_CursorEnterCallback"
-defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["location"] = "imgui_impl_glfw:41"
+defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["location"] = "imgui_impl_glfw:36"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CursorEnterCallback"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["signature"] = "(GLFWwindow*,int)"
@@ -59,7 +59,7 @@ defs["ImGui_ImplGlfw_CursorPosCallback"][1]["call_args"] = "(window,x,y)"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CursorPosCallback"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["funcname"] = "ImGui_ImplGlfw_CursorPosCallback"
-defs["ImGui_ImplGlfw_CursorPosCallback"][1]["location"] = "imgui_impl_glfw:42"
+defs["ImGui_ImplGlfw_CursorPosCallback"][1]["location"] = "imgui_impl_glfw:37"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CursorPosCallback"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["signature"] = "(GLFWwindow*,double,double)"
@@ -80,7 +80,7 @@ defs["ImGui_ImplGlfw_InitForOpenGL"][1]["call_args"] = "(window,install_callback
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOpenGL"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["funcname"] = "ImGui_ImplGlfw_InitForOpenGL"
-defs["ImGui_ImplGlfw_InitForOpenGL"][1]["location"] = "imgui_impl_glfw:27"
+defs["ImGui_ImplGlfw_InitForOpenGL"][1]["location"] = "imgui_impl_glfw:22"
 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)"
@@ -101,7 +101,7 @@ defs["ImGui_ImplGlfw_InitForOther"][1]["call_args"] = "(window,install_callbacks
 defs["ImGui_ImplGlfw_InitForOther"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOther"
 defs["ImGui_ImplGlfw_InitForOther"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForOther"][1]["funcname"] = "ImGui_ImplGlfw_InitForOther"
-defs["ImGui_ImplGlfw_InitForOther"][1]["location"] = "imgui_impl_glfw:29"
+defs["ImGui_ImplGlfw_InitForOther"][1]["location"] = "imgui_impl_glfw:24"
 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)"
@@ -122,7 +122,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:28"
+defs["ImGui_ImplGlfw_InitForVulkan"][1]["location"] = "imgui_impl_glfw:23"
 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)"
@@ -140,7 +140,7 @@ defs["ImGui_ImplGlfw_InstallCallbacks"][1]["call_args"] = "(window)"
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["cimguiname"] = "ImGui_ImplGlfw_InstallCallbacks"
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["funcname"] = "ImGui_ImplGlfw_InstallCallbacks"
-defs["ImGui_ImplGlfw_InstallCallbacks"][1]["location"] = "imgui_impl_glfw:36"
+defs["ImGui_ImplGlfw_InstallCallbacks"][1]["location"] = "imgui_impl_glfw:31"
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InstallCallbacks"
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["signature"] = "(GLFWwindow*)"
@@ -170,7 +170,7 @@ defs["ImGui_ImplGlfw_KeyCallback"][1]["call_args"] = "(window,key,scancode,actio
 defs["ImGui_ImplGlfw_KeyCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_KeyCallback"][1]["funcname"] = "ImGui_ImplGlfw_KeyCallback"
-defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:45"
+defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:40"
 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)"
@@ -191,7 +191,7 @@ defs["ImGui_ImplGlfw_MonitorCallback"][1]["call_args"] = "(monitor,event)"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MonitorCallback"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["funcname"] = "ImGui_ImplGlfw_MonitorCallback"
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:47"
+defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:42"
 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)"
@@ -218,7 +218,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:43"
+defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:38"
 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)"
@@ -233,7 +233,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:31"
+defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:26"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_NewFrame"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_NewFrame"][1]["signature"] = "()"
@@ -251,7 +251,7 @@ defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["call_args"] = "(window)"
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["cimguiname"] = "ImGui_ImplGlfw_RestoreCallbacks"
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["funcname"] = "ImGui_ImplGlfw_RestoreCallbacks"
-defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["location"] = "imgui_impl_glfw:37"
+defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["location"] = "imgui_impl_glfw:32"
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_RestoreCallbacks"
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["signature"] = "(GLFWwindow*)"
@@ -275,7 +275,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:44"
+defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:39"
 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)"
@@ -290,7 +290,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:30"
+defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:25"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_Shutdown"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_Shutdown"][1]["signature"] = "()"
@@ -311,7 +311,7 @@ defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["call_args"] = "(window,focused)"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_WindowFocusCallback"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["funcname"] = "ImGui_ImplGlfw_WindowFocusCallback"
-defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["location"] = "imgui_impl_glfw:40"
+defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["location"] = "imgui_impl_glfw:35"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_WindowFocusCallback"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["signature"] = "(GLFWwindow*,int)"
@@ -326,7 +326,7 @@ defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
-defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl2:32"
+defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl2:31"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["signature"] = "()"
@@ -341,7 +341,7 @@ defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
-defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl2:30"
+defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl2:29"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["signature"] = "()"
@@ -356,7 +356,7 @@ defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
-defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl2:33"
+defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl2:32"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["signature"] = "()"
@@ -371,7 +371,7 @@ defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
-defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl2:31"
+defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl2:30"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["signature"] = "()"
@@ -386,7 +386,7 @@ defs["ImGui_ImplOpenGL2_Init"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_Init"][1]["cimguiname"] = "ImGui_ImplOpenGL2_Init"
 defs["ImGui_ImplOpenGL2_Init"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_Init"][1]["funcname"] = "ImGui_ImplOpenGL2_Init"
-defs["ImGui_ImplOpenGL2_Init"][1]["location"] = "imgui_impl_opengl2:24"
+defs["ImGui_ImplOpenGL2_Init"][1]["location"] = "imgui_impl_opengl2:23"
 defs["ImGui_ImplOpenGL2_Init"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_Init"
 defs["ImGui_ImplOpenGL2_Init"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_Init"][1]["signature"] = "()"
@@ -401,7 +401,7 @@ defs["ImGui_ImplOpenGL2_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplOpenGL2_NewFrame"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["funcname"] = "ImGui_ImplOpenGL2_NewFrame"
-defs["ImGui_ImplOpenGL2_NewFrame"][1]["location"] = "imgui_impl_opengl2:26"
+defs["ImGui_ImplOpenGL2_NewFrame"][1]["location"] = "imgui_impl_opengl2:25"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_NewFrame"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["signature"] = "()"
@@ -419,7 +419,7 @@ defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["call_args"] = "(draw_data)"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["cimguiname"] = "ImGui_ImplOpenGL2_RenderDrawData"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["funcname"] = "ImGui_ImplOpenGL2_RenderDrawData"
-defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["location"] = "imgui_impl_opengl2:27"
+defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["location"] = "imgui_impl_opengl2:26"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_RenderDrawData"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["signature"] = "(ImDrawData*)"
@@ -434,7 +434,7 @@ defs["ImGui_ImplOpenGL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplOpenGL2_Shutdown"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["funcname"] = "ImGui_ImplOpenGL2_Shutdown"
-defs["ImGui_ImplOpenGL2_Shutdown"][1]["location"] = "imgui_impl_opengl2:25"
+defs["ImGui_ImplOpenGL2_Shutdown"][1]["location"] = "imgui_impl_opengl2:24"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_Shutdown"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["signature"] = "()"
@@ -449,7 +449,7 @@ defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
-defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl3:33"
+defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl3:32"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["signature"] = "()"
@@ -464,7 +464,7 @@ defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
-defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl3:31"
+defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl3:30"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["signature"] = "()"
@@ -479,7 +479,7 @@ defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
-defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl3:34"
+defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl3:33"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["signature"] = "()"
@@ -494,7 +494,7 @@ defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
-defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl3:32"
+defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl3:31"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["signature"] = "()"
@@ -513,7 +513,7 @@ defs["ImGui_ImplOpenGL3_Init"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Init"
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"]["glsl_version"] = "nullptr"
 defs["ImGui_ImplOpenGL3_Init"][1]["funcname"] = "ImGui_ImplOpenGL3_Init"
-defs["ImGui_ImplOpenGL3_Init"][1]["location"] = "imgui_impl_opengl3:25"
+defs["ImGui_ImplOpenGL3_Init"][1]["location"] = "imgui_impl_opengl3:24"
 defs["ImGui_ImplOpenGL3_Init"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_Init"
 defs["ImGui_ImplOpenGL3_Init"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_Init"][1]["signature"] = "(const char*)"
@@ -528,7 +528,7 @@ defs["ImGui_ImplOpenGL3_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["funcname"] = "ImGui_ImplOpenGL3_NewFrame"
-defs["ImGui_ImplOpenGL3_NewFrame"][1]["location"] = "imgui_impl_opengl3:27"
+defs["ImGui_ImplOpenGL3_NewFrame"][1]["location"] = "imgui_impl_opengl3:26"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["signature"] = "()"
@@ -546,7 +546,7 @@ defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["call_args"] = "(draw_data)"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["funcname"] = "ImGui_ImplOpenGL3_RenderDrawData"
-defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["location"] = "imgui_impl_opengl3:28"
+defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["location"] = "imgui_impl_opengl3:27"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["signature"] = "(ImDrawData*)"
@@ -561,7 +561,7 @@ defs["ImGui_ImplOpenGL3_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["funcname"] = "ImGui_ImplOpenGL3_Shutdown"
-defs["ImGui_ImplOpenGL3_Shutdown"][1]["location"] = "imgui_impl_opengl3:26"
+defs["ImGui_ImplOpenGL3_Shutdown"][1]["location"] = "imgui_impl_opengl3:25"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["signature"] = "()"
@@ -579,7 +579,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:29"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl:27"
 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*)"
@@ -597,7 +597,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:30"
+defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl:28"
 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*)"
@@ -618,7 +618,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:27"
+defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl:25"
 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*)"
@@ -639,7 +639,7 @@ defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["call_args"] = "(window,renderer)"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["funcname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
-defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["location"] = "imgui_impl_sdl:31"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["location"] = "imgui_impl_sdl:29"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["signature"] = "(SDL_Window*,SDL_Renderer*)"
@@ -657,7 +657,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:28"
+defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl:26"
 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*)"
@@ -672,7 +672,7 @@ defs["ImGui_ImplSDL2_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_NewFrame"][1]["funcname"] = "ImGui_ImplSDL2_NewFrame"
-defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl:33"
+defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl:31"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_NewFrame"][1]["signature"] = "()"
@@ -690,7 +690,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:34"
+defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl:32"
 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*)"
@@ -705,7 +705,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:32"
+defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl:30"
 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
@@ -117,8 +117,8 @@ igGetColorU32	3
 3	ImU32	igGetColorU32_U32 (ImU32)
 igGetForegroundDrawList	3
 1	ImDrawList*	igGetForegroundDrawList_Nil ()
-2	ImDrawList*	igGetForegroundDrawList_ViewportPtr (ImGuiViewport*)
-3	ImDrawList*	igGetForegroundDrawList_WindowPtr (ImGuiWindow*)
+2	ImDrawList*	igGetForegroundDrawList_WindowPtr (ImGuiWindow*)
+3	ImDrawList*	igGetForegroundDrawList_ViewportPtr (ImGuiViewport*)
 igGetID	3
 1	ImGuiID	igGetID_Str (const char*)
 2	ImGuiID	igGetID_StrStr (const char*,const char*)
@@ -244,9 +244,6 @@ igSetWindowSize	3
 1	void	igSetWindowSize_Vec2 (const ImVec2,ImGuiCond)
 2	void	igSetWindowSize_Str (const char*,const ImVec2,ImGuiCond)
 3	void	igSetWindowSize_WindowPtr (ImGuiWindow*,const ImVec2,ImGuiCond)
-igTabItemCalcSize	2
-1	ImVec2	igTabItemCalcSize_Str (const char*,bool)
-2	ImVec2	igTabItemCalcSize_WindowPtr (ImGuiWindow*)
 igTableGcCompactTransientBuffers	2
 1	void	igTableGcCompactTransientBuffers_TablePtr (ImGuiTable*)
 2	void	igTableGcCompactTransientBuffers_TableTempDataPtr (ImGuiTableTempData*)
@@ -275,4 +272,4 @@ igValue	4
 2	void	igValue_Int (const char*,int)
 3	void	igValue_Uint (const char*,unsigned int)
 4	void	igValue_Float (const char*,float,const char*)
-193 overloaded
+191 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
@@ -37,17 +37,11 @@
  "ImGuiContext": "struct ImGuiContext",
  "ImGuiContextHook": "struct ImGuiContextHook",
  "ImGuiContextHookCallback": "void(*)(ImGuiContext* ctx,ImGuiContextHook* hook);",
-  "ImGuiDataAuthority": "int",
  "ImGuiDataType": "int",
  "ImGuiDataTypeInfo": "struct ImGuiDataTypeInfo",
  "ImGuiDataTypeTempStorage": "struct ImGuiDataTypeTempStorage",
  "ImGuiDebugLogFlags": "int",
  "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",
@@ -60,7 +54,6 @@
  "ImGuiInputEventKey": "struct ImGuiInputEventKey",
  "ImGuiInputEventMouseButton": "struct ImGuiInputEventMouseButton",
  "ImGuiInputEventMousePos": "struct ImGuiInputEventMousePos",
-  "ImGuiInputEventMouseViewport": "struct ImGuiInputEventMouseViewport",
  "ImGuiInputEventMouseWheel": "struct ImGuiInputEventMouseWheel",
  "ImGuiInputEventText": "struct ImGuiInputEventText",
  "ImGuiInputFlags": "int",
@@ -81,6 +74,7 @@
  "ImGuiListClipper": "struct ImGuiListClipper",
  "ImGuiListClipperData": "struct ImGuiListClipperData",
  "ImGuiListClipperRange": "struct ImGuiListClipperRange",
+  "ImGuiLocEntry": "struct ImGuiLocEntry",
  "ImGuiMemAllocFunc": "void*(*)(size_t sz,void* user_data);",
  "ImGuiMemFreeFunc": "void(*)(void* ptr,void* user_data);",
  "ImGuiMenuColumns": "struct ImGuiMenuColumns",
@@ -99,9 +93,7 @@
  "ImGuiOldColumns": "struct ImGuiOldColumns",
  "ImGuiOnceUponAFrame": "struct ImGuiOnceUponAFrame",
  "ImGuiPayload": "struct ImGuiPayload",
-  "ImGuiPlatformIO": "struct ImGuiPlatformIO",
  "ImGuiPlatformImeData": "struct ImGuiPlatformImeData",
-  "ImGuiPlatformMonitor": "struct ImGuiPlatformMonitor",
  "ImGuiPopupData": "struct ImGuiPopupData",
  "ImGuiPopupFlags": "int",
  "ImGuiPtrOrIndex": "struct ImGuiPtrOrIndex",
@@ -153,8 +145,6 @@
  "ImGuiViewportFlags": "int",
  "ImGuiViewportP": "struct ImGuiViewportP",
  "ImGuiWindow": "struct ImGuiWindow",
-  "ImGuiWindowClass": "struct ImGuiWindowClass",
-  "ImGuiWindowDockStyle": "struct ImGuiWindowDockStyle",
  "ImGuiWindowFlags": "int",
  "ImGuiWindowSettings": "struct ImGuiWindowSettings",
  "ImGuiWindowStackData": "struct ImGuiWindowStackData",
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -37,17 +37,11 @@ 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["ImGuiDebugLogFlags"] = "int"
 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"
@@ -60,7 +54,6 @@ defs["ImGuiInputEventAppFocused"] = "struct ImGuiInputEventAppFocused"
 defs["ImGuiInputEventKey"] = "struct ImGuiInputEventKey"
 defs["ImGuiInputEventMouseButton"] = "struct ImGuiInputEventMouseButton"
 defs["ImGuiInputEventMousePos"] = "struct ImGuiInputEventMousePos"
-defs["ImGuiInputEventMouseViewport"] = "struct ImGuiInputEventMouseViewport"
 defs["ImGuiInputEventMouseWheel"] = "struct ImGuiInputEventMouseWheel"
 defs["ImGuiInputEventText"] = "struct ImGuiInputEventText"
 defs["ImGuiInputFlags"] = "int"
@@ -81,6 +74,7 @@ defs["ImGuiLayoutType"] = "int"
 defs["ImGuiListClipper"] = "struct ImGuiListClipper"
 defs["ImGuiListClipperData"] = "struct ImGuiListClipperData"
 defs["ImGuiListClipperRange"] = "struct ImGuiListClipperRange"
+defs["ImGuiLocEntry"] = "struct ImGuiLocEntry"
 defs["ImGuiMemAllocFunc"] = "void*(*)(size_t sz,void* user_data);"
 defs["ImGuiMemFreeFunc"] = "void(*)(void* ptr,void* user_data);"
 defs["ImGuiMenuColumns"] = "struct ImGuiMenuColumns"
@@ -99,9 +93,7 @@ defs["ImGuiOldColumnFlags"] = "int"
 defs["ImGuiOldColumns"] = "struct ImGuiOldColumns"
 defs["ImGuiOnceUponAFrame"] = "struct ImGuiOnceUponAFrame"
 defs["ImGuiPayload"] = "struct ImGuiPayload"
-defs["ImGuiPlatformIO"] = "struct ImGuiPlatformIO"
 defs["ImGuiPlatformImeData"] = "struct ImGuiPlatformImeData"
-defs["ImGuiPlatformMonitor"] = "struct ImGuiPlatformMonitor"
 defs["ImGuiPopupData"] = "struct ImGuiPopupData"
 defs["ImGuiPopupFlags"] = "int"
 defs["ImGuiPtrOrIndex"] = "struct ImGuiPtrOrIndex"
@@ -153,8 +145,6 @@ defs["ImGuiViewport"] = "struct ImGuiViewport"
 defs["ImGuiViewportFlags"] = "int"
 defs["ImGuiViewportP"] = "struct ImGuiViewportP"
 defs["ImGuiWindow"] = "struct ImGuiWindow"
-defs["ImGuiWindowClass"] = "struct ImGuiWindowClass"
-defs["ImGuiWindowDockStyle"] = "struct ImGuiWindowDockStyle"
 defs["ImGuiWindowFlags"] = "int"
 defs["ImGuiWindowSettings"] = "struct ImGuiWindowSettings"
 defs["ImGuiWindowStackData"] = "struct ImGuiWindowStackData"
--- a/2
+++ b/2
Author	SHA1	Message	Date
sonoro1234	0348715500	pull imgui 1.89.1 and generate	2022-11-26 09:10:06 +01:00
sonoro1234	68483775b3	pull imgui 1.89.1 docking and generate	2022-11-26 08:32:02 +01:00
sonoro1234	0369ceb1b4	generator.lua: use IMGUI_VERSION_NUM	2022-11-25 10:27:13 +01:00
sonoro1234	4f089273b1	cpp2ffi.lua: changes to keep comments from struct and enums (from branch comments4000)	2022-11-16 17:13:33 +01:00
sonoro1234	b0649485e9	correcting errors on last merge: example_glfw_opengl3	2022-11-16 11:15:37 +01:00
Victor Bombi	a0a7ca3ca2	Merge pull request #224 from seafork/docking_inter Adding an example for GLFW + OpenGL	2022-11-16 11:02:33 +01:00
seafork	3e823cd2ee	fixed misspelt cmake file	2022-11-15 23:06:35 -05:00
seafork	6a2b18fa65	made glfw more portable	2022-11-15 22:59:36 -05:00
seafork	75ec483e75	fixed compilation error on windows.	2022-11-15 22:09:06 -05:00
seafork	08f24307b8	cleaned up a comment	2022-11-15 19:44:24 -05:00
seafork	a9a9fa4e9e	add example for glfw3 and opengl3	2022-11-15 19:27:21 -05:00