drop cimgui_internal.h generation

cimgui_internal.h generation
pull imgui correction for unnamed argument
2025-08-11 12:18:30 +01:00 · 2019-12-02 10:50:47 +01:00 · 2019-11-28 11:59:25 +01:00 · 2019-11-27 15:02:40 +01:00 · 2019-11-27 12:35:57 +01:00 · 2019-11-27 12:31:16 +01:00
34 changed files with 12572 additions and 6642 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,76 @@
+name: Build
+
+on:
+  push: {}
+  pull_request: {}
+  schedule:
+    - cron:  '0 9 * * 1'
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Install Dependencies
+      shell: bash
+      env:
+        GITHUB_OS: ${{ matrix.os }}
+      run: |
+        if [ "$GITHUB_OS" == "macOS-latest" ];
+        then
+          brew install luajit
+        elif [ "$GITHUB_OS" == "ubuntu-latest" ];
+        then
+          sudo apt-get install -y luajit
+        elif [ "$GITHUB_OS" == "windows-latest" ];
+        then
+          vcpkg install luajit
+        fi
+
+    - name: Download Submodules
+      run: |
+        git submodule update --init --recursive
+      if: github.event_name != 'schedule'
+
+    - name: Download Latest ImGui
+      shell: bash
+      run: |
+        rm -rf imgui
+        git clone https://github.com/ocornut/imgui.git
+      if: github.event_name == 'schedule'
+
+    - name: Generate Bindings
+      shell: bash
+      run: |
+        export PATH=$PATH:/C/vcpkg/packages/luajit_x86-windows/tools/:/C/vcpkg/packages/luajit_x86-windows/bin/
+        cd ./generator
+        bash ./generator.sh
+
+    - name: CMake
+      run: |
+        mkdir cmake-build
+        cd cmake-build
+        cmake -DCIMGUI_TEST=1 ..
+
+    - name: Build
+      working-directory: cmake-build
+      run: |
+        cmake --build .
+
+    - name: Test
+      shell: bash
+      env:
+        GITHUB_OS: ${{ matrix.os }}
+      working-directory: cmake-build
+      run: |
+        if [ "$GITHUB_OS" == "windows-latest" ];
+        then
+          ./Debug/cimgui_test.exe
+        else
+          ./cimgui_test
+        fi
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,10 @@ cimgui/cimgui.sdf
 cimgui/cimgui.v12.suo
 cimgui/Release/
 .idea
-CMakeLists.txt
 cimgui/.vs/
 cimgui/cimgui.vcxproj.user
 cimgui/x64/
+
+# Test / Build
+bld/
+build/
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,32 @@
 language: cpp
+dist: trusty

 os:
  - linux
+  - osx
+  - windows

 compiler:
  - gcc
  - clang

+env:
+  - MSBUILD_PATH="c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin"
+
 script:
-  make
+  - mkdir bld
+  - cd bld
+  - cmake -D CIMGUI_TEST=1 ..
+  - |
+    if [ "$TRAVIS_OS_NAME" == "windows" ]; then
+      export PATH=$MSBUILD_PATH:$PATH
+      MSBuild.exe cimgui.sln
+    else
+      make
+    fi
+  - |
+    if [ "$TRAVIS_OS_NAME" == "windows" ]; then
+      ./Debug/cimgui_test.exe
+    else
+      ./cimgui_test
+    fi
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,20 +1,15 @@
-Project(cimgui)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.1)
+
+project(cimgui)

 #general settings
-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)
-
-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)
+file(GLOB IMGUI_SOURCES
+    cimgui.cpp
+    imgui/imgui.cpp
+    imgui/imgui_draw.cpp
+    imgui/imgui_demo.cpp
+    imgui/imgui_widgets.cpp
+)

 set(IMGUI_STATIC "no" CACHE STRING "Build as a static library")

@@ -25,12 +20,27 @@ else (IMGUI_STATIC)
    add_library(cimgui SHARED ${IMGUI_SOURCES})
 endif (IMGUI_STATIC)

-target_link_libraries(cimgui ${IMGUI_LIBRARIES})
+target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1)
+if (WIN32)
+    target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API="extern \"C\" __declspec\(dllexport\)")
+else (WIN32)
+    target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API="extern \"C\" ")
+endif (WIN32)
+
+target_include_directories(cimgui PUBLIC ${CMAKE_SOURCE_DIR})
+target_include_directories(cimgui PUBLIC ${CMAKE_SOURCE_DIR}/imgui)
 set_target_properties(cimgui PROPERTIES PREFIX "")

 #install
 install(TARGETS cimgui
-              RUNTIME DESTINATION  .
-              LIBRARY DESTINATION  .
-              ARCHIVE DESTINATION  .
-              )
+    RUNTIME DESTINATION  .
+    LIBRARY DESTINATION  .
+    ARCHIVE DESTINATION  .
+)
+
+#test
+set(CIMGUI_TEST "no" CACHE STRING "Enable compilation of a test unit based on imgui null")
+
+if (CIMGUI_TEST)
+  add_subdirectory(test)
+endif ()
--- a/15
+++ b/15
@@ -8,7 +8,7 @@ OBJS += ./imgui/imgui_draw.o
 OBJS += ./imgui/imgui_demo.o
 OBJS += ./imgui/imgui_widgets.o

-CXXFLAGS=-O2
+CXXFLAGS=-O2 -fno-exceptions -fno-rtti

 UNAME_S := $(shell uname -s)

@@ -46,11 +46,18 @@ endif
 .cpp.o:
 	$(CXX) $(CXXFLAGS) -c -o $@ $<

-all:imgui_example
+all:$(OUTPUTNAME)
 	@echo Build complete for $(ECHO_MESSAGE)

-imgui_example:$(OBJS)
+$(OUTPUTNAME):$(OBJS)
 	$(CXX) -o $(OUTPUTNAME) $(OBJS) $(CXXFLAGS) $(LINKFLAGS)

 clean:
-	rm $(OBJS)
+	rm -f $(OBJS)
+
+fclean: clean
+	rm -f $(OUTPUTNAME)
+
+re: fclean all
+
+.PHONY: all clean fclean re
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# cimgui [![Build Status](https://travis-ci.org/sonoro1234/cimgui.svg?branch=master)](https://travis-ci.org/sonoro1234/cimgui)
+# cimgui [![Build Status](https://travis-ci.org/cimgui/cimgui.svg?branch=master)](https://travis-ci.org/cimgui/cimgui)


 This is a thin c-api wrapper programmatically generated for the excellent C++ immediate mode gui [Dear ImGui](https://github.com/ocornut/imgui).
-All functions are programmatically wrapped except `ImVector` constructors and destructors. (Unless someone find a use case for them)(Now they exist for `ImVector_ImWchar`)
+All imgui.h functions are programmatically wrapped.
 Generated files are: `cimgui.cpp`, `cimgui.h` for C compilation. Also for helping in bindings creation, `definitions.lua` with function definition information and `structs_and_enums.lua`.
 This library is intended as a intermediate layer to be able to use Dear ImGui from other languages that can interface with C (like D - see [D-binding](https://github.com/Extrawurst/DerelictImgui))

@@ -11,7 +11,9 @@ 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.66b of Dear ImGui]
+* currently this wrapper is based on version [1.74 of Dear ImGui]
+* only functions, structs and enums from imgui.h are wrapped.
+* if you are interested in imgui implementations you should look LuaJIT-ImGui project.
 * overloaded function names try to be the most compatible with traditional cimgui names. So all naming is algorithmic except for those names that were in conflict with widely used cimgui names and were thus coded in a table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L58). Current overloaded function names can be found in (https://github.com/cimgui/cimgui/blob/master/generator/output/overloads.txt)

 # compilation
@@ -25,10 +27,11 @@ Notes:

 # using generator

+* this is only needed (before compilation) if you want an imgui version different from the one provided, otherwise generation is already done.
 * you will need LuaJIT (https://github.com/LuaJIT/LuaJIT.git better 2.1 branch) or precompiled for linux/macOS/windows in https://luapower.com/luajit/download
 * you can use also a C++ compiler for doing preprocessing: gcc (In windows MinGW-W64-builds for example), clang or cl (MSVC) or not use a compiler (experimental nocompiler option) at all. (this repo was done with gcc)
 * update `imgui` folder to the version you desire.
-* edit `generator/generator.bat` (or make a .sh version and please PR) to choose between gcc, clang, cl or nocompiler. Run it with gcc, clang or cl and LuaJIT on your PATH.
+* edit `generator/generator.bat` on windows, or `generator/generator.sh` on linux, to choose between gcc, clang, cl or nocompiler. Run it with gcc, clang or cl and LuaJIT on your PATH.
 * as a result some files are generated: `cimgui.cpp` and `cimgui.h` for compiling and some lua/json files with information about the binding: `definitions.json` with function info, `structs_and_enums.json` with struct and enum info, `impl_definitions.json` with functions from the implementations info. 

 # generate binding
@@ -39,10 +42,11 @@ Notes:
 ### definitions description
 * It is a collection in which key is the cimgui name that would result without overloadings and the value is an array of overloadings (may be only one overloading)
 * Each overloading is a collection. Some relevant keys and values are:
-  * stname : the name of the struct the function belongs to (may be ImGui if it is top level in ImGui namespace)
+  * stname : the name of the struct the function belongs to (will be "" if it is top level in ImGui namespace)
  * ov_cimguiname : the overloaded cimgui name (if absent it would be taken from cimguiname)
  * cimguiname : the name without overloading (this should be used if there is not ov_cimguiname)
  * ret : the return type
+  * retref : is setted if original return type is a reference. (will be a pointer in cimgui)
  * argsT : an array of collections (each one with type: argument type and name: the argument name)
  * args : a string of argsT concatenated and separated by commas
  * call_args : a string with the argument names separated by commas for calling imgui function
@@ -50,7 +54,9 @@ Notes:
  * manual : will be true if this function is hand-written (not generated)
  * isvararg : is setted if some argument is a vararg
  * constructor : is setted if the function is a constructor for a class
-  * destructor : is setted if the functions is a destructor for a class
+  * destructor : is setted if the function is a destructor for a class
+  * templated : is setted if the function belongs to a templated class (ImVector)
+  * templatedgen: is setted if the function belongs to a struct generated from template (ImVector_ImWchar)
  * nonUDT : if present can be 1 or 2 (explained meaning in usage) if return type was a user defined type
 ### structs_and_enums description
 * Is is a collection with two items:
--- a/cimgui.cpp
+++ b/cimgui.cpp
@@ -1,10 +1,11 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.66b" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.74" from Dear ImGui https://github.com/ocornut/imgui

 #include "./imgui/imgui.h"
+#include "./imgui/imgui_internal.h"
 #include "cimgui.h"

-#include "./imgui/imgui_internal.h"
+

 CIMGUI_API ImVec2* ImVec2_ImVec2(void)
 {
@@ -46,9 +47,9 @@ CIMGUI_API void igSetCurrentContext(ImGuiContext* ctx)
 {
    return ImGui::SetCurrentContext(ctx);
 }
-CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert)
+CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert,size_t sz_drawidx)
 {
-    return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert);
+    return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert,sz_drawidx);
 }
 CIMGUI_API ImGuiIO* igGetIO()
 {
@@ -174,30 +175,6 @@ CIMGUI_API float igGetWindowHeight()
 {
    return ImGui::GetWindowHeight();
 }
-CIMGUI_API ImVec2 igGetContentRegionMax()
-{
-    return ImGui::GetContentRegionMax();
-}
-CIMGUI_API ImVec2 igGetContentRegionAvail()
-{
-    return ImGui::GetContentRegionAvail();
-}
-CIMGUI_API float igGetContentRegionAvailWidth()
-{
-    return ImGui::GetContentRegionAvailWidth();
-}
-CIMGUI_API ImVec2 igGetWindowContentRegionMin()
-{
-    return ImGui::GetWindowContentRegionMin();
-}
-CIMGUI_API ImVec2 igGetWindowContentRegionMax()
-{
-    return ImGui::GetWindowContentRegionMax();
-}
-CIMGUI_API float igGetWindowContentRegionWidth()
-{
-    return ImGui::GetWindowContentRegionWidth();
-}
 CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot)
 {
    return ImGui::SetNextWindowPos(pos,cond,pivot);
@@ -262,6 +239,26 @@ CIMGUI_API void igSetWindowFocusStr(const char* name)
 {
    return ImGui::SetWindowFocus(name);
 }
+CIMGUI_API ImVec2 igGetContentRegionMax()
+{
+    return ImGui::GetContentRegionMax();
+}
+CIMGUI_API ImVec2 igGetContentRegionAvail()
+{
+    return ImGui::GetContentRegionAvail();
+}
+CIMGUI_API ImVec2 igGetWindowContentRegionMin()
+{
+    return ImGui::GetWindowContentRegionMin();
+}
+CIMGUI_API ImVec2 igGetWindowContentRegionMax()
+{
+    return ImGui::GetWindowContentRegionMax();
+}
+CIMGUI_API float igGetWindowContentRegionWidth()
+{
+    return ImGui::GetWindowContentRegionWidth();
+}
 CIMGUI_API float igGetScrollX()
 {
    return ImGui::GetScrollX();
@@ -286,13 +283,21 @@ CIMGUI_API void igSetScrollY(float scroll_y)
 {
    return ImGui::SetScrollY(scroll_y);
 }
+CIMGUI_API void igSetScrollHereX(float center_x_ratio)
+{
+    return ImGui::SetScrollHereX(center_x_ratio);
+}
 CIMGUI_API void igSetScrollHereY(float center_y_ratio)
 {
    return ImGui::SetScrollHereY(center_y_ratio);
 }
-CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio)
+CIMGUI_API void igSetScrollFromPosX(float local_x,float center_x_ratio)
 {
-    return ImGui::SetScrollFromPosY(pos_y,center_y_ratio);
+    return ImGui::SetScrollFromPosX(local_x,center_x_ratio);
+}
+CIMGUI_API void igSetScrollFromPosY(float local_y,float center_y_ratio)
+{
+    return ImGui::SetScrollFromPosY(local_y,center_y_ratio);
 }
 CIMGUI_API void igPushFont(ImFont* font)
 {
@@ -362,13 +367,17 @@ CIMGUI_API void igPopItemWidth()
 {
    return ImGui::PopItemWidth();
 }
+CIMGUI_API void igSetNextItemWidth(float item_width)
+{
+    return ImGui::SetNextItemWidth(item_width);
+}
 CIMGUI_API float igCalcItemWidth()
 {
    return ImGui::CalcItemWidth();
 }
-CIMGUI_API void igPushTextWrapPos(float wrap_pos_x)
+CIMGUI_API void igPushTextWrapPos(float wrap_local_pos_x)
 {
-    return ImGui::PushTextWrapPos(wrap_pos_x);
+    return ImGui::PushTextWrapPos(wrap_local_pos_x);
 }
 CIMGUI_API void igPopTextWrapPos()
 {
@@ -394,9 +403,9 @@ CIMGUI_API void igSeparator()
 {
    return ImGui::Separator();
 }
-CIMGUI_API void igSameLine(float pos_x,float spacing_w)
+CIMGUI_API void igSameLine(float offset_from_start_x,float spacing)
 {
-    return ImGui::SameLine(pos_x,spacing_w);
+    return ImGui::SameLine(offset_from_start_x,spacing);
 }
 CIMGUI_API void igNewLine()
 {
@@ -442,13 +451,13 @@ CIMGUI_API void igSetCursorPos(const ImVec2 local_pos)
 {
    return ImGui::SetCursorPos(local_pos);
 }
-CIMGUI_API void igSetCursorPosX(float x)
+CIMGUI_API void igSetCursorPosX(float local_x)
 {
-    return ImGui::SetCursorPosX(x);
+    return ImGui::SetCursorPosX(local_x);
 }
-CIMGUI_API void igSetCursorPosY(float y)
+CIMGUI_API void igSetCursorPosY(float local_y)
 {
-    return ImGui::SetCursorPosY(y);
+    return ImGui::SetCursorPosY(local_y);
 }
 CIMGUI_API ImVec2 igGetCursorStartPos()
 {
@@ -458,9 +467,9 @@ CIMGUI_API ImVec2 igGetCursorScreenPos()
 {
    return ImGui::GetCursorScreenPos();
 }
-CIMGUI_API void igSetCursorScreenPos(const ImVec2 screen_pos)
+CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos)
 {
-    return ImGui::SetCursorScreenPos(screen_pos);
+    return ImGui::SetCursorScreenPos(pos);
 }
 CIMGUI_API void igAlignTextToFramePadding()
 {
@@ -692,13 +701,13 @@ CIMGUI_API bool igDragIntRange2(const char* label,int* v_current_min,int* v_curr
 {
    return ImGui::DragIntRange2(label,v_current_min,v_current_max,v_speed,v_min,v_max,format,format_max);
 }
-CIMGUI_API bool igDragScalar(const char* label,ImGuiDataType data_type,void* v,float v_speed,const void* v_min,const void* v_max,const char* format,float power)
+CIMGUI_API bool igDragScalar(const char* label,ImGuiDataType data_type,void* p_data,float v_speed,const void* p_min,const void* p_max,const char* format,float power)
 {
-    return ImGui::DragScalar(label,data_type,v,v_speed,v_min,v_max,format,power);
+    return ImGui::DragScalar(label,data_type,p_data,v_speed,p_min,p_max,format,power);
 }
-CIMGUI_API bool igDragScalarN(const char* label,ImGuiDataType data_type,void* v,int components,float v_speed,const void* v_min,const void* v_max,const char* format,float power)
+CIMGUI_API bool igDragScalarN(const char* label,ImGuiDataType data_type,void* p_data,int components,float v_speed,const void* p_min,const void* p_max,const char* format,float power)
 {
-    return ImGui::DragScalarN(label,data_type,v,components,v_speed,v_min,v_max,format,power);
+    return ImGui::DragScalarN(label,data_type,p_data,components,v_speed,p_min,p_max,format,power);
 }
 CIMGUI_API bool igSliderFloat(const char* label,float* v,float v_min,float v_max,const char* format,float power)
 {
@@ -736,13 +745,13 @@ CIMGUI_API bool igSliderInt4(const char* label,int v[4],int v_min,int v_max,cons
 {
    return ImGui::SliderInt4(label,v,v_min,v_max,format);
 }
-CIMGUI_API bool igSliderScalar(const char* label,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)
+CIMGUI_API bool igSliderScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format,float power)
 {
-    return ImGui::SliderScalar(label,data_type,v,v_min,v_max,format,power);
+    return ImGui::SliderScalar(label,data_type,p_data,p_min,p_max,format,power);
 }
-CIMGUI_API bool igSliderScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* v_min,const void* v_max,const char* format,float power)
+CIMGUI_API bool igSliderScalarN(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_min,const void* p_max,const char* format,float power)
 {
-    return ImGui::SliderScalarN(label,data_type,v,components,v_min,v_max,format,power);
+    return ImGui::SliderScalarN(label,data_type,p_data,components,p_min,p_max,format,power);
 }
 CIMGUI_API bool igVSliderFloat(const char* label,const ImVec2 size,float* v,float v_min,float v_max,const char* format,float power)
 {
@@ -752,9 +761,9 @@ CIMGUI_API bool igVSliderInt(const char* label,const ImVec2 size,int* v,int v_mi
 {
    return ImGui::VSliderInt(label,size,v,v_min,v_max,format);
 }
-CIMGUI_API bool igVSliderScalar(const char* label,const ImVec2 size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)
+CIMGUI_API bool igVSliderScalar(const char* label,const ImVec2 size,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format,float power)
 {
-    return ImGui::VSliderScalar(label,size,data_type,v,v_min,v_max,format,power);
+    return ImGui::VSliderScalar(label,size,data_type,p_data,p_min,p_max,format,power);
 }
 CIMGUI_API bool igInputText(const char* label,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)
 {
@@ -764,49 +773,53 @@ CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size
 {
    return ImGui::InputTextMultiline(label,buf,buf_size,size,flags,callback,user_data);
 }
-CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)
 {
-    return ImGui::InputFloat(label,v,step,step_fast,format,extra_flags);
+    return ImGui::InputTextWithHint(label,hint,buf,buf_size,flags,callback,user_data);
 }
-CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat2(label,v,format,extra_flags);
+    return ImGui::InputFloat(label,v,step,step_fast,format,flags);
 }
-CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat3(label,v,format,extra_flags);
+    return ImGui::InputFloat2(label,v,format,flags);
 }
-CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat4(label,v,format,extra_flags);
+    return ImGui::InputFloat3(label,v,format,flags);
 }
-CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt(label,v,step,step_fast,extra_flags);
+    return ImGui::InputFloat4(label,v,format,flags);
 }
-CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt2(label,v,extra_flags);
+    return ImGui::InputInt(label,v,step,step_fast,flags);
 }
-CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt3(label,v,extra_flags);
+    return ImGui::InputInt2(label,v,flags);
 }
-CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt4(label,v,extra_flags);
+    return ImGui::InputInt3(label,v,flags);
 }
-CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputDouble(label,v,step,step_fast,format,extra_flags);
+    return ImGui::InputInt4(label,v,flags);
 }
-CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputScalar(label,data_type,v,step,step_fast,format,extra_flags);
+    return ImGui::InputDouble(label,v,step,step_fast,format,flags);
 }
-CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_step,const void* p_step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputScalarN(label,data_type,v,components,step,step_fast,format,extra_flags);
+    return ImGui::InputScalar(label,data_type,p_data,p_step,p_step_fast,format,flags);
+}
+CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_step,const void* p_step_fast,const char* format,ImGuiInputTextFlags flags)
+{
+    return ImGui::InputScalarN(label,data_type,p_data,components,p_step,p_step_fast,format,flags);
 }
 CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags)
 {
@@ -900,18 +913,10 @@ CIMGUI_API void igTreePop()
 {
    return ImGui::TreePop();
 }
-CIMGUI_API void igTreeAdvanceToLabelPos()
-{
-    return ImGui::TreeAdvanceToLabelPos();
-}
 CIMGUI_API float igGetTreeNodeToLabelSpacing()
 {
    return ImGui::GetTreeNodeToLabelSpacing();
 }
-CIMGUI_API void igSetNextTreeNodeOpen(bool is_open,ImGuiCond cond)
-{
-    return ImGui::SetNextTreeNodeOpen(is_open,cond);
-}
 CIMGUI_API bool igCollapsingHeader(const char* label,ImGuiTreeNodeFlags flags)
 {
    return ImGui::CollapsingHeader(label,flags);
@@ -920,6 +925,10 @@ CIMGUI_API bool igCollapsingHeaderBoolPtr(const char* label,bool* p_open,ImGuiTr
 {
    return ImGui::CollapsingHeader(label,p_open,flags);
 }
+CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond)
+{
+    return ImGui::SetNextItemOpen(is_open,cond);
+}
 CIMGUI_API bool igSelectable(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size)
 {
    return ImGui::Selectable(label,selected,flags,size);
@@ -980,14 +989,6 @@ CIMGUI_API void igValueFloat(const char* prefix,float v,const char* float_format
 {
    return ImGui::Value(prefix,v,float_format);
 }
-CIMGUI_API bool igBeginMainMenuBar()
-{
-    return ImGui::BeginMainMenuBar();
-}
-CIMGUI_API void igEndMainMenuBar()
-{
-    return ImGui::EndMainMenuBar();
-}
 CIMGUI_API bool igBeginMenuBar()
 {
    return ImGui::BeginMenuBar();
@@ -996,6 +997,14 @@ CIMGUI_API void igEndMenuBar()
 {
    return ImGui::EndMenuBar();
 }
+CIMGUI_API bool igBeginMainMenuBar()
+{
+    return ImGui::BeginMainMenuBar();
+}
+CIMGUI_API void igEndMainMenuBar()
+{
+    return ImGui::EndMainMenuBar();
+}
 CIMGUI_API bool igBeginMenu(const char* label,bool enabled)
 {
    return ImGui::BeginMenu(label,enabled);
@@ -1103,17 +1112,37 @@ CIMGUI_API int igGetColumnsCount()
 {
    return ImGui::GetColumnsCount();
 }
-CIMGUI_API void igLogToTTY(int max_depth)
+CIMGUI_API bool igBeginTabBar(const char* str_id,ImGuiTabBarFlags flags)
 {
-    return ImGui::LogToTTY(max_depth);
+    return ImGui::BeginTabBar(str_id,flags);
 }
-CIMGUI_API void igLogToFile(int max_depth,const char* filename)
+CIMGUI_API void igEndTabBar()
 {
-    return ImGui::LogToFile(max_depth,filename);
+    return ImGui::EndTabBar();
 }
-CIMGUI_API void igLogToClipboard(int max_depth)
+CIMGUI_API bool igBeginTabItem(const char* label,bool* p_open,ImGuiTabItemFlags flags)
 {
-    return ImGui::LogToClipboard(max_depth);
+    return ImGui::BeginTabItem(label,p_open,flags);
+}
+CIMGUI_API void igEndTabItem()
+{
+    return ImGui::EndTabItem();
+}
+CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label)
+{
+    return ImGui::SetTabItemClosed(tab_or_docked_window_label);
+}
+CIMGUI_API void igLogToTTY(int auto_open_depth)
+{
+    return ImGui::LogToTTY(auto_open_depth);
+}
+CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename)
+{
+    return ImGui::LogToFile(auto_open_depth,filename);
+}
+CIMGUI_API void igLogToClipboard(int auto_open_depth)
+{
+    return ImGui::LogToClipboard(auto_open_depth);
 }
 CIMGUI_API void igLogFinish()
 {
@@ -1127,9 +1156,9 @@ CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags)
 {
    return ImGui::BeginDragDropSource(flags);
 }
-CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t size,ImGuiCond cond)
+CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond)
 {
-    return ImGui::SetDragDropPayload(type,data,size,cond);
+    return ImGui::SetDragDropPayload(type,data,sz,cond);
 }
 CIMGUI_API void igEndDragDropSource()
 {
@@ -1191,6 +1220,10 @@ CIMGUI_API bool igIsItemEdited()
 {
    return ImGui::IsItemEdited();
 }
+CIMGUI_API bool igIsItemActivated()
+{
+    return ImGui::IsItemActivated();
+}
 CIMGUI_API bool igIsItemDeactivated()
 {
    return ImGui::IsItemDeactivated();
@@ -1199,6 +1232,10 @@ CIMGUI_API bool igIsItemDeactivatedAfterEdit()
 {
    return ImGui::IsItemDeactivatedAfterEdit();
 }
+CIMGUI_API bool igIsItemToggledOpen()
+{
+    return ImGui::IsItemToggledOpen();
+}
 CIMGUI_API bool igIsAnyItemHovered()
 {
    return ImGui::IsAnyItemHovered();
@@ -1243,9 +1280,13 @@ CIMGUI_API int igGetFrameCount()
 {
    return ImGui::GetFrameCount();
 }
-CIMGUI_API ImDrawList* igGetOverlayDrawList()
+CIMGUI_API ImDrawList* igGetBackgroundDrawList()
 {
-    return ImGui::GetOverlayDrawList();
+    return ImGui::GetBackgroundDrawList();
+}
+CIMGUI_API ImDrawList* igGetForegroundDrawList()
+{
+    return ImGui::GetForegroundDrawList();
 }
 CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData()
 {
@@ -1363,13 +1404,13 @@ CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type)
 {
    return ImGui::SetMouseCursor(type);
 }
-CIMGUI_API void igCaptureKeyboardFromApp(bool capture)
+CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value)
 {
-    return ImGui::CaptureKeyboardFromApp(capture);
+    return ImGui::CaptureKeyboardFromApp(want_capture_keyboard_value);
 }
-CIMGUI_API void igCaptureMouseFromApp(bool capture)
+CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value)
 {
-    return ImGui::CaptureMouseFromApp(capture);
+    return ImGui::CaptureMouseFromApp(want_capture_mouse_value);
 }
 CIMGUI_API const char* igGetClipboardText()
 {
@@ -1419,13 +1460,13 @@ CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor)
 {
    return self->ScaleAllSizes(scale_factor);
 }
-CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,ImWchar c)
+CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,unsigned int c)
 {
    return self->AddInputCharacter(c);
 }
-CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* utf8_chars)
+CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* str)
 {
-    return self->AddInputCharactersUTF8(utf8_chars);
+    return self->AddInputCharactersUTF8(str);
 }
 CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self)
 {
@@ -1519,31 +1560,23 @@ CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self)
 {
    return self->IsActive();
 }
-CIMGUI_API TextRange* TextRange_TextRange(void)
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRange(void)
 {
-    return IM_NEW(TextRange)();
+    return IM_NEW(ImGuiTextRange)();
 }
-CIMGUI_API void TextRange_destroy(TextRange* self)
+CIMGUI_API void ImGuiTextRange_destroy(ImGuiTextRange* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API TextRange* TextRange_TextRangeStr(const char* _b,const char* _e)
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeStr(const char* _b,const char* _e)
 {
-    return IM_NEW(TextRange)(_b,_e);
+    return IM_NEW(ImGuiTextRange)(_b,_e);
 }
-CIMGUI_API const char* TextRange_begin(TextRange* self)
-{
-    return self->begin();
-}
-CIMGUI_API const char* TextRange_end(TextRange* self)
-{
-    return self->end();
-}
-CIMGUI_API bool TextRange_empty(TextRange* self)
+CIMGUI_API bool ImGuiTextRange_empty(ImGuiTextRange* self)
 {
    return self->empty();
 }
-CIMGUI_API void TextRange_split(TextRange* self,char separator,ImVector_TextRange* out)
+CIMGUI_API void ImGuiTextRange_split(ImGuiTextRange* self,char separator,ImVector_ImGuiTextRange* out)
 {
    return self->split(separator,out);
 }
@@ -1583,25 +1616,29 @@ CIMGUI_API const char* ImGuiTextBuffer_c_str(ImGuiTextBuffer* self)
 {
    return self->c_str();
 }
+CIMGUI_API void ImGuiTextBuffer_append(ImGuiTextBuffer* self,const char* str,const char* str_end)
+{
+    return self->append(str,str_end);
+}
 CIMGUI_API void ImGuiTextBuffer_appendfv(ImGuiTextBuffer* self,const char* fmt,va_list args)
 {
    return self->appendfv(fmt,args);
 }
-CIMGUI_API Pair* Pair_PairInt(ImGuiID _key,int _val_i)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairInt(ImGuiID _key,int _val_i)
 {
-    return IM_NEW(Pair)(_key,_val_i);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_i);
 }
-CIMGUI_API void Pair_destroy(Pair* self)
+CIMGUI_API void ImGuiStoragePair_destroy(ImGuiStoragePair* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API Pair* Pair_PairFloat(ImGuiID _key,float _val_f)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairFloat(ImGuiID _key,float _val_f)
 {
-    return IM_NEW(Pair)(_key,_val_f);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_f);
 }
-CIMGUI_API Pair* Pair_PairPtr(ImGuiID _key,void* _val_p)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairPtr(ImGuiID _key,void* _val_p)
 {
-    return IM_NEW(Pair)(_key,_val_p);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_p);
 }
 CIMGUI_API void ImGuiStorage_Clear(ImGuiStorage* self)
 {
@@ -1723,6 +1760,34 @@ CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self)
 {
    IM_DELETE(self);
 }
+CIMGUI_API ImDrawListSplitter* ImDrawListSplitter_ImDrawListSplitter(void)
+{
+    return IM_NEW(ImDrawListSplitter)();
+}
+CIMGUI_API void ImDrawListSplitter_destroy(ImDrawListSplitter* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImDrawListSplitter_Clear(ImDrawListSplitter* self)
+{
+    return self->Clear();
+}
+CIMGUI_API void ImDrawListSplitter_ClearFreeMemory(ImDrawListSplitter* self)
+{
+    return self->ClearFreeMemory();
+}
+CIMGUI_API void ImDrawListSplitter_Split(ImDrawListSplitter* self,ImDrawList* draw_list,int count)
+{
+    return self->Split(draw_list,count);
+}
+CIMGUI_API void ImDrawListSplitter_Merge(ImDrawListSplitter* self,ImDrawList* draw_list)
+{
+    return self->Merge(draw_list);
+}
+CIMGUI_API void ImDrawListSplitter_SetCurrentChannel(ImDrawListSplitter* self,ImDrawList* draw_list,int channel_idx)
+{
+    return self->SetCurrentChannel(draw_list,channel_idx);
+}
 CIMGUI_API ImDrawList* ImDrawList_ImDrawList(const ImDrawListSharedData* shared_data)
 {
    return IM_NEW(ImDrawList)(shared_data);
@@ -1759,45 +1824,45 @@ CIMGUI_API ImVec2 ImDrawList_GetClipRectMax(ImDrawList* self)
 {
    return self->GetClipRectMax();
 }
-CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness)
 {
-    return self->AddLine(a,b,col,thickness);
+    return self->AddLine(p1,p2,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags,float thickness)
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness)
 {
-    return self->AddRect(a,b,col,rounding,rounding_corners_flags,thickness);
+    return self->AddRect(p_min,p_max,col,rounding,rounding_corners,thickness);
 }
-CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags)
+CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
 {
-    return self->AddRectFilled(a,b,col,rounding,rounding_corners_flags);
+    return self->AddRectFilled(p_min,p_max,col,rounding,rounding_corners);
 }
-CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left)
+CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left)
 {
-    return self->AddRectFilledMultiColor(a,b,col_upr_left,col_upr_right,col_bot_right,col_bot_left);
+    return self->AddRectFilledMultiColor(p_min,p_max,col_upr_left,col_upr_right,col_bot_right,col_bot_left);
 }
-CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness)
 {
-    return self->AddQuad(a,b,c,d,col,thickness);
+    return self->AddQuad(p1,p2,p3,p4,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col)
+CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col)
 {
-    return self->AddQuadFilled(a,b,c,d,col);
+    return self->AddQuadFilled(p1,p2,p3,p4,col);
 }
-CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col,float thickness)
 {
-    return self->AddTriangle(a,b,c,col,thickness);
+    return self->AddTriangle(p1,p2,p3,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col)
+CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col)
 {
-    return self->AddTriangleFilled(a,b,c,col);
+    return self->AddTriangleFilled(p1,p2,p3,col);
 }
-CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments,float thickness)
+CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness)
 {
-    return self->AddCircle(centre,radius,col,num_segments,thickness);
+    return self->AddCircle(center,radius,col,num_segments,thickness);
 }
-CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments)
+CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments)
 {
-    return self->AddCircleFilled(centre,radius,col,num_segments);
+    return self->AddCircleFilled(center,radius,col,num_segments);
 }
 CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end)
 {
@@ -1807,23 +1872,11 @@ CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,fl
 {
    return self->AddText(font,font_size,pos,col,text_begin,text_end,wrap_width,cpu_fine_clip_rect);
 }
-CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col)
-{
-    return self->AddImage(user_texture_id,a,b,uv_a,uv_b,col);
-}
-CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,const ImVec2 uv_a,const ImVec2 uv_b,const ImVec2 uv_c,const ImVec2 uv_d,ImU32 col)
-{
-    return self->AddImageQuad(user_texture_id,a,b,c,d,uv_a,uv_b,uv_c,uv_d,col);
-}
-CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col,float rounding,int rounding_corners)
-{
-    return self->AddImageRounded(user_texture_id,a,b,uv_a,uv_b,col,rounding,rounding_corners);
-}
-CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness)
+CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)
 {
    return self->AddPolyline(points,num_points,col,closed,thickness);
 }
-CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col)
+CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col)
 {
    return self->AddConvexPolyFilled(points,num_points,col);
 }
@@ -1831,6 +1884,18 @@ CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,con
 {
    return self->AddBezierCurve(pos0,cp0,cp1,pos1,col,thickness,num_segments);
 }
+CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col)
+{
+    return self->AddImage(user_texture_id,p_min,p_max,uv_min,uv_max,col);
+}
+CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,const ImVec2 uv1,const ImVec2 uv2,const ImVec2 uv3,const ImVec2 uv4,ImU32 col)
+{
+    return self->AddImageQuad(user_texture_id,p1,p2,p3,p4,uv1,uv2,uv3,uv4,col);
+}
+CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
+{
+    return self->AddImageRounded(user_texture_id,p_min,p_max,uv_min,uv_max,col,rounding,rounding_corners);
+}
 CIMGUI_API void ImDrawList_PathClear(ImDrawList* self)
 {
    return self->PathClear();
@@ -1851,33 +1916,21 @@ CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,flo
 {
    return self->PathStroke(col,closed,thickness);
 }
-CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 centre,float radius,float a_min,float a_max,int num_segments)
+CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments)
 {
-    return self->PathArcTo(centre,radius,a_min,a_max,num_segments);
+    return self->PathArcTo(center,radius,a_min,a_max,num_segments);
 }
-CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 centre,float radius,int a_min_of_12,int a_max_of_12)
+CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,float radius,int a_min_of_12,int a_max_of_12)
 {
-    return self->PathArcToFast(centre,radius,a_min_of_12,a_max_of_12);
+    return self->PathArcToFast(center,radius,a_min_of_12,a_max_of_12);
 }
 CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,int num_segments)
 {
    return self->PathBezierCurveTo(p1,p2,p3,num_segments);
 }
-CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,int rounding_corners_flags)
+CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners)
 {
-    return self->PathRect(rect_min,rect_max,rounding,rounding_corners_flags);
-}
-CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int channels_count)
-{
-    return self->ChannelsSplit(channels_count);
-}
-CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self)
-{
-    return self->ChannelsMerge();
-}
-CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int channel_index)
-{
-    return self->ChannelsSetCurrent(channel_index);
+    return self->PathRect(rect_min,rect_max,rounding,rounding_corners);
 }
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data)
 {
@@ -1891,6 +1944,18 @@ CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self)
 {
    return self->CloneOutput();
 }
+CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int count)
+{
+    return self->ChannelsSplit(count);
+}
+CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self)
+{
+    return self->ChannelsMerge();
+}
+CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int n)
+{
+    return self->ChannelsSetCurrent(n);
+}
 CIMGUI_API void ImDrawList_Clear(ImDrawList* self)
 {
    return self->Clear();
@@ -1951,9 +2016,9 @@ CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* self)
 {
    return self->DeIndexAllBuffers();
 }
-CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 sc)
+CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 fb_scale)
 {
-    return self->ScaleClipRects(sc);
+    return self->ScaleClipRects(fb_scale);
 }
 CIMGUI_API ImFontConfig* ImFontConfig_ImFontConfig(void)
 {
@@ -1963,6 +2028,54 @@ CIMGUI_API void ImFontConfig_destroy(ImFontConfig* self)
 {
    IM_DELETE(self);
 }
+CIMGUI_API ImFontGlyphRangesBuilder* ImFontGlyphRangesBuilder_ImFontGlyphRangesBuilder(void)
+{
+    return IM_NEW(ImFontGlyphRangesBuilder)();
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_destroy(ImFontGlyphRangesBuilder* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_Clear(ImFontGlyphRangesBuilder* self)
+{
+    return self->Clear();
+}
+CIMGUI_API bool ImFontGlyphRangesBuilder_GetBit(ImFontGlyphRangesBuilder* self,int n)
+{
+    return self->GetBit(n);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_SetBit(ImFontGlyphRangesBuilder* self,int n)
+{
+    return self->SetBit(n);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddChar(ImFontGlyphRangesBuilder* self,ImWchar c)
+{
+    return self->AddChar(c);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddText(ImFontGlyphRangesBuilder* self,const char* text,const char* text_end)
+{
+    return self->AddText(text,text_end);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddRanges(ImFontGlyphRangesBuilder* self,const ImWchar* ranges)
+{
+    return self->AddRanges(ranges);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_BuildRanges(ImFontGlyphRangesBuilder* self,ImVector_ImWchar* out_ranges)
+{
+    return self->BuildRanges(out_ranges);
+}
+CIMGUI_API ImFontAtlasCustomRect* ImFontAtlasCustomRect_ImFontAtlasCustomRect(void)
+{
+    return IM_NEW(ImFontAtlasCustomRect)();
+}
+CIMGUI_API void ImFontAtlasCustomRect_destroy(ImFontAtlasCustomRect* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API bool ImFontAtlasCustomRect_IsPacked(ImFontAtlasCustomRect* self)
+{
+    return self->IsPacked();
+}
 CIMGUI_API ImFontAtlas* ImFontAtlas_ImFontAtlas(void)
 {
    return IM_NEW(ImFontAtlas)();
@@ -2015,10 +2128,6 @@ CIMGUI_API bool ImFontAtlas_Build(ImFontAtlas* self)
 {
    return self->Build();
 }
-CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self)
-{
-    return self->IsBuilt();
-}
 CIMGUI_API void ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* self,unsigned char** out_pixels,int* out_width,int* out_height,int* out_bytes_per_pixel)
 {
    return self->GetTexDataAsAlpha8(out_pixels,out_width,out_height,out_bytes_per_pixel);
@@ -2027,6 +2136,10 @@ CIMGUI_API void ImFontAtlas_GetTexDataAsRGBA32(ImFontAtlas* self,unsigned char**
 {
    return self->GetTexDataAsRGBA32(out_pixels,out_width,out_height,out_bytes_per_pixel);
 }
+CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self)
+{
+    return self->IsBuilt();
+}
 CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* self,ImTextureID id)
 {
    return self->SetTexID(id);
@@ -2059,49 +2172,9 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self)
 {
    return self->GetGlyphRangesThai();
 }
-CIMGUI_API GlyphRangesBuilder* GlyphRangesBuilder_GlyphRangesBuilder(void)
+CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self)
 {
-    return IM_NEW(GlyphRangesBuilder)();
-}
-CIMGUI_API void GlyphRangesBuilder_destroy(GlyphRangesBuilder* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API bool GlyphRangesBuilder_GetBit(GlyphRangesBuilder* self,int n)
-{
-    return self->GetBit(n);
-}
-CIMGUI_API void GlyphRangesBuilder_SetBit(GlyphRangesBuilder* self,int n)
-{
-    return self->SetBit(n);
-}
-CIMGUI_API void GlyphRangesBuilder_AddChar(GlyphRangesBuilder* self,ImWchar c)
-{
-    return self->AddChar(c);
-}
-CIMGUI_API void GlyphRangesBuilder_AddText(GlyphRangesBuilder* self,const char* text,const char* text_end)
-{
-    return self->AddText(text,text_end);
-}
-CIMGUI_API void GlyphRangesBuilder_AddRanges(GlyphRangesBuilder* self,const ImWchar* ranges)
-{
-    return self->AddRanges(ranges);
-}
-CIMGUI_API void GlyphRangesBuilder_BuildRanges(GlyphRangesBuilder* self,ImVector_ImWchar* out_ranges)
-{
-    return self->BuildRanges(out_ranges);
-}
-CIMGUI_API CustomRect* CustomRect_CustomRect(void)
-{
-    return IM_NEW(CustomRect)();
-}
-CIMGUI_API void CustomRect_destroy(CustomRect* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API bool CustomRect_IsPacked(CustomRect* self)
-{
-    return self->IsPacked();
+    return self->GetGlyphRangesVietnamese();
 }
 CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,unsigned int id,int width,int height)
 {
@@ -2111,11 +2184,11 @@ CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font
 {
    return self->AddCustomRectFontGlyph(font,id,width,height,advance_x,offset);
 }
-CIMGUI_API const CustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index)
+CIMGUI_API const ImFontAtlasCustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index)
 {
    return self->GetCustomRectByIndex(index);
 }
-CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const CustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max)
+CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const ImFontAtlasCustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max)
 {
    return self->CalcCustomRectUV(rect,out_uv_min,out_uv_max);
 }
@@ -2131,14 +2204,6 @@ CIMGUI_API void ImFont_destroy(ImFont* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
-{
-    return self->ClearOutputData();
-}
-CIMGUI_API void ImFont_BuildLookupTable(ImFont* self)
-{
-    return self->BuildLookupTable();
-}
 CIMGUI_API const ImFontGlyph* ImFont_FindGlyph(ImFont* self,ImWchar c)
 {
    return self->FindGlyph(c);
@@ -2147,10 +2212,6 @@ CIMGUI_API const ImFontGlyph* ImFont_FindGlyphNoFallback(ImFont* self,ImWchar c)
 {
    return self->FindGlyphNoFallback(c);
 }
-CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
-{
-    return self->SetFallbackChar(c);
-}
 CIMGUI_API float ImFont_GetCharAdvance(ImFont* self,ImWchar c)
 {
    return self->GetCharAdvance(c);
@@ -2179,6 +2240,14 @@ CIMGUI_API void ImFont_RenderText(ImFont* self,ImDrawList* draw_list,float size,
 {
    return self->RenderText(draw_list,size,pos,col,clip_rect,text_begin,text_end,wrap_width,cpu_fine_clip);
 }
+CIMGUI_API void ImFont_BuildLookupTable(ImFont* self)
+{
+    return self->BuildLookupTable();
+}
+CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
+{
+    return self->ClearOutputData();
+}
 CIMGUI_API void ImFont_GrowIndex(ImFont* self,int new_size)
 {
    return self->GrowIndex(new_size);
@@ -2191,6 +2260,10 @@ CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool ov
 {
    return self->AddRemapChar(dst,src,overwrite_dst);
 }
+CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
+{
+    return self->SetFallbackChar(c);
+}
 CIMGUI_API void igGetWindowPos_nonUDT(ImVec2 *pOut)
 {
    *pOut = ImGui::GetWindowPos();
@@ -2450,10 +2523,12 @@ CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 {
 	return IM_NEW(ImVector<ImWchar>) ();
 }
-CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p)
+
+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self)
 {
-	IM_DELETE(p);
+    IM_DELETE(self);
 }
+
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p)
 {
 	IM_PLACEMENT_NEW(p) ImVector<ImWchar>();
--- a/cimgui.h
+++ b/cimgui.h
--- a/generator/cimgui_template.cpp
+++ b/generator/cimgui_template.cpp
@@ -1,8 +1,9 @@

 #include "./imgui/imgui.h"
+#include "./imgui/imgui_internal.h"
 #include "cimgui.h"

-#include "./imgui/imgui_internal.h"
+

 #include "auto_funcs.cpp"

@@ -43,10 +44,12 @@ CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 {
 	return IM_NEW(ImVector<ImWchar>) ();
 }
-CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p)
+
+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self)
 {
-	IM_DELETE(p);
+    IM_DELETE(self);
 }
+
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p)
 {
 	IM_PLACEMENT_NEW(p) ImVector<ImWchar>();
--- a/generator/cimgui_template.h
+++ b/generator/cimgui_template.h
@@ -83,7 +83,7 @@ CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,floa
 CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);

 CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create();
-CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p);
+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self);
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);
 #endif //CIMGUI_INCLUDED
--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
--- a/generator/generator.bat
+++ b/generator/generator.bat
@@ -10,7 +10,7 @@
 :: impl_definitions.lua for implementation function definitions

 :: set your PATH if necessary for LuaJIT or Lua5.1 or luajit with: (for example)
-:: set PATH=%PATH%;C:\luaGL;C:\mingw32\bin;
+set PATH=%PATH%;C:\luaGL;C:\mingw32\bin;
 :: set PATH=%PATH%;C:\luaGL;C:\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\mingw32\bin;
 :: set PATH=%PATH%;C:\luaGL\sources\luajit-master\luajit-master\bin\mingw32;C:\mingw32\bin;
 ::process  files
--- a/generator/generator.lua
+++ b/generator/generator.lua
--- a/generator/generator.sh
+++ b/generator/generator.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/sh
+
+# this script must be executed in this directory
+# all the output goes to generator/output folder
+# .cpp and .h files:
+# cimgui.h and cimgui.cpp with gcc preprocess
+# cimgui_nopreprocess.h and cimgui_nopreprocess.cpp generated without preprocess
+# cimgui_impl.h with implementation function cdefs
+# lua and json files:
+# definitions.lua for function definitions
+# structs_and_enums.lua with struct and enum information-definitions
+# impl_definitions.lua for implementation function definitions
+
+#process  files
+# arg[1] compiler name gcc, clang, cl or nocompiler
+# arg[2..n] name of implementations to generate
+luajit ./generator.lua gcc glfw opengl3 opengl2 sdl
--- a/generator/generator_old.bat
+++ b/generator/generator_old.bat
@@ -0,0 +1,23 @@
+:: this script must be executed in this directory
+:: all the output goes to generator/output folder
+:: .cpp and .h files:
+:: cimgui.h and cimgui.cpp with gcc preprocess
+:: cimgui_nopreprocess.h and cimgui_nopreprocess.cpp generated without preprocess
+:: cimgui_impl.h with implementation function cdefs
+:: lua and json files:
+:: definitions.lua for function definitions
+:: structs_and_enums.lua with struct and enum information-definitions
+:: impl_definitions.lua for implementation function definitions
+
+:: set your PATH if necessary for LuaJIT or Lua5.1 or luajit with: (for example)
+set PATH=%PATH%;C:\luaGL;C:\mingw32\bin;
+:: set PATH=%PATH%;C:\luaGL;C:\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\mingw32\bin;
+:: set PATH=%PATH%;C:\luaGL\sources\luajit-master\luajit-master\bin\mingw32;C:\mingw32\bin;
+::process  files
+:: arg[1] compiler name gcc, clang, cl or nocompiler
+:: arg[2..n] name of implementations to generate
+luajit ./generator_old.lua gcc glfw opengl3 opengl2 sdl
+
+::leave console open
+cmd /k
+
--- a/generator/generator_old.lua
+++ b/generator/generator_old.lua
--- a/generator/output/cimgui.cpp
+++ b/generator/output/cimgui.cpp
@@ -1,10 +1,11 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.66b" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.74" from Dear ImGui https://github.com/ocornut/imgui

 #include "./imgui/imgui.h"
+#include "./imgui/imgui_internal.h"
 #include "cimgui.h"

-#include "./imgui/imgui_internal.h"
+

 CIMGUI_API ImVec2* ImVec2_ImVec2(void)
 {
@@ -46,9 +47,9 @@ CIMGUI_API void igSetCurrentContext(ImGuiContext* ctx)
 {
    return ImGui::SetCurrentContext(ctx);
 }
-CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert)
+CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert,size_t sz_drawidx)
 {
-    return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert);
+    return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert,sz_drawidx);
 }
 CIMGUI_API ImGuiIO* igGetIO()
 {
@@ -174,30 +175,6 @@ CIMGUI_API float igGetWindowHeight()
 {
    return ImGui::GetWindowHeight();
 }
-CIMGUI_API ImVec2 igGetContentRegionMax()
-{
-    return ImGui::GetContentRegionMax();
-}
-CIMGUI_API ImVec2 igGetContentRegionAvail()
-{
-    return ImGui::GetContentRegionAvail();
-}
-CIMGUI_API float igGetContentRegionAvailWidth()
-{
-    return ImGui::GetContentRegionAvailWidth();
-}
-CIMGUI_API ImVec2 igGetWindowContentRegionMin()
-{
-    return ImGui::GetWindowContentRegionMin();
-}
-CIMGUI_API ImVec2 igGetWindowContentRegionMax()
-{
-    return ImGui::GetWindowContentRegionMax();
-}
-CIMGUI_API float igGetWindowContentRegionWidth()
-{
-    return ImGui::GetWindowContentRegionWidth();
-}
 CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot)
 {
    return ImGui::SetNextWindowPos(pos,cond,pivot);
@@ -262,6 +239,26 @@ CIMGUI_API void igSetWindowFocusStr(const char* name)
 {
    return ImGui::SetWindowFocus(name);
 }
+CIMGUI_API ImVec2 igGetContentRegionMax()
+{
+    return ImGui::GetContentRegionMax();
+}
+CIMGUI_API ImVec2 igGetContentRegionAvail()
+{
+    return ImGui::GetContentRegionAvail();
+}
+CIMGUI_API ImVec2 igGetWindowContentRegionMin()
+{
+    return ImGui::GetWindowContentRegionMin();
+}
+CIMGUI_API ImVec2 igGetWindowContentRegionMax()
+{
+    return ImGui::GetWindowContentRegionMax();
+}
+CIMGUI_API float igGetWindowContentRegionWidth()
+{
+    return ImGui::GetWindowContentRegionWidth();
+}
 CIMGUI_API float igGetScrollX()
 {
    return ImGui::GetScrollX();
@@ -286,13 +283,21 @@ CIMGUI_API void igSetScrollY(float scroll_y)
 {
    return ImGui::SetScrollY(scroll_y);
 }
+CIMGUI_API void igSetScrollHereX(float center_x_ratio)
+{
+    return ImGui::SetScrollHereX(center_x_ratio);
+}
 CIMGUI_API void igSetScrollHereY(float center_y_ratio)
 {
    return ImGui::SetScrollHereY(center_y_ratio);
 }
-CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio)
+CIMGUI_API void igSetScrollFromPosX(float local_x,float center_x_ratio)
 {
-    return ImGui::SetScrollFromPosY(pos_y,center_y_ratio);
+    return ImGui::SetScrollFromPosX(local_x,center_x_ratio);
+}
+CIMGUI_API void igSetScrollFromPosY(float local_y,float center_y_ratio)
+{
+    return ImGui::SetScrollFromPosY(local_y,center_y_ratio);
 }
 CIMGUI_API void igPushFont(ImFont* font)
 {
@@ -362,13 +367,17 @@ CIMGUI_API void igPopItemWidth()
 {
    return ImGui::PopItemWidth();
 }
+CIMGUI_API void igSetNextItemWidth(float item_width)
+{
+    return ImGui::SetNextItemWidth(item_width);
+}
 CIMGUI_API float igCalcItemWidth()
 {
    return ImGui::CalcItemWidth();
 }
-CIMGUI_API void igPushTextWrapPos(float wrap_pos_x)
+CIMGUI_API void igPushTextWrapPos(float wrap_local_pos_x)
 {
-    return ImGui::PushTextWrapPos(wrap_pos_x);
+    return ImGui::PushTextWrapPos(wrap_local_pos_x);
 }
 CIMGUI_API void igPopTextWrapPos()
 {
@@ -394,9 +403,9 @@ CIMGUI_API void igSeparator()
 {
    return ImGui::Separator();
 }
-CIMGUI_API void igSameLine(float pos_x,float spacing_w)
+CIMGUI_API void igSameLine(float offset_from_start_x,float spacing)
 {
-    return ImGui::SameLine(pos_x,spacing_w);
+    return ImGui::SameLine(offset_from_start_x,spacing);
 }
 CIMGUI_API void igNewLine()
 {
@@ -442,13 +451,13 @@ CIMGUI_API void igSetCursorPos(const ImVec2 local_pos)
 {
    return ImGui::SetCursorPos(local_pos);
 }
-CIMGUI_API void igSetCursorPosX(float x)
+CIMGUI_API void igSetCursorPosX(float local_x)
 {
-    return ImGui::SetCursorPosX(x);
+    return ImGui::SetCursorPosX(local_x);
 }
-CIMGUI_API void igSetCursorPosY(float y)
+CIMGUI_API void igSetCursorPosY(float local_y)
 {
-    return ImGui::SetCursorPosY(y);
+    return ImGui::SetCursorPosY(local_y);
 }
 CIMGUI_API ImVec2 igGetCursorStartPos()
 {
@@ -458,9 +467,9 @@ CIMGUI_API ImVec2 igGetCursorScreenPos()
 {
    return ImGui::GetCursorScreenPos();
 }
-CIMGUI_API void igSetCursorScreenPos(const ImVec2 screen_pos)
+CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos)
 {
-    return ImGui::SetCursorScreenPos(screen_pos);
+    return ImGui::SetCursorScreenPos(pos);
 }
 CIMGUI_API void igAlignTextToFramePadding()
 {
@@ -692,13 +701,13 @@ CIMGUI_API bool igDragIntRange2(const char* label,int* v_current_min,int* v_curr
 {
    return ImGui::DragIntRange2(label,v_current_min,v_current_max,v_speed,v_min,v_max,format,format_max);
 }
-CIMGUI_API bool igDragScalar(const char* label,ImGuiDataType data_type,void* v,float v_speed,const void* v_min,const void* v_max,const char* format,float power)
+CIMGUI_API bool igDragScalar(const char* label,ImGuiDataType data_type,void* p_data,float v_speed,const void* p_min,const void* p_max,const char* format,float power)
 {
-    return ImGui::DragScalar(label,data_type,v,v_speed,v_min,v_max,format,power);
+    return ImGui::DragScalar(label,data_type,p_data,v_speed,p_min,p_max,format,power);
 }
-CIMGUI_API bool igDragScalarN(const char* label,ImGuiDataType data_type,void* v,int components,float v_speed,const void* v_min,const void* v_max,const char* format,float power)
+CIMGUI_API bool igDragScalarN(const char* label,ImGuiDataType data_type,void* p_data,int components,float v_speed,const void* p_min,const void* p_max,const char* format,float power)
 {
-    return ImGui::DragScalarN(label,data_type,v,components,v_speed,v_min,v_max,format,power);
+    return ImGui::DragScalarN(label,data_type,p_data,components,v_speed,p_min,p_max,format,power);
 }
 CIMGUI_API bool igSliderFloat(const char* label,float* v,float v_min,float v_max,const char* format,float power)
 {
@@ -736,13 +745,13 @@ CIMGUI_API bool igSliderInt4(const char* label,int v[4],int v_min,int v_max,cons
 {
    return ImGui::SliderInt4(label,v,v_min,v_max,format);
 }
-CIMGUI_API bool igSliderScalar(const char* label,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)
+CIMGUI_API bool igSliderScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format,float power)
 {
-    return ImGui::SliderScalar(label,data_type,v,v_min,v_max,format,power);
+    return ImGui::SliderScalar(label,data_type,p_data,p_min,p_max,format,power);
 }
-CIMGUI_API bool igSliderScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* v_min,const void* v_max,const char* format,float power)
+CIMGUI_API bool igSliderScalarN(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_min,const void* p_max,const char* format,float power)
 {
-    return ImGui::SliderScalarN(label,data_type,v,components,v_min,v_max,format,power);
+    return ImGui::SliderScalarN(label,data_type,p_data,components,p_min,p_max,format,power);
 }
 CIMGUI_API bool igVSliderFloat(const char* label,const ImVec2 size,float* v,float v_min,float v_max,const char* format,float power)
 {
@@ -752,9 +761,9 @@ CIMGUI_API bool igVSliderInt(const char* label,const ImVec2 size,int* v,int v_mi
 {
    return ImGui::VSliderInt(label,size,v,v_min,v_max,format);
 }
-CIMGUI_API bool igVSliderScalar(const char* label,const ImVec2 size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)
+CIMGUI_API bool igVSliderScalar(const char* label,const ImVec2 size,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format,float power)
 {
-    return ImGui::VSliderScalar(label,size,data_type,v,v_min,v_max,format,power);
+    return ImGui::VSliderScalar(label,size,data_type,p_data,p_min,p_max,format,power);
 }
 CIMGUI_API bool igInputText(const char* label,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)
 {
@@ -764,49 +773,53 @@ CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size
 {
    return ImGui::InputTextMultiline(label,buf,buf_size,size,flags,callback,user_data);
 }
-CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)
 {
-    return ImGui::InputFloat(label,v,step,step_fast,format,extra_flags);
+    return ImGui::InputTextWithHint(label,hint,buf,buf_size,flags,callback,user_data);
 }
-CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat2(label,v,format,extra_flags);
+    return ImGui::InputFloat(label,v,step,step_fast,format,flags);
 }
-CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat3(label,v,format,extra_flags);
+    return ImGui::InputFloat2(label,v,format,flags);
 }
-CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat4(label,v,format,extra_flags);
+    return ImGui::InputFloat3(label,v,format,flags);
 }
-CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt(label,v,step,step_fast,extra_flags);
+    return ImGui::InputFloat4(label,v,format,flags);
 }
-CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt2(label,v,extra_flags);
+    return ImGui::InputInt(label,v,step,step_fast,flags);
 }
-CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt3(label,v,extra_flags);
+    return ImGui::InputInt2(label,v,flags);
 }
-CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt4(label,v,extra_flags);
+    return ImGui::InputInt3(label,v,flags);
 }
-CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputDouble(label,v,step,step_fast,format,extra_flags);
+    return ImGui::InputInt4(label,v,flags);
 }
-CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputScalar(label,data_type,v,step,step_fast,format,extra_flags);
+    return ImGui::InputDouble(label,v,step,step_fast,format,flags);
 }
-CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_step,const void* p_step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputScalarN(label,data_type,v,components,step,step_fast,format,extra_flags);
+    return ImGui::InputScalar(label,data_type,p_data,p_step,p_step_fast,format,flags);
+}
+CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_step,const void* p_step_fast,const char* format,ImGuiInputTextFlags flags)
+{
+    return ImGui::InputScalarN(label,data_type,p_data,components,p_step,p_step_fast,format,flags);
 }
 CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags)
 {
@@ -900,18 +913,10 @@ CIMGUI_API void igTreePop()
 {
    return ImGui::TreePop();
 }
-CIMGUI_API void igTreeAdvanceToLabelPos()
-{
-    return ImGui::TreeAdvanceToLabelPos();
-}
 CIMGUI_API float igGetTreeNodeToLabelSpacing()
 {
    return ImGui::GetTreeNodeToLabelSpacing();
 }
-CIMGUI_API void igSetNextTreeNodeOpen(bool is_open,ImGuiCond cond)
-{
-    return ImGui::SetNextTreeNodeOpen(is_open,cond);
-}
 CIMGUI_API bool igCollapsingHeader(const char* label,ImGuiTreeNodeFlags flags)
 {
    return ImGui::CollapsingHeader(label,flags);
@@ -920,6 +925,10 @@ CIMGUI_API bool igCollapsingHeaderBoolPtr(const char* label,bool* p_open,ImGuiTr
 {
    return ImGui::CollapsingHeader(label,p_open,flags);
 }
+CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond)
+{
+    return ImGui::SetNextItemOpen(is_open,cond);
+}
 CIMGUI_API bool igSelectable(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size)
 {
    return ImGui::Selectable(label,selected,flags,size);
@@ -980,14 +989,6 @@ CIMGUI_API void igValueFloat(const char* prefix,float v,const char* float_format
 {
    return ImGui::Value(prefix,v,float_format);
 }
-CIMGUI_API bool igBeginMainMenuBar()
-{
-    return ImGui::BeginMainMenuBar();
-}
-CIMGUI_API void igEndMainMenuBar()
-{
-    return ImGui::EndMainMenuBar();
-}
 CIMGUI_API bool igBeginMenuBar()
 {
    return ImGui::BeginMenuBar();
@@ -996,6 +997,14 @@ CIMGUI_API void igEndMenuBar()
 {
    return ImGui::EndMenuBar();
 }
+CIMGUI_API bool igBeginMainMenuBar()
+{
+    return ImGui::BeginMainMenuBar();
+}
+CIMGUI_API void igEndMainMenuBar()
+{
+    return ImGui::EndMainMenuBar();
+}
 CIMGUI_API bool igBeginMenu(const char* label,bool enabled)
 {
    return ImGui::BeginMenu(label,enabled);
@@ -1103,17 +1112,37 @@ CIMGUI_API int igGetColumnsCount()
 {
    return ImGui::GetColumnsCount();
 }
-CIMGUI_API void igLogToTTY(int max_depth)
+CIMGUI_API bool igBeginTabBar(const char* str_id,ImGuiTabBarFlags flags)
 {
-    return ImGui::LogToTTY(max_depth);
+    return ImGui::BeginTabBar(str_id,flags);
 }
-CIMGUI_API void igLogToFile(int max_depth,const char* filename)
+CIMGUI_API void igEndTabBar()
 {
-    return ImGui::LogToFile(max_depth,filename);
+    return ImGui::EndTabBar();
 }
-CIMGUI_API void igLogToClipboard(int max_depth)
+CIMGUI_API bool igBeginTabItem(const char* label,bool* p_open,ImGuiTabItemFlags flags)
 {
-    return ImGui::LogToClipboard(max_depth);
+    return ImGui::BeginTabItem(label,p_open,flags);
+}
+CIMGUI_API void igEndTabItem()
+{
+    return ImGui::EndTabItem();
+}
+CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label)
+{
+    return ImGui::SetTabItemClosed(tab_or_docked_window_label);
+}
+CIMGUI_API void igLogToTTY(int auto_open_depth)
+{
+    return ImGui::LogToTTY(auto_open_depth);
+}
+CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename)
+{
+    return ImGui::LogToFile(auto_open_depth,filename);
+}
+CIMGUI_API void igLogToClipboard(int auto_open_depth)
+{
+    return ImGui::LogToClipboard(auto_open_depth);
 }
 CIMGUI_API void igLogFinish()
 {
@@ -1127,9 +1156,9 @@ CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags)
 {
    return ImGui::BeginDragDropSource(flags);
 }
-CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t size,ImGuiCond cond)
+CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond)
 {
-    return ImGui::SetDragDropPayload(type,data,size,cond);
+    return ImGui::SetDragDropPayload(type,data,sz,cond);
 }
 CIMGUI_API void igEndDragDropSource()
 {
@@ -1191,6 +1220,10 @@ CIMGUI_API bool igIsItemEdited()
 {
    return ImGui::IsItemEdited();
 }
+CIMGUI_API bool igIsItemActivated()
+{
+    return ImGui::IsItemActivated();
+}
 CIMGUI_API bool igIsItemDeactivated()
 {
    return ImGui::IsItemDeactivated();
@@ -1199,6 +1232,10 @@ CIMGUI_API bool igIsItemDeactivatedAfterEdit()
 {
    return ImGui::IsItemDeactivatedAfterEdit();
 }
+CIMGUI_API bool igIsItemToggledOpen()
+{
+    return ImGui::IsItemToggledOpen();
+}
 CIMGUI_API bool igIsAnyItemHovered()
 {
    return ImGui::IsAnyItemHovered();
@@ -1243,9 +1280,13 @@ CIMGUI_API int igGetFrameCount()
 {
    return ImGui::GetFrameCount();
 }
-CIMGUI_API ImDrawList* igGetOverlayDrawList()
+CIMGUI_API ImDrawList* igGetBackgroundDrawList()
 {
-    return ImGui::GetOverlayDrawList();
+    return ImGui::GetBackgroundDrawList();
+}
+CIMGUI_API ImDrawList* igGetForegroundDrawList()
+{
+    return ImGui::GetForegroundDrawList();
 }
 CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData()
 {
@@ -1363,13 +1404,13 @@ CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type)
 {
    return ImGui::SetMouseCursor(type);
 }
-CIMGUI_API void igCaptureKeyboardFromApp(bool capture)
+CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value)
 {
-    return ImGui::CaptureKeyboardFromApp(capture);
+    return ImGui::CaptureKeyboardFromApp(want_capture_keyboard_value);
 }
-CIMGUI_API void igCaptureMouseFromApp(bool capture)
+CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value)
 {
-    return ImGui::CaptureMouseFromApp(capture);
+    return ImGui::CaptureMouseFromApp(want_capture_mouse_value);
 }
 CIMGUI_API const char* igGetClipboardText()
 {
@@ -1419,13 +1460,13 @@ CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor)
 {
    return self->ScaleAllSizes(scale_factor);
 }
-CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,ImWchar c)
+CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,unsigned int c)
 {
    return self->AddInputCharacter(c);
 }
-CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* utf8_chars)
+CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* str)
 {
-    return self->AddInputCharactersUTF8(utf8_chars);
+    return self->AddInputCharactersUTF8(str);
 }
 CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self)
 {
@@ -1519,31 +1560,23 @@ CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self)
 {
    return self->IsActive();
 }
-CIMGUI_API TextRange* TextRange_TextRange(void)
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRange(void)
 {
-    return IM_NEW(TextRange)();
+    return IM_NEW(ImGuiTextRange)();
 }
-CIMGUI_API void TextRange_destroy(TextRange* self)
+CIMGUI_API void ImGuiTextRange_destroy(ImGuiTextRange* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API TextRange* TextRange_TextRangeStr(const char* _b,const char* _e)
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeStr(const char* _b,const char* _e)
 {
-    return IM_NEW(TextRange)(_b,_e);
+    return IM_NEW(ImGuiTextRange)(_b,_e);
 }
-CIMGUI_API const char* TextRange_begin(TextRange* self)
-{
-    return self->begin();
-}
-CIMGUI_API const char* TextRange_end(TextRange* self)
-{
-    return self->end();
-}
-CIMGUI_API bool TextRange_empty(TextRange* self)
+CIMGUI_API bool ImGuiTextRange_empty(ImGuiTextRange* self)
 {
    return self->empty();
 }
-CIMGUI_API void TextRange_split(TextRange* self,char separator,ImVector_TextRange* out)
+CIMGUI_API void ImGuiTextRange_split(ImGuiTextRange* self,char separator,ImVector_ImGuiTextRange* out)
 {
    return self->split(separator,out);
 }
@@ -1583,25 +1616,29 @@ CIMGUI_API const char* ImGuiTextBuffer_c_str(ImGuiTextBuffer* self)
 {
    return self->c_str();
 }
+CIMGUI_API void ImGuiTextBuffer_append(ImGuiTextBuffer* self,const char* str,const char* str_end)
+{
+    return self->append(str,str_end);
+}
 CIMGUI_API void ImGuiTextBuffer_appendfv(ImGuiTextBuffer* self,const char* fmt,va_list args)
 {
    return self->appendfv(fmt,args);
 }
-CIMGUI_API Pair* Pair_PairInt(ImGuiID _key,int _val_i)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairInt(ImGuiID _key,int _val_i)
 {
-    return IM_NEW(Pair)(_key,_val_i);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_i);
 }
-CIMGUI_API void Pair_destroy(Pair* self)
+CIMGUI_API void ImGuiStoragePair_destroy(ImGuiStoragePair* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API Pair* Pair_PairFloat(ImGuiID _key,float _val_f)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairFloat(ImGuiID _key,float _val_f)
 {
-    return IM_NEW(Pair)(_key,_val_f);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_f);
 }
-CIMGUI_API Pair* Pair_PairPtr(ImGuiID _key,void* _val_p)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairPtr(ImGuiID _key,void* _val_p)
 {
-    return IM_NEW(Pair)(_key,_val_p);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_p);
 }
 CIMGUI_API void ImGuiStorage_Clear(ImGuiStorage* self)
 {
@@ -1723,6 +1760,34 @@ CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self)
 {
    IM_DELETE(self);
 }
+CIMGUI_API ImDrawListSplitter* ImDrawListSplitter_ImDrawListSplitter(void)
+{
+    return IM_NEW(ImDrawListSplitter)();
+}
+CIMGUI_API void ImDrawListSplitter_destroy(ImDrawListSplitter* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImDrawListSplitter_Clear(ImDrawListSplitter* self)
+{
+    return self->Clear();
+}
+CIMGUI_API void ImDrawListSplitter_ClearFreeMemory(ImDrawListSplitter* self)
+{
+    return self->ClearFreeMemory();
+}
+CIMGUI_API void ImDrawListSplitter_Split(ImDrawListSplitter* self,ImDrawList* draw_list,int count)
+{
+    return self->Split(draw_list,count);
+}
+CIMGUI_API void ImDrawListSplitter_Merge(ImDrawListSplitter* self,ImDrawList* draw_list)
+{
+    return self->Merge(draw_list);
+}
+CIMGUI_API void ImDrawListSplitter_SetCurrentChannel(ImDrawListSplitter* self,ImDrawList* draw_list,int channel_idx)
+{
+    return self->SetCurrentChannel(draw_list,channel_idx);
+}
 CIMGUI_API ImDrawList* ImDrawList_ImDrawList(const ImDrawListSharedData* shared_data)
 {
    return IM_NEW(ImDrawList)(shared_data);
@@ -1759,45 +1824,45 @@ CIMGUI_API ImVec2 ImDrawList_GetClipRectMax(ImDrawList* self)
 {
    return self->GetClipRectMax();
 }
-CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness)
 {
-    return self->AddLine(a,b,col,thickness);
+    return self->AddLine(p1,p2,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags,float thickness)
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness)
 {
-    return self->AddRect(a,b,col,rounding,rounding_corners_flags,thickness);
+    return self->AddRect(p_min,p_max,col,rounding,rounding_corners,thickness);
 }
-CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags)
+CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
 {
-    return self->AddRectFilled(a,b,col,rounding,rounding_corners_flags);
+    return self->AddRectFilled(p_min,p_max,col,rounding,rounding_corners);
 }
-CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left)
+CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left)
 {
-    return self->AddRectFilledMultiColor(a,b,col_upr_left,col_upr_right,col_bot_right,col_bot_left);
+    return self->AddRectFilledMultiColor(p_min,p_max,col_upr_left,col_upr_right,col_bot_right,col_bot_left);
 }
-CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness)
 {
-    return self->AddQuad(a,b,c,d,col,thickness);
+    return self->AddQuad(p1,p2,p3,p4,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col)
+CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col)
 {
-    return self->AddQuadFilled(a,b,c,d,col);
+    return self->AddQuadFilled(p1,p2,p3,p4,col);
 }
-CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col,float thickness)
 {
-    return self->AddTriangle(a,b,c,col,thickness);
+    return self->AddTriangle(p1,p2,p3,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col)
+CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col)
 {
-    return self->AddTriangleFilled(a,b,c,col);
+    return self->AddTriangleFilled(p1,p2,p3,col);
 }
-CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments,float thickness)
+CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness)
 {
-    return self->AddCircle(centre,radius,col,num_segments,thickness);
+    return self->AddCircle(center,radius,col,num_segments,thickness);
 }
-CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments)
+CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments)
 {
-    return self->AddCircleFilled(centre,radius,col,num_segments);
+    return self->AddCircleFilled(center,radius,col,num_segments);
 }
 CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end)
 {
@@ -1807,23 +1872,11 @@ CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,fl
 {
    return self->AddText(font,font_size,pos,col,text_begin,text_end,wrap_width,cpu_fine_clip_rect);
 }
-CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col)
-{
-    return self->AddImage(user_texture_id,a,b,uv_a,uv_b,col);
-}
-CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,const ImVec2 uv_a,const ImVec2 uv_b,const ImVec2 uv_c,const ImVec2 uv_d,ImU32 col)
-{
-    return self->AddImageQuad(user_texture_id,a,b,c,d,uv_a,uv_b,uv_c,uv_d,col);
-}
-CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col,float rounding,int rounding_corners)
-{
-    return self->AddImageRounded(user_texture_id,a,b,uv_a,uv_b,col,rounding,rounding_corners);
-}
-CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness)
+CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)
 {
    return self->AddPolyline(points,num_points,col,closed,thickness);
 }
-CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col)
+CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col)
 {
    return self->AddConvexPolyFilled(points,num_points,col);
 }
@@ -1831,6 +1884,18 @@ CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,con
 {
    return self->AddBezierCurve(pos0,cp0,cp1,pos1,col,thickness,num_segments);
 }
+CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col)
+{
+    return self->AddImage(user_texture_id,p_min,p_max,uv_min,uv_max,col);
+}
+CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,const ImVec2 uv1,const ImVec2 uv2,const ImVec2 uv3,const ImVec2 uv4,ImU32 col)
+{
+    return self->AddImageQuad(user_texture_id,p1,p2,p3,p4,uv1,uv2,uv3,uv4,col);
+}
+CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
+{
+    return self->AddImageRounded(user_texture_id,p_min,p_max,uv_min,uv_max,col,rounding,rounding_corners);
+}
 CIMGUI_API void ImDrawList_PathClear(ImDrawList* self)
 {
    return self->PathClear();
@@ -1851,33 +1916,21 @@ CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,flo
 {
    return self->PathStroke(col,closed,thickness);
 }
-CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 centre,float radius,float a_min,float a_max,int num_segments)
+CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments)
 {
-    return self->PathArcTo(centre,radius,a_min,a_max,num_segments);
+    return self->PathArcTo(center,radius,a_min,a_max,num_segments);
 }
-CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 centre,float radius,int a_min_of_12,int a_max_of_12)
+CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,float radius,int a_min_of_12,int a_max_of_12)
 {
-    return self->PathArcToFast(centre,radius,a_min_of_12,a_max_of_12);
+    return self->PathArcToFast(center,radius,a_min_of_12,a_max_of_12);
 }
 CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,int num_segments)
 {
    return self->PathBezierCurveTo(p1,p2,p3,num_segments);
 }
-CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,int rounding_corners_flags)
+CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners)
 {
-    return self->PathRect(rect_min,rect_max,rounding,rounding_corners_flags);
-}
-CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int channels_count)
-{
-    return self->ChannelsSplit(channels_count);
-}
-CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self)
-{
-    return self->ChannelsMerge();
-}
-CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int channel_index)
-{
-    return self->ChannelsSetCurrent(channel_index);
+    return self->PathRect(rect_min,rect_max,rounding,rounding_corners);
 }
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data)
 {
@@ -1891,6 +1944,18 @@ CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self)
 {
    return self->CloneOutput();
 }
+CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int count)
+{
+    return self->ChannelsSplit(count);
+}
+CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self)
+{
+    return self->ChannelsMerge();
+}
+CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int n)
+{
+    return self->ChannelsSetCurrent(n);
+}
 CIMGUI_API void ImDrawList_Clear(ImDrawList* self)
 {
    return self->Clear();
@@ -1951,9 +2016,9 @@ CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* self)
 {
    return self->DeIndexAllBuffers();
 }
-CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 sc)
+CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 fb_scale)
 {
-    return self->ScaleClipRects(sc);
+    return self->ScaleClipRects(fb_scale);
 }
 CIMGUI_API ImFontConfig* ImFontConfig_ImFontConfig(void)
 {
@@ -1963,6 +2028,54 @@ CIMGUI_API void ImFontConfig_destroy(ImFontConfig* self)
 {
    IM_DELETE(self);
 }
+CIMGUI_API ImFontGlyphRangesBuilder* ImFontGlyphRangesBuilder_ImFontGlyphRangesBuilder(void)
+{
+    return IM_NEW(ImFontGlyphRangesBuilder)();
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_destroy(ImFontGlyphRangesBuilder* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_Clear(ImFontGlyphRangesBuilder* self)
+{
+    return self->Clear();
+}
+CIMGUI_API bool ImFontGlyphRangesBuilder_GetBit(ImFontGlyphRangesBuilder* self,int n)
+{
+    return self->GetBit(n);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_SetBit(ImFontGlyphRangesBuilder* self,int n)
+{
+    return self->SetBit(n);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddChar(ImFontGlyphRangesBuilder* self,ImWchar c)
+{
+    return self->AddChar(c);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddText(ImFontGlyphRangesBuilder* self,const char* text,const char* text_end)
+{
+    return self->AddText(text,text_end);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddRanges(ImFontGlyphRangesBuilder* self,const ImWchar* ranges)
+{
+    return self->AddRanges(ranges);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_BuildRanges(ImFontGlyphRangesBuilder* self,ImVector_ImWchar* out_ranges)
+{
+    return self->BuildRanges(out_ranges);
+}
+CIMGUI_API ImFontAtlasCustomRect* ImFontAtlasCustomRect_ImFontAtlasCustomRect(void)
+{
+    return IM_NEW(ImFontAtlasCustomRect)();
+}
+CIMGUI_API void ImFontAtlasCustomRect_destroy(ImFontAtlasCustomRect* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API bool ImFontAtlasCustomRect_IsPacked(ImFontAtlasCustomRect* self)
+{
+    return self->IsPacked();
+}
 CIMGUI_API ImFontAtlas* ImFontAtlas_ImFontAtlas(void)
 {
    return IM_NEW(ImFontAtlas)();
@@ -2015,10 +2128,6 @@ CIMGUI_API bool ImFontAtlas_Build(ImFontAtlas* self)
 {
    return self->Build();
 }
-CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self)
-{
-    return self->IsBuilt();
-}
 CIMGUI_API void ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* self,unsigned char** out_pixels,int* out_width,int* out_height,int* out_bytes_per_pixel)
 {
    return self->GetTexDataAsAlpha8(out_pixels,out_width,out_height,out_bytes_per_pixel);
@@ -2027,6 +2136,10 @@ CIMGUI_API void ImFontAtlas_GetTexDataAsRGBA32(ImFontAtlas* self,unsigned char**
 {
    return self->GetTexDataAsRGBA32(out_pixels,out_width,out_height,out_bytes_per_pixel);
 }
+CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self)
+{
+    return self->IsBuilt();
+}
 CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* self,ImTextureID id)
 {
    return self->SetTexID(id);
@@ -2059,49 +2172,9 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self)
 {
    return self->GetGlyphRangesThai();
 }
-CIMGUI_API GlyphRangesBuilder* GlyphRangesBuilder_GlyphRangesBuilder(void)
+CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self)
 {
-    return IM_NEW(GlyphRangesBuilder)();
-}
-CIMGUI_API void GlyphRangesBuilder_destroy(GlyphRangesBuilder* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API bool GlyphRangesBuilder_GetBit(GlyphRangesBuilder* self,int n)
-{
-    return self->GetBit(n);
-}
-CIMGUI_API void GlyphRangesBuilder_SetBit(GlyphRangesBuilder* self,int n)
-{
-    return self->SetBit(n);
-}
-CIMGUI_API void GlyphRangesBuilder_AddChar(GlyphRangesBuilder* self,ImWchar c)
-{
-    return self->AddChar(c);
-}
-CIMGUI_API void GlyphRangesBuilder_AddText(GlyphRangesBuilder* self,const char* text,const char* text_end)
-{
-    return self->AddText(text,text_end);
-}
-CIMGUI_API void GlyphRangesBuilder_AddRanges(GlyphRangesBuilder* self,const ImWchar* ranges)
-{
-    return self->AddRanges(ranges);
-}
-CIMGUI_API void GlyphRangesBuilder_BuildRanges(GlyphRangesBuilder* self,ImVector_ImWchar* out_ranges)
-{
-    return self->BuildRanges(out_ranges);
-}
-CIMGUI_API CustomRect* CustomRect_CustomRect(void)
-{
-    return IM_NEW(CustomRect)();
-}
-CIMGUI_API void CustomRect_destroy(CustomRect* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API bool CustomRect_IsPacked(CustomRect* self)
-{
-    return self->IsPacked();
+    return self->GetGlyphRangesVietnamese();
 }
 CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,unsigned int id,int width,int height)
 {
@@ -2111,11 +2184,11 @@ CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font
 {
    return self->AddCustomRectFontGlyph(font,id,width,height,advance_x,offset);
 }
-CIMGUI_API const CustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index)
+CIMGUI_API const ImFontAtlasCustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index)
 {
    return self->GetCustomRectByIndex(index);
 }
-CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const CustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max)
+CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const ImFontAtlasCustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max)
 {
    return self->CalcCustomRectUV(rect,out_uv_min,out_uv_max);
 }
@@ -2131,14 +2204,6 @@ CIMGUI_API void ImFont_destroy(ImFont* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
-{
-    return self->ClearOutputData();
-}
-CIMGUI_API void ImFont_BuildLookupTable(ImFont* self)
-{
-    return self->BuildLookupTable();
-}
 CIMGUI_API const ImFontGlyph* ImFont_FindGlyph(ImFont* self,ImWchar c)
 {
    return self->FindGlyph(c);
@@ -2147,10 +2212,6 @@ CIMGUI_API const ImFontGlyph* ImFont_FindGlyphNoFallback(ImFont* self,ImWchar c)
 {
    return self->FindGlyphNoFallback(c);
 }
-CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
-{
-    return self->SetFallbackChar(c);
-}
 CIMGUI_API float ImFont_GetCharAdvance(ImFont* self,ImWchar c)
 {
    return self->GetCharAdvance(c);
@@ -2179,6 +2240,14 @@ CIMGUI_API void ImFont_RenderText(ImFont* self,ImDrawList* draw_list,float size,
 {
    return self->RenderText(draw_list,size,pos,col,clip_rect,text_begin,text_end,wrap_width,cpu_fine_clip);
 }
+CIMGUI_API void ImFont_BuildLookupTable(ImFont* self)
+{
+    return self->BuildLookupTable();
+}
+CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
+{
+    return self->ClearOutputData();
+}
 CIMGUI_API void ImFont_GrowIndex(ImFont* self,int new_size)
 {
    return self->GrowIndex(new_size);
@@ -2191,6 +2260,10 @@ CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool ov
 {
    return self->AddRemapChar(dst,src,overwrite_dst);
 }
+CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
+{
+    return self->SetFallbackChar(c);
+}
 CIMGUI_API void igGetWindowPos_nonUDT(ImVec2 *pOut)
 {
    *pOut = ImGui::GetWindowPos();
@@ -2450,10 +2523,12 @@ CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 {
 	return IM_NEW(ImVector<ImWchar>) ();
 }
-CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p)
+
+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self)
 {
-	IM_DELETE(p);
+    IM_DELETE(self);
 }
+
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p)
 {
 	IM_PLACEMENT_NEW(p) ImVector<ImWchar>();
--- a/generator/output/cimgui.h
+++ b/generator/output/cimgui.h
--- a/generator/output/cimgui_impl.h
+++ b/generator/output/cimgui_impl.h
@@ -1,9 +1,10 @@
 typedef struct SDL_Window SDL_Window;
 typedef struct GLFWwindow GLFWwindow;
+
 struct GLFWwindow;
+
 struct SDL_Window;
-typedef union SDL_Event SDL_Event;
-CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
+typedef union SDL_Event SDL_Event;CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
 CIMGUI_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window,bool install_callbacks);
 CIMGUI_API void ImGui_ImplGlfw_Shutdown();
 CIMGUI_API void ImGui_ImplGlfw_NewFrame();
@@ -29,6 +30,7 @@ CIMGUI_API bool ImGui_ImplOpenGL2_CreateDeviceObjects();
 CIMGUI_API void ImGui_ImplOpenGL2_DestroyDeviceObjects();
 CIMGUI_API bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window,void* sdl_gl_context);
 CIMGUI_API bool ImGui_ImplSDL2_InitForVulkan(SDL_Window* window);
+CIMGUI_API bool ImGui_ImplSDL2_InitForD3D(SDL_Window* window);
 CIMGUI_API void ImGui_ImplSDL2_Shutdown();
 CIMGUI_API void ImGui_ImplSDL2_NewFrame(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);
--- a/generator/output/definitions.json
+++ b/generator/output/definitions.json
--- a/generator/output/definitions.lua
+++ b/generator/output/definitions.lua
--- a/generator/output/impl_definitions.json
+++ b/generator/output/impl_definitions.json
@@ -15,10 +15,9 @@
      "argsoriginal": "(GLFWwindow* window,unsigned int c)",
      "call_args": "(window,c)",
      "cimguiname": "ImGui_ImplGlfw_CharCallback",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_CharCallback",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,unsigned int)",
      "stname": ""
@@ -40,10 +39,9 @@
      "argsoriginal": "(GLFWwindow* window,bool install_callbacks)",
      "call_args": "(window,install_callbacks)",
      "cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_InitForOpenGL",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
      "stname": ""
@@ -65,10 +63,9 @@
      "argsoriginal": "(GLFWwindow* window,bool install_callbacks)",
      "call_args": "(window,install_callbacks)",
      "cimguiname": "ImGui_ImplGlfw_InitForVulkan",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_InitForVulkan",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_InitForVulkan",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
      "stname": ""
@@ -102,10 +99,9 @@
      "argsoriginal": "(GLFWwindow* window,int key,int scancode,int action,int mods)",
      "call_args": "(window,key,scancode,action,mods)",
      "cimguiname": "ImGui_ImplGlfw_KeyCallback",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_KeyCallback",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int,int)",
      "stname": ""
@@ -135,10 +131,9 @@
      "argsoriginal": "(GLFWwindow* window,int button,int action,int mods)",
      "call_args": "(window,button,action,mods)",
      "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int)",
      "stname": ""
@@ -151,10 +146,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplGlfw_NewFrame",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_NewFrame",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_NewFrame",
      "ret": "void",
      "signature": "()",
      "stname": ""
@@ -180,10 +174,9 @@
      "argsoriginal": "(GLFWwindow* window,double xoffset,double yoffset)",
      "call_args": "(window,xoffset,yoffset)",
      "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_ScrollCallback",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,double,double)",
      "stname": ""
@@ -196,10 +189,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplGlfw_Shutdown",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_Shutdown",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
      "ret": "void",
      "signature": "()",
      "stname": ""
@@ -212,10 +204,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
      "stname": ""
@@ -228,10 +219,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_CreateFontsTexture",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
      "stname": ""
@@ -244,10 +234,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
      "stname": ""
@@ -260,10 +249,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
      "stname": ""
@@ -276,10 +264,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL2_Init",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_Init",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_Init",
      "ret": "bool",
      "signature": "()",
      "stname": ""
@@ -292,10 +279,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL2_NewFrame",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_NewFrame",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_NewFrame",
      "ret": "void",
      "signature": "()",
      "stname": ""
@@ -313,10 +299,9 @@
      "argsoriginal": "(ImDrawData* draw_data)",
      "call_args": "(draw_data)",
      "cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_RenderDrawData",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
      "stname": ""
@@ -329,10 +314,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL2_Shutdown",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_Shutdown",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_Shutdown",
      "ret": "void",
      "signature": "()",
      "stname": ""
@@ -345,10 +329,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
      "stname": ""
@@ -361,10 +344,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_CreateFontsTexture",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
      "stname": ""
@@ -377,10 +359,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
      "stname": ""
@@ -393,10 +374,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
      "stname": ""
@@ -414,12 +394,11 @@
      "argsoriginal": "(const char* glsl_version=NULL)",
      "call_args": "(glsl_version)",
      "cimguiname": "ImGui_ImplOpenGL3_Init",
-      "comment": "",
      "defaults": {
        "glsl_version": "NULL"
      },
      "funcname": "ImGui_ImplOpenGL3_Init",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_Init",
      "ret": "bool",
      "signature": "(const char*)",
      "stname": ""
@@ -432,10 +411,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL3_NewFrame",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_NewFrame",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_NewFrame",
      "ret": "void",
      "signature": "()",
      "stname": ""
@@ -453,10 +431,9 @@
      "argsoriginal": "(ImDrawData* draw_data)",
      "call_args": "(draw_data)",
      "cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_RenderDrawData",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
      "stname": ""
@@ -469,15 +446,34 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplOpenGL3_Shutdown",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_Shutdown",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_Shutdown",
      "ret": "void",
      "signature": "()",
      "stname": ""
    }
  ],
+  "ImGui_ImplSDL2_InitForD3D": [
+    {
+      "args": "(SDL_Window* window)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "SDL_Window*"
+        }
+      ],
+      "argsoriginal": "(SDL_Window* window)",
+      "call_args": "(window)",
+      "cimguiname": "ImGui_ImplSDL2_InitForD3D",
+      "defaults": [],
+      "funcname": "ImGui_ImplSDL2_InitForD3D",
+      "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
+      "ret": "bool",
+      "signature": "(SDL_Window*)",
+      "stname": ""
+    }
+  ],
  "ImGui_ImplSDL2_InitForOpenGL": [
    {
      "args": "(SDL_Window* window,void* sdl_gl_context)",
@@ -494,10 +490,9 @@
      "argsoriginal": "(SDL_Window* window,void* sdl_gl_context)",
      "call_args": "(window,sdl_gl_context)",
      "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_InitForOpenGL",
-      "location": "imgui_impl_sdl",
+      "ov_cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "ret": "bool",
      "signature": "(SDL_Window*,void*)",
      "stname": ""
@@ -515,10 +510,9 @@
      "argsoriginal": "(SDL_Window* window)",
      "call_args": "(window)",
      "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_InitForVulkan",
-      "location": "imgui_impl_sdl",
+      "ov_cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "ret": "bool",
      "signature": "(SDL_Window*)",
      "stname": ""
@@ -536,10 +530,9 @@
      "argsoriginal": "(SDL_Window* window)",
      "call_args": "(window)",
      "cimguiname": "ImGui_ImplSDL2_NewFrame",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_NewFrame",
-      "location": "imgui_impl_sdl",
+      "ov_cimguiname": "ImGui_ImplSDL2_NewFrame",
      "ret": "void",
      "signature": "(SDL_Window*)",
      "stname": ""
@@ -557,10 +550,9 @@
      "argsoriginal": "(const SDL_Event* event)",
      "call_args": "(event)",
      "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_ProcessEvent",
-      "location": "imgui_impl_sdl",
+      "ov_cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "ret": "bool",
      "signature": "(const SDL_Event*)",
      "stname": ""
@@ -573,10 +565,9 @@
      "argsoriginal": "()",
      "call_args": "()",
      "cimguiname": "ImGui_ImplSDL2_Shutdown",
-      "comment": "",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_Shutdown",
-      "location": "imgui_impl_sdl",
+      "ov_cimguiname": "ImGui_ImplSDL2_Shutdown",
      "ret": "void",
      "signature": "()",
      "stname": ""
--- a/generator/output/impl_definitions.lua
+++ b/generator/output/impl_definitions.lua
@@ -12,10 +12,9 @@ defs["ImGui_ImplGlfw_CharCallback"][1]["argsT"][2]["type"] = "unsigned int"
 defs["ImGui_ImplGlfw_CharCallback"][1]["argsoriginal"] = "(GLFWwindow* window,unsigned int c)"
 defs["ImGui_ImplGlfw_CharCallback"][1]["call_args"] = "(window,c)"
 defs["ImGui_ImplGlfw_CharCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CharCallback"
-defs["ImGui_ImplGlfw_CharCallback"][1]["comment"] = ""
 defs["ImGui_ImplGlfw_CharCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CharCallback"][1]["funcname"] = "ImGui_ImplGlfw_CharCallback"
-defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw"
+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)"
 defs["ImGui_ImplGlfw_CharCallback"][1]["stname"] = ""
@@ -33,10 +32,9 @@ defs["ImGui_ImplGlfw_InitForOpenGL"][1]["argsT"][2]["type"] = "bool"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["argsoriginal"] = "(GLFWwindow* window,bool install_callbacks)"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["call_args"] = "(window,install_callbacks)"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOpenGL"
-defs["ImGui_ImplGlfw_InitForOpenGL"][1]["comment"] = ""
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["funcname"] = "ImGui_ImplGlfw_InitForOpenGL"
-defs["ImGui_ImplGlfw_InitForOpenGL"][1]["location"] = "imgui_impl_glfw"
+defs["ImGui_ImplGlfw_InitForOpenGL"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForOpenGL"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["ret"] = "bool"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["signature"] = "(GLFWwindow*,bool)"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["stname"] = ""
@@ -54,10 +52,9 @@ defs["ImGui_ImplGlfw_InitForVulkan"][1]["argsT"][2]["type"] = "bool"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["argsoriginal"] = "(GLFWwindow* window,bool install_callbacks)"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["call_args"] = "(window,install_callbacks)"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForVulkan"
-defs["ImGui_ImplGlfw_InitForVulkan"][1]["comment"] = ""
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["funcname"] = "ImGui_ImplGlfw_InitForVulkan"
-defs["ImGui_ImplGlfw_InitForVulkan"][1]["location"] = "imgui_impl_glfw"
+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)"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["stname"] = ""
@@ -84,10 +81,9 @@ defs["ImGui_ImplGlfw_KeyCallback"][1]["argsT"][5]["type"] = "int"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["argsoriginal"] = "(GLFWwindow* window,int key,int scancode,int action,int mods)"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["call_args"] = "(window,key,scancode,action,mods)"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
-defs["ImGui_ImplGlfw_KeyCallback"][1]["comment"] = ""
 defs["ImGui_ImplGlfw_KeyCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_KeyCallback"][1]["funcname"] = "ImGui_ImplGlfw_KeyCallback"
-defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw"
+defs["ImGui_ImplGlfw_KeyCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["signature"] = "(GLFWwindow*,int,int,int,int)"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["stname"] = ""
@@ -111,10 +107,9 @@ defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["argsT"][4]["type"] = "int"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["argsoriginal"] = "(GLFWwindow* window,int button,int action,int mods)"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["call_args"] = "(window,button,action,mods)"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
-defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["comment"] = ""
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["funcname"] = "ImGui_ImplGlfw_MouseButtonCallback"
-defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw"
+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)"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["stname"] = ""
@@ -126,10 +121,9 @@ defs["ImGui_ImplGlfw_NewFrame"][1]["argsT"] = {}
 defs["ImGui_ImplGlfw_NewFrame"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplGlfw_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplGlfw_NewFrame"][1]["cimguiname"] = "ImGui_ImplGlfw_NewFrame"
-defs["ImGui_ImplGlfw_NewFrame"][1]["comment"] = ""
 defs["ImGui_ImplGlfw_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_NewFrame"][1]["funcname"] = "ImGui_ImplGlfw_NewFrame"
-defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw"
+defs["ImGui_ImplGlfw_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_NewFrame"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_NewFrame"][1]["signature"] = "()"
 defs["ImGui_ImplGlfw_NewFrame"][1]["stname"] = ""
@@ -150,10 +144,9 @@ defs["ImGui_ImplGlfw_ScrollCallback"][1]["argsT"][3]["type"] = "double"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["argsoriginal"] = "(GLFWwindow* window,double xoffset,double yoffset)"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["call_args"] = "(window,xoffset,yoffset)"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
-defs["ImGui_ImplGlfw_ScrollCallback"][1]["comment"] = ""
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["funcname"] = "ImGui_ImplGlfw_ScrollCallback"
-defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw"
+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)"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["stname"] = ""
@@ -165,10 +158,9 @@ defs["ImGui_ImplGlfw_Shutdown"][1]["argsT"] = {}
 defs["ImGui_ImplGlfw_Shutdown"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplGlfw_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplGlfw_Shutdown"][1]["cimguiname"] = "ImGui_ImplGlfw_Shutdown"
-defs["ImGui_ImplGlfw_Shutdown"][1]["comment"] = ""
 defs["ImGui_ImplGlfw_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_Shutdown"][1]["funcname"] = "ImGui_ImplGlfw_Shutdown"
-defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw"
+defs["ImGui_ImplGlfw_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_Shutdown"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_Shutdown"][1]["signature"] = "()"
 defs["ImGui_ImplGlfw_Shutdown"][1]["stname"] = ""
@@ -180,10 +172,9 @@ defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
-defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
-defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl2"
+defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["stname"] = ""
@@ -195,10 +186,9 @@ defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
-defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
-defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl2"
+defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["stname"] = ""
@@ -210,10 +200,9 @@ defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
-defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
-defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl2"
+defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["stname"] = ""
@@ -225,10 +214,9 @@ defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
-defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
-defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl2"
+defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["stname"] = ""
@@ -240,10 +228,9 @@ defs["ImGui_ImplOpenGL2_Init"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_Init"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_Init"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_Init"][1]["cimguiname"] = "ImGui_ImplOpenGL2_Init"
-defs["ImGui_ImplOpenGL2_Init"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL2_Init"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_Init"][1]["funcname"] = "ImGui_ImplOpenGL2_Init"
-defs["ImGui_ImplOpenGL2_Init"][1]["location"] = "imgui_impl_opengl2"
+defs["ImGui_ImplOpenGL2_Init"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_Init"
 defs["ImGui_ImplOpenGL2_Init"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_Init"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL2_Init"][1]["stname"] = ""
@@ -255,10 +242,9 @@ defs["ImGui_ImplOpenGL2_NewFrame"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplOpenGL2_NewFrame"
-defs["ImGui_ImplOpenGL2_NewFrame"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["funcname"] = "ImGui_ImplOpenGL2_NewFrame"
-defs["ImGui_ImplOpenGL2_NewFrame"][1]["location"] = "imgui_impl_opengl2"
+defs["ImGui_ImplOpenGL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_NewFrame"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["stname"] = ""
@@ -273,10 +259,9 @@ defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["argsT"][1]["type"] = "ImDrawData*"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["argsoriginal"] = "(ImDrawData* draw_data)"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["call_args"] = "(draw_data)"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["cimguiname"] = "ImGui_ImplOpenGL2_RenderDrawData"
-defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["funcname"] = "ImGui_ImplOpenGL2_RenderDrawData"
-defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["location"] = "imgui_impl_opengl2"
+defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_RenderDrawData"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["signature"] = "(ImDrawData*)"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["stname"] = ""
@@ -288,10 +273,9 @@ defs["ImGui_ImplOpenGL2_Shutdown"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplOpenGL2_Shutdown"
-defs["ImGui_ImplOpenGL2_Shutdown"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["funcname"] = "ImGui_ImplOpenGL2_Shutdown"
-defs["ImGui_ImplOpenGL2_Shutdown"][1]["location"] = "imgui_impl_opengl2"
+defs["ImGui_ImplOpenGL2_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_Shutdown"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["stname"] = ""
@@ -303,10 +287,9 @@ defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
-defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
-defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl3"
+defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["stname"] = ""
@@ -318,10 +301,9 @@ defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
-defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
-defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl3"
+defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["stname"] = ""
@@ -333,10 +315,9 @@ defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
-defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
-defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl3"
+defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["stname"] = ""
@@ -348,10 +329,9 @@ defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
-defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
-defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl3"
+defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["stname"] = ""
@@ -366,11 +346,10 @@ defs["ImGui_ImplOpenGL3_Init"][1]["argsT"][1]["type"] = "const char*"
 defs["ImGui_ImplOpenGL3_Init"][1]["argsoriginal"] = "(const char* glsl_version=NULL)"
 defs["ImGui_ImplOpenGL3_Init"][1]["call_args"] = "(glsl_version)"
 defs["ImGui_ImplOpenGL3_Init"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Init"
-defs["ImGui_ImplOpenGL3_Init"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"]["glsl_version"] = "NULL"
 defs["ImGui_ImplOpenGL3_Init"][1]["funcname"] = "ImGui_ImplOpenGL3_Init"
-defs["ImGui_ImplOpenGL3_Init"][1]["location"] = "imgui_impl_opengl3"
+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*)"
 defs["ImGui_ImplOpenGL3_Init"][1]["stname"] = ""
@@ -382,10 +361,9 @@ defs["ImGui_ImplOpenGL3_NewFrame"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
-defs["ImGui_ImplOpenGL3_NewFrame"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["funcname"] = "ImGui_ImplOpenGL3_NewFrame"
-defs["ImGui_ImplOpenGL3_NewFrame"][1]["location"] = "imgui_impl_opengl3"
+defs["ImGui_ImplOpenGL3_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["stname"] = ""
@@ -400,10 +378,9 @@ defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["argsT"][1]["type"] = "ImDrawData*"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["argsoriginal"] = "(ImDrawData* draw_data)"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["call_args"] = "(draw_data)"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
-defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["funcname"] = "ImGui_ImplOpenGL3_RenderDrawData"
-defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["location"] = "imgui_impl_opengl3"
+defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["signature"] = "(ImDrawData*)"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["stname"] = ""
@@ -415,14 +392,30 @@ defs["ImGui_ImplOpenGL3_Shutdown"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
-defs["ImGui_ImplOpenGL3_Shutdown"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["funcname"] = "ImGui_ImplOpenGL3_Shutdown"
-defs["ImGui_ImplOpenGL3_Shutdown"][1]["location"] = "imgui_impl_opengl3"
+defs["ImGui_ImplOpenGL3_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["signature"] = "()"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["stname"] = ""
 defs["ImGui_ImplOpenGL3_Shutdown"]["()"] = defs["ImGui_ImplOpenGL3_Shutdown"][1]
+defs["ImGui_ImplSDL2_InitForD3D"] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1]["args"] = "(SDL_Window* window)"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"][1] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"][1]["name"] = "window"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"][1]["type"] = "SDL_Window*"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsoriginal"] = "(SDL_Window* window)"
+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]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["ret"] = "bool"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["signature"] = "(SDL_Window*)"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["stname"] = ""
+defs["ImGui_ImplSDL2_InitForD3D"]["(SDL_Window*)"] = defs["ImGui_ImplSDL2_InitForD3D"][1]
 defs["ImGui_ImplSDL2_InitForOpenGL"] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["args"] = "(SDL_Window* window,void* sdl_gl_context)"
@@ -436,10 +429,9 @@ defs["ImGui_ImplSDL2_InitForOpenGL"][1]["argsT"][2]["type"] = "void*"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["argsoriginal"] = "(SDL_Window* window,void* sdl_gl_context)"
 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]["comment"] = ""
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["funcname"] = "ImGui_ImplSDL2_InitForOpenGL"
-defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl"
+defs["ImGui_ImplSDL2_InitForOpenGL"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForOpenGL"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["signature"] = "(SDL_Window*,void*)"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["stname"] = ""
@@ -454,10 +446,9 @@ defs["ImGui_ImplSDL2_InitForVulkan"][1]["argsT"][1]["type"] = "SDL_Window*"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["argsoriginal"] = "(SDL_Window* window)"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForVulkan"
-defs["ImGui_ImplSDL2_InitForVulkan"][1]["comment"] = ""
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["funcname"] = "ImGui_ImplSDL2_InitForVulkan"
-defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl"
+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*)"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["stname"] = ""
@@ -472,10 +463,9 @@ defs["ImGui_ImplSDL2_NewFrame"][1]["argsT"][1]["type"] = "SDL_Window*"
 defs["ImGui_ImplSDL2_NewFrame"][1]["argsoriginal"] = "(SDL_Window* window)"
 defs["ImGui_ImplSDL2_NewFrame"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplSDL2_NewFrame"
-defs["ImGui_ImplSDL2_NewFrame"][1]["comment"] = ""
 defs["ImGui_ImplSDL2_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_NewFrame"][1]["funcname"] = "ImGui_ImplSDL2_NewFrame"
-defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl"
+defs["ImGui_ImplSDL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_NewFrame"][1]["signature"] = "(SDL_Window*)"
 defs["ImGui_ImplSDL2_NewFrame"][1]["stname"] = ""
@@ -490,10 +480,9 @@ defs["ImGui_ImplSDL2_ProcessEvent"][1]["argsT"][1]["type"] = "const SDL_Event*"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["argsoriginal"] = "(const SDL_Event* event)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["call_args"] = "(event)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["cimguiname"] = "ImGui_ImplSDL2_ProcessEvent"
-defs["ImGui_ImplSDL2_ProcessEvent"][1]["comment"] = ""
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["funcname"] = "ImGui_ImplSDL2_ProcessEvent"
-defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl"
+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*)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["stname"] = ""
@@ -505,10 +494,9 @@ defs["ImGui_ImplSDL2_Shutdown"][1]["argsT"] = {}
 defs["ImGui_ImplSDL2_Shutdown"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplSDL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplSDL2_Shutdown"
-defs["ImGui_ImplSDL2_Shutdown"][1]["comment"] = ""
 defs["ImGui_ImplSDL2_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_Shutdown"][1]["funcname"] = "ImGui_ImplSDL2_Shutdown"
-defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl"
+defs["ImGui_ImplSDL2_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_Shutdown"
 defs["ImGui_ImplSDL2_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_Shutdown"][1]["signature"] = "()"
 defs["ImGui_ImplSDL2_Shutdown"][1]["stname"] = ""
--- a/generator/output/overloads.txt
+++ b/generator/output/overloads.txt
@@ -1,8 +1,7 @@
 ----------------overloadings---------------------------
-igCombo	3
-1	bool	igCombo (const char*,int*,const char* const[],int,int)
-2	bool	igComboStr (const char*,int*,const char*,int)
-3	bool	igComboFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
+ImVector_resize	2
+1	void	ImVector_resize (int)
+2	void	ImVector_resizeT (int,const T)
 ImVec4_ImVec4	2
 1	nil	ImVec4_ImVec4 ()
 2	nil	ImVec4_ImVec4Float (float,float,float,float)
@@ -11,101 +10,126 @@ igValue	4
 2	void	igValueInt (const char*,int)
 3	void	igValueUint (const char*,unsigned int)
 4	void	igValueFloat (const char*,float,const char*)
-igPushStyleVar	2
-1	void	igPushStyleVarFloat (ImGuiStyleVar,float)
-2	void	igPushStyleVarVec2 (ImGuiStyleVar,const ImVec2)
 igIsRectVisible	2
 1	bool	igIsRectVisible (const ImVec2)
 2	bool	igIsRectVisibleVec2 (const ImVec2,const ImVec2)
 igRadioButton	2
 1	bool	igRadioButtonBool (const char*,bool)
 2	bool	igRadioButtonIntPtr (const char*,int*,int)
-igSetWindowSize	2
-1	void	igSetWindowSizeVec2 (const ImVec2,ImGuiCond)
-2	void	igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond)
+ImGuiTextRange_ImGuiTextRange	2
+1	nil	ImGuiTextRange_ImGuiTextRange ()
+2	nil	ImGuiTextRange_ImGuiTextRangeStr (const char*,const char*)
+ImVector_back	2
+1	T*	ImVector_back ()
+2	const T*	ImVector_back_const ()const
+igPlotHistogram	2
+1	void	igPlotHistogramFloatPtr (const char*,const float*,int,int,const char*,float,float,ImVec2,int)
+2	void	igPlotHistogramFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)
+igGetID	3
+1	ImGuiID	igGetIDStr (const char*)
+2	ImGuiID	igGetIDRange (const char*,const char*)
+3	ImGuiID	igGetIDPtr (const void*)
+igSetWindowPos	2
+1	void	igSetWindowPosVec2 (const ImVec2,ImGuiCond)
+2	void	igSetWindowPosStr (const char*,const ImVec2,ImGuiCond)
+igBeginChild	2
+1	bool	igBeginChild (const char*,const ImVec2,bool,ImGuiWindowFlags)
+2	bool	igBeginChildID (ImGuiID,const ImVec2,bool,ImGuiWindowFlags)
+igPushID	4
+1	void	igPushIDStr (const char*)
+2	void	igPushIDRange (const char*,const char*)
+3	void	igPushIDPtr (const void*)
+4	void	igPushIDInt (int)
+ImGuiStoragePair_ImGuiStoragePair	3
+1	nil	ImGuiStoragePair_ImGuiStoragePairInt (ImGuiID,int)
+2	nil	ImGuiStoragePair_ImGuiStoragePairFloat (ImGuiID,float)
+3	nil	ImGuiStoragePair_ImGuiStoragePairPtr (ImGuiID,void*)
+igTreeNode	3
+1	bool	igTreeNodeStr (const char*)
+2	bool	igTreeNodeStrStr (const char*,const char*,...)
+3	bool	igTreeNodePtr (const void*,const char*,...)
+igCombo	3
+1	bool	igCombo (const char*,int*,const char* const[],int,int)
+2	bool	igComboStr (const char*,int*,const char*,int)
+3	bool	igComboFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
+ImVector_erase	2
+1	T*	ImVector_erase (const T*)
+2	T*	ImVector_eraseTPtr (const T*,const T*)
+ImDrawList_AddText	2
+1	void	ImDrawList_AddText (const ImVec2,ImU32,const char*,const char*)
+2	void	ImDrawList_AddTextFontPtr (const ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*)
+igPushStyleVar	2
+1	void	igPushStyleVarFloat (ImGuiStyleVar,float)
+2	void	igPushStyleVarVec2 (ImGuiStyleVar,const ImVec2)
 igSetWindowFocus	2
 1	void	igSetWindowFocus ()
 2	void	igSetWindowFocusStr (const char*)
+ImVector_end	2
+1	T*	ImVector_end ()
+2	const T*	ImVector_end_const ()const
+igSetWindowSize	2
+1	void	igSetWindowSizeVec2 (const ImVec2,ImGuiCond)
+2	void	igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond)
+ImVector_ImVector	2
+1	nil	ImVector_ImVector ()
+2	nil	ImVector_ImVectorVector (const ImVector)
 igSetWindowCollapsed	2
 1	void	igSetWindowCollapsedBool (bool,ImGuiCond)
 2	void	igSetWindowCollapsedStr (const char*,bool,ImGuiCond)
 igPlotLines	2
 1	void	igPlotLines (const char*,const float*,int,int,const char*,float,float,ImVec2,int)
 2	void	igPlotLinesFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)
-ImVec2_ImVec2	2
-1	nil	ImVec2_ImVec2 ()
-2	nil	ImVec2_ImVec2Float (float,float)
-igPlotHistogram	2
-1	void	igPlotHistogramFloatPtr (const char*,const float*,int,int,const char*,float,float,ImVec2,int)
-2	void	igPlotHistogramFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)
-igTreeNodeExV	2
-1	bool	igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list)
-2	bool	igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list)
 igPushStyleColor	2
 1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
 2	void	igPushStyleColor (ImGuiCol,const ImVec4)
-igGetID	3
-1	ImGuiID	igGetIDStr (const char*)
-2	ImGuiID	igGetIDRange (const char*,const char*)
-3	ImGuiID	igGetIDPtr (const void*)
-TextRange_TextRange	2
-1	nil	TextRange_TextRange ()
-2	nil	TextRange_TextRangeStr (const char*,const char*)
-igListBoxHeader	2
-1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
-2	bool	igListBoxHeaderInt (const char*,int,int)
-igBeginChild	2
-1	bool	igBeginChild (const char*,const ImVec2,bool,ImGuiWindowFlags)
-2	bool	igBeginChildID (ImGuiID,const ImVec2,bool,ImGuiWindowFlags)
-igTreePush	2
-1	void	igTreePushStr (const char*)
-2	void	igTreePushPtr (const void*)
-ImDrawList_AddText	2
-1	void	ImDrawList_AddText (const ImVec2,ImU32,const char*,const char*)
-2	void	ImDrawList_AddTextFontPtr (const ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*)
-igSelectable	2
-1	bool	igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2)
-2	bool	igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
+igTreeNodeExV	2
+1	bool	igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list)
+2	bool	igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list)
 igListBox	2
 1	bool	igListBoxStr_arr (const char*,int*,const char* const[],int,int)
 2	bool	igListBoxFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
-igPushID	4
-1	void	igPushIDStr (const char*)
-2	void	igPushIDRange (const char*,const char*)
-3	void	igPushIDPtr (const void*)
-4	void	igPushIDInt (int)
-Pair_Pair	3
-1	nil	Pair_PairInt (ImGuiID,int)
-2	nil	Pair_PairFloat (ImGuiID,float)
-3	nil	Pair_PairPtr (ImGuiID,void*)
-igSetWindowPos	2
-1	void	igSetWindowPosVec2 (const ImVec2,ImGuiCond)
-2	void	igSetWindowPosStr (const char*,const ImVec2,ImGuiCond)
+ImVec2_ImVec2	2
+1	nil	ImVec2_ImVec2 ()
+2	nil	ImVec2_ImVec2Float (float,float)
+igCollapsingHeader	2
+1	bool	igCollapsingHeader (const char*,ImGuiTreeNodeFlags)
+2	bool	igCollapsingHeaderBoolPtr (const char*,bool*,ImGuiTreeNodeFlags)
+igTreePush	2
+1	void	igTreePushStr (const char*)
+2	void	igTreePushPtr (const void*)
+igGetColorU32	3
+1	ImU32	igGetColorU32 (ImGuiCol,float)
+2	ImU32	igGetColorU32Vec4 (const ImVec4)
+3	ImU32	igGetColorU32U32 (ImU32)
 ImColor_ImColor	5
 1	nil	ImColor_ImColor ()
 2	nil	ImColor_ImColorInt (int,int,int,int)
 3	nil	ImColor_ImColorU32 (ImU32)
 4	nil	ImColor_ImColorFloat (float,float,float,float)
 5	nil	ImColor_ImColorVec4 (const ImVec4)
-igCollapsingHeader	2
-1	bool	igCollapsingHeader (const char*,ImGuiTreeNodeFlags)
-2	bool	igCollapsingHeaderBoolPtr (const char*,bool*,ImGuiTreeNodeFlags)
-igMenuItem	2
-1	bool	igMenuItemBool (const char*,const char*,bool,bool)
-2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
+ImVector_begin	2
+1	T*	ImVector_begin ()
+2	const T*	ImVector_begin_const ()const
+ImVector_front	2
+1	T*	ImVector_front ()
+2	const T*	ImVector_front_const ()const
+ImVector_find	2
+1	T*	ImVector_find (const T)
+2	const T*	ImVector_find_const (const T)const
 igTreeNodeEx	3
 1	bool	igTreeNodeExStr (const char*,ImGuiTreeNodeFlags)
 2	bool	igTreeNodeExStrStr (const char*,ImGuiTreeNodeFlags,const char*,...)
 3	bool	igTreeNodeExPtr (const void*,ImGuiTreeNodeFlags,const char*,...)
-igGetColorU32	3
-1	ImU32	igGetColorU32 (ImGuiCol,float)
-2	ImU32	igGetColorU32Vec4 (const ImVec4)
-3	ImU32	igGetColorU32U32 (ImU32)
-igTreeNode	3
-1	bool	igTreeNodeStr (const char*)
-2	bool	igTreeNodeStrStr (const char*,const char*,...)
-3	bool	igTreeNodePtr (const void*,const char*,...)
+igSelectable	2
+1	bool	igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2)
+2	bool	igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
+igMenuItem	2
+1	bool	igMenuItemBool (const char*,const char*,bool,bool)
+2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
+igListBoxHeader	2
+1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
+2	bool	igListBoxHeaderInt (const char*,int,int)
 igTreeNodeV	2
 1	bool	igTreeNodeVStr (const char*,const char*,va_list)
 2	bool	igTreeNodeVPtr (const void*,const char*,va_list)
-77 overloaded
+93 overloaded
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
@@ -1,6 +1,11 @@
 {
  "enums": {
    "ImDrawCornerFlags_": [
+      {
+        "calc_value": 0,
+        "name": "ImDrawCornerFlags_None",
+        "value": "0"
+      },
      {
        "calc_value": 1,
        "name": "ImDrawCornerFlags_TopLeft",
@@ -62,6 +67,11 @@
        "calc_value": 2,
        "name": "ImDrawListFlags_AntiAliasedFill",
        "value": "1 << 1"
+      },
+      {
+        "calc_value": 4,
+        "name": "ImDrawListFlags_AllowVtxOffset",
+        "value": "1 << 2"
      }
    ],
    "ImFontAtlasFlags_": [
@@ -101,6 +111,11 @@
        "calc_value": 4,
        "name": "ImGuiBackendFlags_HasSetMousePos",
        "value": "1 << 2"
+      },
+      {
+        "calc_value": 8,
+        "name": "ImGuiBackendFlags_RendererHasVtxOffset",
+        "value": "1 << 3"
      }
    ],
    "ImGuiCol_": [
@@ -271,58 +286,83 @@
      },
      {
        "calc_value": 33,
-        "name": "ImGuiCol_PlotLines",
+        "name": "ImGuiCol_Tab",
        "value": 33
      },
      {
        "calc_value": 34,
-        "name": "ImGuiCol_PlotLinesHovered",
+        "name": "ImGuiCol_TabHovered",
        "value": 34
      },
      {
        "calc_value": 35,
-        "name": "ImGuiCol_PlotHistogram",
+        "name": "ImGuiCol_TabActive",
        "value": 35
      },
      {
        "calc_value": 36,
-        "name": "ImGuiCol_PlotHistogramHovered",
+        "name": "ImGuiCol_TabUnfocused",
        "value": 36
      },
      {
        "calc_value": 37,
-        "name": "ImGuiCol_TextSelectedBg",
+        "name": "ImGuiCol_TabUnfocusedActive",
        "value": 37
      },
      {
        "calc_value": 38,
-        "name": "ImGuiCol_DragDropTarget",
+        "name": "ImGuiCol_PlotLines",
        "value": 38
      },
      {
        "calc_value": 39,
-        "name": "ImGuiCol_NavHighlight",
+        "name": "ImGuiCol_PlotLinesHovered",
        "value": 39
      },
      {
        "calc_value": 40,
-        "name": "ImGuiCol_NavWindowingHighlight",
+        "name": "ImGuiCol_PlotHistogram",
        "value": 40
      },
      {
        "calc_value": 41,
-        "name": "ImGuiCol_NavWindowingDimBg",
+        "name": "ImGuiCol_PlotHistogramHovered",
        "value": 41
      },
      {
        "calc_value": 42,
-        "name": "ImGuiCol_ModalWindowDimBg",
+        "name": "ImGuiCol_TextSelectedBg",
        "value": 42
      },
      {
        "calc_value": 43,
-        "name": "ImGuiCol_COUNT",
+        "name": "ImGuiCol_DragDropTarget",
        "value": 43
+      },
+      {
+        "calc_value": 44,
+        "name": "ImGuiCol_NavHighlight",
+        "value": 44
+      },
+      {
+        "calc_value": 45,
+        "name": "ImGuiCol_NavWindowingHighlight",
+        "value": 45
+      },
+      {
+        "calc_value": 46,
+        "name": "ImGuiCol_NavWindowingDimBg",
+        "value": 46
+      },
+      {
+        "calc_value": 47,
+        "name": "ImGuiCol_ModalWindowDimBg",
+        "value": 47
+      },
+      {
+        "calc_value": 48,
+        "name": "ImGuiCol_COUNT",
+        "value": 48
      }
    ],
    "ImGuiColorEditFlags_": [
@@ -398,17 +438,17 @@
      },
      {
        "calc_value": 1048576,
-        "name": "ImGuiColorEditFlags_RGB",
+        "name": "ImGuiColorEditFlags_DisplayRGB",
        "value": "1 << 20"
      },
      {
        "calc_value": 2097152,
-        "name": "ImGuiColorEditFlags_HSV",
+        "name": "ImGuiColorEditFlags_DisplayHSV",
        "value": "1 << 21"
      },
      {
        "calc_value": 4194304,
-        "name": "ImGuiColorEditFlags_HEX",
+        "name": "ImGuiColorEditFlags_DisplayHex",
        "value": "1 << 22"
      },
      {
@@ -431,10 +471,25 @@
        "name": "ImGuiColorEditFlags_PickerHueWheel",
        "value": "1 << 26"
      },
+      {
+        "calc_value": 134217728,
+        "name": "ImGuiColorEditFlags_InputRGB",
+        "value": "1 << 27"
+      },
+      {
+        "calc_value": 268435456,
+        "name": "ImGuiColorEditFlags_InputHSV",
+        "value": "1 << 28"
+      },
+      {
+        "calc_value": 177209344,
+        "name": "ImGuiColorEditFlags__OptionsDefault",
+        "value": "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_PickerHueBar"
+      },
      {
        "calc_value": 7340032,
-        "name": "ImGuiColorEditFlags__InputsMask",
-        "value": "ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX"
+        "name": "ImGuiColorEditFlags__DisplayMask",
+        "value": "ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_DisplayHSV|ImGuiColorEditFlags_DisplayHex"
      },
      {
        "calc_value": 25165824,
@@ -447,9 +502,9 @@
        "value": "ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar"
      },
      {
-        "calc_value": 42991616,
-        "name": "ImGuiColorEditFlags__OptionsDefault",
-        "value": "ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar"
+        "calc_value": 402653184,
+        "name": "ImGuiColorEditFlags__InputMask",
+        "value": "ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV"
      }
    ],
    "ImGuiComboFlags_": [
@@ -571,38 +626,58 @@
    "ImGuiDataType_": [
      {
        "calc_value": 0,
-        "name": "ImGuiDataType_S32",
+        "name": "ImGuiDataType_S8",
        "value": 0
      },
      {
        "calc_value": 1,
-        "name": "ImGuiDataType_U32",
+        "name": "ImGuiDataType_U8",
        "value": 1
      },
      {
        "calc_value": 2,
-        "name": "ImGuiDataType_S64",
+        "name": "ImGuiDataType_S16",
        "value": 2
      },
      {
        "calc_value": 3,
-        "name": "ImGuiDataType_U64",
+        "name": "ImGuiDataType_U16",
        "value": 3
      },
      {
        "calc_value": 4,
-        "name": "ImGuiDataType_Float",
+        "name": "ImGuiDataType_S32",
        "value": 4
      },
      {
        "calc_value": 5,
-        "name": "ImGuiDataType_Double",
+        "name": "ImGuiDataType_U32",
        "value": 5
      },
      {
        "calc_value": 6,
-        "name": "ImGuiDataType_COUNT",
+        "name": "ImGuiDataType_S64",
        "value": 6
+      },
+      {
+        "calc_value": 7,
+        "name": "ImGuiDataType_U64",
+        "value": 7
+      },
+      {
+        "calc_value": 8,
+        "name": "ImGuiDataType_Float",
+        "value": 8
+      },
+      {
+        "calc_value": 9,
+        "name": "ImGuiDataType_Double",
+        "value": 9
+      },
+      {
+        "calc_value": 10,
+        "name": "ImGuiDataType_COUNT",
+        "value": 10
      }
    ],
    "ImGuiDir_": [
@@ -878,6 +953,11 @@
        "calc_value": 1048576,
        "name": "ImGuiInputTextFlags_Multiline",
        "value": "1 << 20"
+      },
+      {
+        "calc_value": 2097152,
+        "name": "ImGuiInputTextFlags_NoMarkEdited",
+        "value": "1 << 21"
      }
    ],
    "ImGuiKey_": [
@@ -958,38 +1038,43 @@
      },
      {
        "calc_value": 15,
-        "name": "ImGuiKey_A",
+        "name": "ImGuiKey_KeyPadEnter",
        "value": 15
      },
      {
        "calc_value": 16,
-        "name": "ImGuiKey_C",
+        "name": "ImGuiKey_A",
        "value": 16
      },
      {
        "calc_value": 17,
-        "name": "ImGuiKey_V",
+        "name": "ImGuiKey_C",
        "value": 17
      },
      {
        "calc_value": 18,
-        "name": "ImGuiKey_X",
+        "name": "ImGuiKey_V",
        "value": 18
      },
      {
        "calc_value": 19,
-        "name": "ImGuiKey_Y",
+        "name": "ImGuiKey_X",
        "value": 19
      },
      {
        "calc_value": 20,
-        "name": "ImGuiKey_Z",
+        "name": "ImGuiKey_Y",
        "value": 20
      },
      {
        "calc_value": 21,
-        "name": "ImGuiKey_COUNT",
+        "name": "ImGuiKey_Z",
        "value": 21
+      },
+      {
+        "calc_value": 22,
+        "name": "ImGuiKey_COUNT",
+        "value": 22
      }
    ],
    "ImGuiMouseCursor_": [
@@ -1186,6 +1271,11 @@
        "calc_value": 8,
        "name": "ImGuiSelectableFlags_Disabled",
        "value": "1 << 3"
+      },
+      {
+        "calc_value": 16,
+        "name": "ImGuiSelectableFlags_AllowItemOverlap",
+        "value": "1 << 4"
      }
    ],
    "ImGuiStyleVar_": [
@@ -1291,13 +1381,107 @@
      },
      {
        "calc_value": 20,
-        "name": "ImGuiStyleVar_ButtonTextAlign",
+        "name": "ImGuiStyleVar_TabRounding",
        "value": 20
      },
      {
        "calc_value": 21,
-        "name": "ImGuiStyleVar_COUNT",
+        "name": "ImGuiStyleVar_ButtonTextAlign",
        "value": 21
+      },
+      {
+        "calc_value": 22,
+        "name": "ImGuiStyleVar_SelectableTextAlign",
+        "value": 22
+      },
+      {
+        "calc_value": 23,
+        "name": "ImGuiStyleVar_COUNT",
+        "value": 23
+      }
+    ],
+    "ImGuiTabBarFlags_": [
+      {
+        "calc_value": 0,
+        "name": "ImGuiTabBarFlags_None",
+        "value": "0"
+      },
+      {
+        "calc_value": 1,
+        "name": "ImGuiTabBarFlags_Reorderable",
+        "value": "1 << 0"
+      },
+      {
+        "calc_value": 2,
+        "name": "ImGuiTabBarFlags_AutoSelectNewTabs",
+        "value": "1 << 1"
+      },
+      {
+        "calc_value": 4,
+        "name": "ImGuiTabBarFlags_TabListPopupButton",
+        "value": "1 << 2"
+      },
+      {
+        "calc_value": 8,
+        "name": "ImGuiTabBarFlags_NoCloseWithMiddleMouseButton",
+        "value": "1 << 3"
+      },
+      {
+        "calc_value": 16,
+        "name": "ImGuiTabBarFlags_NoTabListScrollingButtons",
+        "value": "1 << 4"
+      },
+      {
+        "calc_value": 32,
+        "name": "ImGuiTabBarFlags_NoTooltip",
+        "value": "1 << 5"
+      },
+      {
+        "calc_value": 64,
+        "name": "ImGuiTabBarFlags_FittingPolicyResizeDown",
+        "value": "1 << 6"
+      },
+      {
+        "calc_value": 128,
+        "name": "ImGuiTabBarFlags_FittingPolicyScroll",
+        "value": "1 << 7"
+      },
+      {
+        "calc_value": 192,
+        "name": "ImGuiTabBarFlags_FittingPolicyMask_",
+        "value": "ImGuiTabBarFlags_FittingPolicyResizeDown | ImGuiTabBarFlags_FittingPolicyScroll"
+      },
+      {
+        "calc_value": 64,
+        "name": "ImGuiTabBarFlags_FittingPolicyDefault_",
+        "value": "ImGuiTabBarFlags_FittingPolicyResizeDown"
+      }
+    ],
+    "ImGuiTabItemFlags_": [
+      {
+        "calc_value": 0,
+        "name": "ImGuiTabItemFlags_None",
+        "value": "0"
+      },
+      {
+        "calc_value": 1,
+        "name": "ImGuiTabItemFlags_UnsavedDocument",
+        "value": "1 << 0"
+      },
+      {
+        "calc_value": 2,
+        "name": "ImGuiTabItemFlags_SetSelected",
+        "value": "1 << 1"
+      },
+      {
+        "calc_value": 4,
+        "name": "ImGuiTabItemFlags_NoCloseWithMiddleMouseButton",
+        "value": "1 << 2"
+      },
+      {
+        "calc_value": 8,
+        "name": "ImGuiTabItemFlags_NoPushId",
+        "value": "1 << 3"
      }
    ],
    "ImGuiTreeNodeFlags_": [
@@ -1361,6 +1545,16 @@
        "name": "ImGuiTreeNodeFlags_FramePadding",
        "value": "1 << 10"
      },
+      {
+        "calc_value": 2048,
+        "name": "ImGuiTreeNodeFlags_SpanAvailWidth",
+        "value": "1 << 11"
+      },
+      {
+        "calc_value": 4096,
+        "name": "ImGuiTreeNodeFlags_SpanFullWidth",
+        "value": "1 << 12"
+      },
      {
        "calc_value": 8192,
        "name": "ImGuiTreeNodeFlags_NavLeftJumpsBackHere",
@@ -1473,6 +1667,11 @@
        "name": "ImGuiWindowFlags_NoNavFocus",
        "value": "1 << 19"
      },
+      {
+        "calc_value": 1048576,
+        "name": "ImGuiWindowFlags_UnsavedDocument",
+        "value": "1 << 20"
+      },
      {
        "calc_value": 786432,
        "name": "ImGuiWindowFlags_NoNav",
@@ -1521,47 +1720,6 @@
    ]
  },
  "structs": {
-    "CustomRect": [
-      {
-        "name": "ID",
-        "type": "unsigned int"
-      },
-      {
-        "name": "Width",
-        "type": "unsigned short"
-      },
-      {
-        "name": "Height",
-        "type": "unsigned short"
-      },
-      {
-        "name": "X",
-        "type": "unsigned short"
-      },
-      {
-        "name": "Y",
-        "type": "unsigned short"
-      },
-      {
-        "name": "GlyphAdvanceX",
-        "type": "float"
-      },
-      {
-        "name": "GlyphOffset",
-        "type": "ImVec2"
-      },
-      {
-        "name": "Font",
-        "type": "ImFont*"
-      }
-    ],
-    "GlyphRangesBuilder": [
-      {
-        "name": "UsedChars",
-        "template_type": "unsigned char",
-        "type": "ImVector_unsigned_char"
-      }
-    ],
    "ImColor": [
      {
        "name": "Value",
@@ -1570,12 +1728,12 @@
    ],
    "ImDrawChannel": [
      {
-        "name": "CmdBuffer",
+        "name": "_CmdBuffer",
        "template_type": "ImDrawCmd",
        "type": "ImVector_ImDrawCmd"
      },
      {
-        "name": "IdxBuffer",
+        "name": "_IdxBuffer",
        "template_type": "ImDrawIdx",
        "type": "ImVector_ImDrawIdx"
      }
@@ -1593,6 +1751,14 @@
        "name": "TextureId",
        "type": "ImTextureID"
      },
+      {
+        "name": "VtxOffset",
+        "type": "unsigned int"
+      },
+      {
+        "name": "IdxOffset",
+        "type": "unsigned int"
+      },
      {
        "name": "UserCallback",
        "type": "ImDrawCallback"
@@ -1630,6 +1796,10 @@
      {
        "name": "DisplaySize",
        "type": "ImVec2"
+      },
+      {
+        "name": "FramebufferScale",
+        "type": "ImVec2"
      }
    ],
    "ImDrawList": [
@@ -1660,6 +1830,10 @@
        "name": "_OwnerName",
        "type": "const char*"
      },
+      {
+        "name": "_VtxCurrentOffset",
+        "type": "unsigned int"
+      },
      {
        "name": "_VtxCurrentIdx",
        "type": "unsigned int"
@@ -1688,11 +1862,17 @@
        "type": "ImVector_ImVec2"
      },
      {
-        "name": "_ChannelsCurrent",
+        "name": "_Splitter",
+        "type": "ImDrawListSplitter"
+      }
+    ],
+    "ImDrawListSplitter": [
+      {
+        "name": "_Current",
        "type": "int"
      },
      {
-        "name": "_ChannelsCount",
+        "name": "_Count",
        "type": "int"
      },
      {
@@ -1716,56 +1896,60 @@
      }
    ],
    "ImFont": [
-      {
-        "name": "FontSize",
-        "type": "float"
-      },
-      {
-        "name": "Scale",
-        "type": "float"
-      },
-      {
-        "name": "DisplayOffset",
-        "type": "ImVec2"
-      },
-      {
-        "name": "Glyphs",
-        "template_type": "ImFontGlyph",
-        "type": "ImVector_ImFontGlyph"
-      },
      {
        "name": "IndexAdvanceX",
        "template_type": "float",
        "type": "ImVector_float"
      },
+      {
+        "name": "FallbackAdvanceX",
+        "type": "float"
+      },
+      {
+        "name": "FontSize",
+        "type": "float"
+      },
      {
        "name": "IndexLookup",
        "template_type": "ImWchar",
        "type": "ImVector_ImWchar"
      },
+      {
+        "name": "Glyphs",
+        "template_type": "ImFontGlyph",
+        "type": "ImVector_ImFontGlyph"
+      },
      {
        "name": "FallbackGlyph",
        "type": "const ImFontGlyph*"
      },
      {
-        "name": "FallbackAdvanceX",
-        "type": "float"
+        "name": "DisplayOffset",
+        "type": "ImVec2"
      },
      {
-        "name": "FallbackChar",
-        "type": "ImWchar"
+        "name": "ContainerAtlas",
+        "type": "ImFontAtlas*"
+      },
+      {
+        "name": "ConfigData",
+        "type": "const ImFontConfig*"
      },
      {
        "name": "ConfigDataCount",
        "type": "short"
      },
      {
-        "name": "ConfigData",
-        "type": "ImFontConfig*"
+        "name": "FallbackChar",
+        "type": "ImWchar"
      },
      {
-        "name": "ContainerAtlas",
-        "type": "ImFontAtlas*"
+        "name": "EllipsisChar",
+        "type": "ImWchar"
+      },
+      {
+        "name": "Scale",
+        "type": "float"
      },
      {
        "name": "Ascent",
@@ -1775,13 +1959,13 @@
        "name": "Descent",
        "type": "float"
      },
-      {
-        "name": "DirtyLookupTables",
-        "type": "bool"
-      },
      {
        "name": "MetricsTotalSurface",
        "type": "int"
+      },
+      {
+        "name": "DirtyLookupTables",
+        "type": "bool"
      }
    ],
    "ImFontAtlas": [
@@ -1836,8 +2020,8 @@
      },
      {
        "name": "CustomRects",
-        "template_type": "CustomRect",
-        "type": "ImVector_CustomRect"
+        "template_type": "ImFontAtlasCustomRect",
+        "type": "ImVector_ImFontAtlasCustomRect"
      },
      {
        "name": "ConfigData",
@@ -1850,6 +2034,40 @@
        "type": "int"
      }
    ],
+    "ImFontAtlasCustomRect": [
+      {
+        "name": "ID",
+        "type": "unsigned int"
+      },
+      {
+        "name": "Width",
+        "type": "unsigned short"
+      },
+      {
+        "name": "Height",
+        "type": "unsigned short"
+      },
+      {
+        "name": "X",
+        "type": "unsigned short"
+      },
+      {
+        "name": "Y",
+        "type": "unsigned short"
+      },
+      {
+        "name": "GlyphAdvanceX",
+        "type": "float"
+      },
+      {
+        "name": "GlyphOffset",
+        "type": "ImVec2"
+      },
+      {
+        "name": "Font",
+        "type": "ImFont*"
+      }
+    ],
    "ImFontConfig": [
      {
        "name": "FontData",
@@ -1915,6 +2133,10 @@
        "name": "RasterizerMultiply",
        "type": "float"
      },
+      {
+        "name": "EllipsisChar",
+        "type": "ImWchar"
+      },
      {
        "name": "Name[40]",
        "size": 40,
@@ -1967,6 +2189,13 @@
        "type": "float"
      }
    ],
+    "ImFontGlyphRangesBuilder": [
+      {
+        "name": "UsedChars",
+        "template_type": "ImU32",
+        "type": "ImVector_ImU32"
+      }
+    ],
    "ImGuiIO": [
      {
        "name": "ConfigFlags",
@@ -2010,7 +2239,7 @@
      },
      {
        "name": "KeyMap[ImGuiKey_COUNT]",
-        "size": 21,
+        "size": 22,
        "type": "int"
      },
      {
@@ -2045,14 +2274,6 @@
        "name": "DisplayFramebufferScale",
        "type": "ImVec2"
      },
-      {
-        "name": "DisplayVisibleMin",
-        "type": "ImVec2"
-      },
-      {
-        "name": "DisplayVisibleMax",
-        "type": "ImVec2"
-      },
      {
        "name": "MouseDrawCursor",
        "type": "bool"
@@ -2066,9 +2287,17 @@
        "type": "bool"
      },
      {
-        "name": "ConfigResizeWindowsFromEdges",
+        "name": "ConfigWindowsResizeFromEdges",
        "type": "bool"
      },
+      {
+        "name": "ConfigWindowsMoveFromTitleBarOnly",
+        "type": "bool"
+      },
+      {
+        "name": "ConfigWindowsMemoryCompactTimer",
+        "type": "float"
+      },
      {
        "name": "BackendPlatformName",
        "type": "const char*"
@@ -2077,6 +2306,18 @@
        "name": "BackendRendererName",
        "type": "const char*"
      },
+      {
+        "name": "BackendPlatformUserData",
+        "type": "void*"
+      },
+      {
+        "name": "BackendRendererUserData",
+        "type": "void*"
+      },
+      {
+        "name": "BackendLanguageUserData",
+        "type": "void*"
+      },
      {
        "name": "GetClipboardTextFn",
        "type": "const char*(*)(void* user_data)"
@@ -2139,11 +2380,6 @@
        "size": 512,
        "type": "bool"
      },
-      {
-        "name": "InputCharacters[16+1]",
-        "size": 17,
-        "type": "ImWchar"
-      },
      {
        "name": "NavInputs[ImGuiNavInput_COUNT]",
        "size": 21,
@@ -2239,6 +2475,11 @@
        "size": 5,
        "type": "bool"
      },
+      {
+        "name": "MouseDownWasDoubleClick[5]",
+        "size": 5,
+        "type": "bool"
+      },
      {
        "name": "MouseDownDuration[5]",
        "size": 5,
@@ -2278,6 +2519,11 @@
        "name": "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]",
        "size": 21,
        "type": "float"
+      },
+      {
+        "name": "InputQueueCharacters",
+        "template_type": "ImWchar",
+        "type": "ImVector_ImWchar"
      }
    ],
    "ImGuiInputTextCallbackData": [
@@ -2418,8 +2664,18 @@
    "ImGuiStorage": [
      {
        "name": "Data",
-        "template_type": "Pair",
-        "type": "ImVector_Pair"
+        "template_type": "ImGuiStoragePair",
+        "type": "ImVector_ImGuiStoragePair"
+      }
+    ],
+    "ImGuiStoragePair": [
+      {
+        "name": "key",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "",
+        "type": "union { int val_i; float val_f; void* val_p;}"
      }
    ],
    "ImGuiStyle": [
@@ -2447,6 +2703,10 @@
        "name": "WindowTitleAlign",
        "type": "ImVec2"
      },
+      {
+        "name": "WindowMenuButtonPosition",
+        "type": "ImGuiDir"
+      },
      {
        "name": "ChildRounding",
        "type": "float"
@@ -2511,10 +2771,26 @@
        "name": "GrabRounding",
        "type": "float"
      },
+      {
+        "name": "TabRounding",
+        "type": "float"
+      },
+      {
+        "name": "TabBorderSize",
+        "type": "float"
+      },
+      {
+        "name": "ColorButtonPosition",
+        "type": "ImGuiDir"
+      },
      {
        "name": "ButtonTextAlign",
        "type": "ImVec2"
      },
+      {
+        "name": "SelectableTextAlign",
+        "type": "ImVec2"
+      },
      {
        "name": "DisplayWindowPadding",
        "type": "ImVec2"
@@ -2541,7 +2817,7 @@
      },
      {
        "name": "Colors[ImGuiCol_COUNT]",
-        "size": 43,
+        "size": 48,
        "type": "ImVec4"
      }
    ],
@@ -2560,14 +2836,24 @@
      },
      {
        "name": "Filters",
-        "template_type": "TextRange",
-        "type": "ImVector_TextRange"
+        "template_type": "ImGuiTextRange",
+        "type": "ImVector_ImGuiTextRange"
      },
      {
        "name": "CountGrep",
        "type": "int"
      }
    ],
+    "ImGuiTextRange": [
+      {
+        "name": "b",
+        "type": "const char*"
+      },
+      {
+        "name": "e",
+        "type": "const char*"
+      }
+    ],
    "ImVec2": [
      {
        "name": "x",
@@ -2595,27 +2881,6 @@
        "name": "w",
        "type": "float"
      }
-    ],
-    "ImVector": [],
-    "Pair": [
-      {
-        "name": "key",
-        "type": "ImGuiID"
-      },
-      {
-        "name": "}",
-        "type": "union { int val_i; float val_f; void* val_p;"
-      }
-    ],
-    "TextRange": [
-      {
-        "name": "b",
-        "type": "const char*"
-      },
-      {
-        "name": "e",
-        "type": "const char*"
-      }
    ]
  }
 }
--- 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
@@ -1,6 +1,4 @@
 {
-  "CustomRect": "struct CustomRect",
-  "GlyphRangesBuilder": "struct GlyphRangesBuilder",
  "ImColor": "struct ImColor",
  "ImDrawCallback": "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);",
  "ImDrawChannel": "struct ImDrawChannel",
@@ -11,16 +9,18 @@
  "ImDrawList": "struct ImDrawList",
  "ImDrawListFlags": "int",
  "ImDrawListSharedData": "struct ImDrawListSharedData",
+  "ImDrawListSplitter": "struct ImDrawListSplitter",
  "ImDrawVert": "struct ImDrawVert",
  "ImFont": "struct ImFont",
  "ImFontAtlas": "struct ImFontAtlas",
+  "ImFontAtlasCustomRect": "struct ImFontAtlasCustomRect",
  "ImFontAtlasFlags": "int",
  "ImFontConfig": "struct ImFontConfig",
  "ImFontGlyph": "struct ImFontGlyph",
+  "ImFontGlyphRangesBuilder": "struct ImFontGlyphRangesBuilder",
  "ImGuiBackendFlags": "int",
  "ImGuiCol": "int",
  "ImGuiColorEditFlags": "int",
-  "ImGuiColumnsFlags": "int",
  "ImGuiComboFlags": "int",
  "ImGuiCond": "int",
  "ImGuiConfigFlags": "int",
@@ -45,22 +45,28 @@
  "ImGuiSizeCallback": "void(*)(ImGuiSizeCallbackData* data);",
  "ImGuiSizeCallbackData": "struct ImGuiSizeCallbackData",
  "ImGuiStorage": "struct ImGuiStorage",
+  "ImGuiStoragePair": "struct ImGuiStoragePair",
  "ImGuiStyle": "struct ImGuiStyle",
  "ImGuiStyleVar": "int",
+  "ImGuiTabBarFlags": "int",
+  "ImGuiTabItemFlags": "int",
  "ImGuiTextBuffer": "struct ImGuiTextBuffer",
  "ImGuiTextFilter": "struct ImGuiTextFilter",
+  "ImGuiTextRange": "struct ImGuiTextRange",
  "ImGuiTreeNodeFlags": "int",
  "ImGuiWindowFlags": "int",
+  "ImS16": "signed short",
  "ImS32": "signed int",
  "ImS64": "int64_t",
+  "ImS8": "signed char",
  "ImTextureID": "void*",
+  "ImU16": "unsigned short",
  "ImU32": "unsigned int",
  "ImU64": "uint64_t",
+  "ImU8": "unsigned char",
  "ImVec2": "struct ImVec2",
  "ImVec4": "struct ImVec4",
  "ImWchar": "unsigned short",
-  "Pair": "struct Pair",
-  "TextRange": "struct TextRange",
  "const_iterator": "const value_type*",
  "iterator": "value_type*",
  "value_type": "T"
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -1,6 +1,4 @@
 local defs = {}
-defs["CustomRect"] = "struct CustomRect"
-defs["GlyphRangesBuilder"] = "struct GlyphRangesBuilder"
 defs["ImColor"] = "struct ImColor"
 defs["ImDrawCallback"] = "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);"
 defs["ImDrawChannel"] = "struct ImDrawChannel"
@@ -11,16 +9,18 @@ defs["ImDrawIdx"] = "unsigned short"
 defs["ImDrawList"] = "struct ImDrawList"
 defs["ImDrawListFlags"] = "int"
 defs["ImDrawListSharedData"] = "struct ImDrawListSharedData"
+defs["ImDrawListSplitter"] = "struct ImDrawListSplitter"
 defs["ImDrawVert"] = "struct ImDrawVert"
 defs["ImFont"] = "struct ImFont"
 defs["ImFontAtlas"] = "struct ImFontAtlas"
+defs["ImFontAtlasCustomRect"] = "struct ImFontAtlasCustomRect"
 defs["ImFontAtlasFlags"] = "int"
 defs["ImFontConfig"] = "struct ImFontConfig"
 defs["ImFontGlyph"] = "struct ImFontGlyph"
+defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder"
 defs["ImGuiBackendFlags"] = "int"
 defs["ImGuiCol"] = "int"
 defs["ImGuiColorEditFlags"] = "int"
-defs["ImGuiColumnsFlags"] = "int"
 defs["ImGuiComboFlags"] = "int"
 defs["ImGuiCond"] = "int"
 defs["ImGuiConfigFlags"] = "int"
@@ -45,22 +45,28 @@ defs["ImGuiSelectableFlags"] = "int"
 defs["ImGuiSizeCallback"] = "void(*)(ImGuiSizeCallbackData* data);"
 defs["ImGuiSizeCallbackData"] = "struct ImGuiSizeCallbackData"
 defs["ImGuiStorage"] = "struct ImGuiStorage"
+defs["ImGuiStoragePair"] = "struct ImGuiStoragePair"
 defs["ImGuiStyle"] = "struct ImGuiStyle"
 defs["ImGuiStyleVar"] = "int"
+defs["ImGuiTabBarFlags"] = "int"
+defs["ImGuiTabItemFlags"] = "int"
 defs["ImGuiTextBuffer"] = "struct ImGuiTextBuffer"
 defs["ImGuiTextFilter"] = "struct ImGuiTextFilter"
+defs["ImGuiTextRange"] = "struct ImGuiTextRange"
 defs["ImGuiTreeNodeFlags"] = "int"
 defs["ImGuiWindowFlags"] = "int"
+defs["ImS16"] = "signed short"
 defs["ImS32"] = "signed int"
 defs["ImS64"] = "int64_t"
+defs["ImS8"] = "signed char"
 defs["ImTextureID"] = "void*"
+defs["ImU16"] = "unsigned short"
 defs["ImU32"] = "unsigned int"
 defs["ImU64"] = "uint64_t"
+defs["ImU8"] = "unsigned char"
 defs["ImVec2"] = "struct ImVec2"
 defs["ImVec4"] = "struct ImVec4"
 defs["ImWchar"] = "unsigned short"
-defs["Pair"] = "struct Pair"
-defs["TextRange"] = "struct TextRange"
 defs["const_iterator"] = "const value_type*"
 defs["iterator"] = "value_type*"
 defs["value_type"] = "T"
--- a/2
+++ b/2
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -0,0 +1,11 @@
+file(GLOB CIMGUI_TEST_SOURCES
+    main.c
+)
+
+add_executable(cimgui_test ${CIMGUI_TEST_SOURCES})
+
+set_target_properties(cimgui_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set_property(TARGET cimgui_test PROPERTY C_STANDARD 99)
+
+target_compile_definitions(cimgui_test PRIVATE CIMGUI_DEFINE_ENUMS_AND_STRUCTS=1)
+target_link_libraries(cimgui_test PRIVATE cimgui)
--- a/test/main.c
+++ b/test/main.c
@@ -0,0 +1,41 @@
+#include <stdio.h>
+#include <assert.h>
+#include "../cimgui.h"
+
+int main(void)
+{
+  assert(igDebugCheckVersionAndDataLayout(igGetVersion(), sizeof(ImGuiIO), sizeof(ImGuiStyle),
+                                          sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert),
+                                          sizeof(ImDrawIdx)));
+  printf("CreateContext() - v%s\n", igGetVersion());
+  igCreateContext(NULL);
+  ImGuiIO *io = igGetIO();
+
+  unsigned char *text_pixels = NULL;
+  int text_w, text_h;
+  ImFontAtlas_GetTexDataAsRGBA32(io->Fonts, &text_pixels, &text_w, &text_h, NULL);
+
+  for (int n = 0; n < 20; n++) {
+    printf("NewFrame() %d\n", n);
+
+    ImVec2 display_size;
+    display_size.x = 1920;
+    display_size.y = 1080;
+    io->DisplaySize = display_size;
+    io->DeltaTime = 1.0f / 60.0f;
+    igNewFrame();
+
+    static float f = 0.0f;
+    igText("Hello World!");
+    igSliderFloat("float", &f, 0.0f, 1.0f, "%.3f", 1.0f);
+    igText("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io->Framerate, io->Framerate);
+    igShowDemoWindow(NULL);
+
+    igRender();
+  }
+
+  printf("DestroyContext()\n");
+  igDestroyContext(NULL);
+
+  return 0;
+}
--- a/testbuildc/build.bat
+++ b/testbuildc/build.bat
@@ -1,6 +0,0 @@
-set PATH=%PATH%;C:\mingw32\bin;
-::set PATH=%PATH%;C:\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\mingw32\bin;
-::gcc -std=c99 -DCIMGUI_DEFINE_ENUMS_AND_STRUCTS cimgui.h
-::gcc  -DCIMGUI_DEFINE_ENUMS_AND_STRUCTS cimgui.h
-gcc  -DCIMGUI_DEFINE_ENUMS_AND_STRUCTS cimguitest.c
-cmd /k
--- a/testbuildc/cimguitest.c
+++ b/testbuildc/cimguitest.c
@@ -1,5 +0,0 @@
-#include "../cimgui.h"
-
-void main(void)
-{
-}
--- a/testbuildc/testcl.bat
+++ b/testbuildc/testcl.bat
@@ -1,13 +0,0 @@
-::set PATH=%PATH%;C:\luaGL;C:\mingw32\bin;
-::gcc -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ../imgui/imgui.h > 11.txt
-
-::set PATH=%PATH%;C:\luaGL;
-::set PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.15.26726\bin\Hostx64\x64;
-
-::ejecutar en cmd esto 
-::"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-
-::cl /P /DIMGUI_DISABLE_OBSOLETE_FUNCTIONS /DIMGUI_API="" /DIMGUI_IMPL_API="" ../imgui/imgui.h 
-:: > clout.txt
-cl  /P /DCIMGUI_DEFINE_ENUMS_AND_STRUCTS cimguitest.c
-cmd /k
Author	SHA1	Message	Date
sonoro1234	d9e1d9a80d	drop cimgui_internal.h generation	2019-12-02 10:50:47 +01:00
sonoro1234	4d7a7ac09f	cimgui_internal.h generation	2019-11-28 11:59:25 +01:00
sonoro1234	8096fb69fe	pull imgui correction for unnamed argument	2019-11-27 15:02:40 +01:00
Victor Bombi	97cfb930e0	Merge pull request #110 from cimgui/internal more preparation for imgui_internal inclusion, main change replace en…	2019-11-27 12:35:57 +01:00
sonoro1234	549e3cc8f8	more preparation for imgui_internal inclusion, main change replace enum with typedef enum	2019-11-27 12:31:16 +01:00
sonoro1234	3a7d0d46f8	pull ImGui 1.74 and generation	2019-11-26 10:02:00 +01:00
sonoro1234	e3cbc0119e	generator.lua: preparation of imgui_internal inclusion	2019-11-26 09:56:37 +01:00
sonoro1234	7c405d3a38	cpp2ffi: add order table	2019-11-26 09:55:30 +01:00
sonoro1234	a310379820	generator.lua: use namespace in function generation, parseImGuiHeader as function	2019-11-21 13:14:41 +01:00
sonoro1234	e53a7beaeb	cimgui_template: include imgui_internal.h before cimgui.h	2019-11-21 13:12:39 +01:00
sonoro1234	e7c5c6b9a1	cpp2ffi:better function return detection	2019-11-21 13:11:19 +01:00
Victor Bombi	c09dc063b0	Merge pull request #107 from rokups/workflows github actions build script Thanks @rokups and @lmariscal for the work done!!	2019-11-06 10:33:26 +01:00
Rokas Kupstys	e3136bb882	CI tall luajit and add bindings generation step.	2019-11-06 11:00:05 +02:00
Rokas Kupstys	59583ea35a	Implement weekly builds using github actions. Based on a script from @nimgl - thanks!	2019-11-05 09:53:49 +02:00
Victor Bombi	c05aa00083	Merge pull request #104 from s-ol/no-stdcpp Compile without exception support to link without stdc++	2019-10-21 15:41:10 +02:00
s-ol	75f2167111	compile without exception support to link without stdc++	2019-10-17 23:31:45 +02:00
sonoro1234	bc5f64b2c2	add colon left out in ImVector_ImWchar_destroy manual declaration	2019-09-29 12:39:50 +02:00
sonoro1234	7cafceccae	Add ImVector_ImWchar_destroy manual function	2019-09-27 12:31:42 +02:00
sonoro1234	1c65ee2bdc	pull imgui 1.73	2019-09-25 12:44:17 +02:00
sonoro1234	0f5aa16fe8	drop ImVector functions	2019-09-25 12:39:51 +02:00
Victor Bombi	cde83f9fe8	Merge pull request #102 from lmariscal/ci Update CMake to a modern module system and create simple test	2019-08-01 18:41:43 +02:00
sonoro1234	eefd229b68	readme: use cimgui travis account	2019-08-01 18:37:28 +02:00
Leonardo Mariscal	df61f2c552	Add Windows to travis CI	2019-08-01 07:59:37 -05:00
sonoro1234	c0d75f6f8d	pull imgui 1.72b	2019-08-01 12:23:17 +02:00
Leonardo Mariscal	14e8be9af1	Update CMake to a more modern module management system and create simple test based on imgui null example	2019-07-31 19:37:51 -05:00
Victor Bombi	ccf494d1c3	Merge pull request #101 from AODQ/master adds generator shell script	2019-07-31 10:13:05 +02:00
aodq	8c817de195	adds generator shell script	2019-07-30 23:15:39 -04:00
sonoro1234	8f3ab64917	Do with ImGuiStoragePair what was done with Pair (unnamed union correction)	2019-07-29 12:42:50 +02:00
sonoro1234	14251bb176	update readme	2019-07-29 12:20:19 +02:00
sonoro1234	e61825224b	pull imgui 1.72 and regenerate	2019-07-29 12:17:38 +02:00
sonoro1234	94ab1adf9e	generator corrections for vector<type>name to vector<type> name and take care of Pair not present (after 1.71)	2019-07-29 12:16:29 +02:00
sonoro1234	094a52e6b6	revert ApplicationServices linking if APPLE(only needed in 1.71)	2019-07-29 12:14:13 +02:00
sonoro1234	f7520ee03d	Revert "revert last commit see: https://github.com/cimgui/cimgui/pull/98#issuecomment-513867796 " This reverts commit `b0c65144ab`. will have to be reverted in 1.72	2019-07-22 19:53:20 +02:00
sonoro1234	b0c65144ab	revert last commit see: https://github.com/cimgui/cimgui/pull/98#issuecomment-513867796	2019-07-22 19:14:41 +02:00
Victor Bombi	50ded57ba3	Merge pull request #98 from mellinoe/fix-macos-build Link to ApplicationServices.framework on macOS.	2019-07-17 19:39:22 +02:00
Eric Mellino	50ae38591a	Link to ApplicationServices.framework on macOS.	2019-07-17 09:52:54 -07:00
sonoro1234	975a735d38	rename generator2 to generator and generator to generator_old	2019-06-25 10:50:04 +02:00
sonoro1234	2b03f434d4	one day I wont forget readme	2019-06-12 19:47:52 +02:00
sonoro1234	37c52332f4	pull imgui 1.71 and generate	2019-06-12 19:45:37 +02:00
sonoro1234	84932b4830	update README.md	2019-05-07 15:56:11 +02:00
sonoro1234	022f60320f	add characters \| < to defaults parsing	2019-05-06 16:41:40 +02:00
sonoro1234	1aeb9ad132	pull imgui 1.70 and generate	2019-05-06 15:59:27 +02:00
sonoro1234	648cf587c9	README.md update for 1.69	2019-04-29 11:45:37 +02:00
Victor Bombi	aa99302d24	Merge pull request #94 from nihuynh/Makefile_fix fixing makefile	2019-04-16 12:45:18 +02:00
Nicolas Huynh	4fca16eada	fixing makefile	2019-04-16 02:15:52 +02:00
sonoro1234	ff404142f4	readme : use generator before compilation	2019-04-03 13:50:49 +02:00
sonoro1234	4be0522d9f	pull imgui 1.69 and generate	2019-03-13 17:05:22 +01:00
sonoro1234	bc6f6e664e	readme use generator2.bat	2019-03-06 11:00:21 +01:00
sonoro1234	343a8e4ea5	update README.md	2019-02-19 13:18:20 +01:00
Victor Bombi	0d4fa8b8bc	Merge pull request #91 from cimgui/ImVector Im vector	2019-02-19 13:13:02 +01:00
sonoro1234	666a687e0f	pull imgui 1.68	2019-02-19 13:11:06 +01:00
sonoro1234	806ff124a1	build test -Wall std=99 -Wpedantic	2019-02-18 12:33:12 +01:00
sonoro1234	186ebd8f06	drop comments and update README.md for top level functions	2019-02-15 16:54:23 +01:00
sonoro1234	d331453422	correct issue #88 (Pair union member)	2019-02-15 12:24:06 +01:00
sonoro1234	e125f405e3	more README.md update	2019-02-15 12:10:52 +01:00
sonoro1234	498f9802d1	update README.md	2019-02-15 11:17:51 +01:00
sonoro1234	6c9a018705	drop ImVector:contains() for not applicable types	2019-02-14 20:15:33 +01:00
sonoro1234	347d8d58b0	with templated structs generated	2019-02-14 13:05:49 +01:00
sonoro1234	161385607d	not templated structs generated	2019-02-12 19:59:39 +01:00
sonoro1234	23f2a1f026	get template typenames generated	2019-02-12 19:40:00 +01:00
sonoro1234	490effa341	get template typenames	2019-02-12 18:52:00 +01:00
sonoro1234	0d864f94bd	ImVector functions inclusion	2019-02-12 12:16:21 +01:00
sonoro1234	55f1afa2db	update readme	2019-01-27 22:51:31 +01:00
sonoro1234	71a9410ce6	cpp2ffi take care or type and name separated by * without spaces	2019-01-27 17:20:07 +01:00
Victor Bombi	036d2c1f9e	Merge pull request #86 from mellinoe/update-to-1.67 Update imgui submodule to 1.67 and re-generate.	2019-01-17 16:43:00 +01:00
Eric Mellino	b5c7ed5862	Update imgui submodule to 1.67 and re-generate.	2019-01-14 18:42:10 -08:00
sonoro1234	d2ee8fc7dd	improve functionD_re	2018-12-24 12:28:37 +01:00
sonoro1234	593867e320	generator2 files	2018-12-23 19:53:14 +01:00
sonoro1234	907c2fddce	generator.lua take care of type and name separated by * without spaces	2018-12-21 11:59:35 +01:00