update README.md

pull imgui 1.75 and generate
add config_generator.lua for setting additional includes needed by any implementation.
2025-08-11 04:18:29 +01:00 · 2020-02-10 16:30:19 +01:00 · 2020-02-10 16:28:40 +01:00 · 2020-01-24 16:40:16 +01:00 · 2020-01-23 12:15:14 +01:00 · 2020-01-05 12:43:14 +01:00
21 changed files with 1384 additions and 764 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/2
+++ b/2
@@ -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)

--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)

 Notes:
-* currently this wrapper is based on version [1.73 of Dear ImGui]
+* currently this wrapper is based on version [1.75 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)
@@ -31,7 +31,9 @@ Notes:
 * 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` 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.
+* edit `generator/generator.bat` on windows, or `generator/generator.sh` on linux, to choose between gcc, clang, cl or nocompiler and to choose desired implementations. 
+* edit config_generator.lua for adding includes needed by your chosen implementations.
+* Run generator.bat or generator.sh 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
@@ -46,17 +48,17 @@ Notes:
  * 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)
+  * retref : is set 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
  * defaults : a collection in which key is argument name and value is the default value.
  * 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 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)
+  * isvararg : is set if some argument is a vararg
+  * constructor : is set if the function is a constructor for a class
+  * destructor : is set if the function is a destructor for a class
+  * templated : is set if the function belongs to a templated class (ImVector)
+  * templatedgen: is set 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.73" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.75" 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)
 {
@@ -700,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)
 {
@@ -744,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)
 {
@@ -760,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)
 {
@@ -812,13 +813,13 @@ CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double ste
 {
    return ImGui::InputDouble(label,v,step,step_fast,format,flags);
 }
-CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags 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::InputScalar(label,data_type,v,step,step_fast,format,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* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags 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,v,components,step,step_fast,format,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)
 {
@@ -988,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();
@@ -1004,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);
@@ -1047,15 +1048,15 @@ CIMGUI_API bool igBeginPopup(const char* str_id,ImGuiWindowFlags flags)
 {
    return ImGui::BeginPopup(str_id,flags);
 }
-CIMGUI_API bool igBeginPopupContextItem(const char* str_id,int mouse_button)
+CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiMouseButton mouse_button)
 {
    return ImGui::BeginPopupContextItem(str_id,mouse_button);
 }
-CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,int mouse_button,bool also_over_items)
+CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items)
 {
    return ImGui::BeginPopupContextWindow(str_id,mouse_button,also_over_items);
 }
-CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,int mouse_button)
+CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiMouseButton mouse_button)
 {
    return ImGui::BeginPopupContextVoid(str_id,mouse_button);
 }
@@ -1067,7 +1068,7 @@ CIMGUI_API void igEndPopup()
 {
    return ImGui::EndPopup();
 }
-CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,int mouse_button)
+CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,ImGuiMouseButton mouse_button)
 {
    return ImGui::OpenPopupOnItemClick(str_id,mouse_button);
 }
@@ -1207,7 +1208,7 @@ CIMGUI_API bool igIsItemFocused()
 {
    return ImGui::IsItemFocused();
 }
-CIMGUI_API bool igIsItemClicked(int mouse_button)
+CIMGUI_API bool igIsItemClicked(ImGuiMouseButton mouse_button)
 {
    return ImGui::IsItemClicked(mouse_button);
 }
@@ -1231,6 +1232,10 @@ CIMGUI_API bool igIsItemDeactivatedAfterEdit()
 {
    return ImGui::IsItemDeactivatedAfterEdit();
 }
+CIMGUI_API bool igIsItemToggledOpen()
+{
+    return ImGui::IsItemToggledOpen();
+}
 CIMGUI_API bool igIsAnyItemHovered()
 {
    return ImGui::IsAnyItemHovered();
@@ -1343,29 +1348,25 @@ CIMGUI_API int igGetKeyPressedAmount(int key_index,float repeat_delay,float rate
 {
    return ImGui::GetKeyPressedAmount(key_index,repeat_delay,rate);
 }
-CIMGUI_API bool igIsMouseDown(int button)
+CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value)
+{
+    return ImGui::CaptureKeyboardFromApp(want_capture_keyboard_value);
+}
+CIMGUI_API bool igIsMouseDown(ImGuiMouseButton button)
 {
    return ImGui::IsMouseDown(button);
 }
-CIMGUI_API bool igIsAnyMouseDown()
-{
-    return ImGui::IsAnyMouseDown();
-}
-CIMGUI_API bool igIsMouseClicked(int button,bool repeat)
+CIMGUI_API bool igIsMouseClicked(ImGuiMouseButton button,bool repeat)
 {
    return ImGui::IsMouseClicked(button,repeat);
 }
-CIMGUI_API bool igIsMouseDoubleClicked(int button)
-{
-    return ImGui::IsMouseDoubleClicked(button);
-}
-CIMGUI_API bool igIsMouseReleased(int button)
+CIMGUI_API bool igIsMouseReleased(ImGuiMouseButton button)
 {
    return ImGui::IsMouseReleased(button);
 }
-CIMGUI_API bool igIsMouseDragging(int button,float lock_threshold)
+CIMGUI_API bool igIsMouseDoubleClicked(ImGuiMouseButton button)
 {
-    return ImGui::IsMouseDragging(button,lock_threshold);
+    return ImGui::IsMouseDoubleClicked(button);
 }
 CIMGUI_API bool igIsMouseHoveringRect(const ImVec2 r_min,const ImVec2 r_max,bool clip)
 {
@@ -1375,6 +1376,10 @@ CIMGUI_API bool igIsMousePosValid(const ImVec2* mouse_pos)
 {
    return ImGui::IsMousePosValid(mouse_pos);
 }
+CIMGUI_API bool igIsAnyMouseDown()
+{
+    return ImGui::IsAnyMouseDown();
+}
 CIMGUI_API ImVec2 igGetMousePos()
 {
    return ImGui::GetMousePos();
@@ -1383,11 +1388,15 @@ CIMGUI_API ImVec2 igGetMousePosOnOpeningCurrentPopup()
 {
    return ImGui::GetMousePosOnOpeningCurrentPopup();
 }
-CIMGUI_API ImVec2 igGetMouseDragDelta(int button,float lock_threshold)
+CIMGUI_API bool igIsMouseDragging(ImGuiMouseButton button,float lock_threshold)
+{
+    return ImGui::IsMouseDragging(button,lock_threshold);
+}
+CIMGUI_API ImVec2 igGetMouseDragDelta(ImGuiMouseButton button,float lock_threshold)
 {
    return ImGui::GetMouseDragDelta(button,lock_threshold);
 }
-CIMGUI_API void igResetMouseDragDelta(int button)
+CIMGUI_API void igResetMouseDragDelta(ImGuiMouseButton button)
 {
    return ImGui::ResetMouseDragDelta(button);
 }
@@ -1395,13 +1404,9 @@ CIMGUI_API ImGuiMouseCursor igGetMouseCursor()
 {
    return ImGui::GetMouseCursor();
 }
-CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type)
+CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor cursor_type)
 {
-    return ImGui::SetMouseCursor(type);
-}
-CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value)
-{
-    return ImGui::CaptureKeyboardFromApp(want_capture_keyboard_value);
+    return ImGui::SetMouseCursor(cursor_type);
 }
 CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value)
 {
@@ -1859,6 +1864,14 @@ CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,
 {
    return self->AddCircleFilled(center,radius,col,num_segments);
 }
+CIMGUI_API void ImDrawList_AddNgon(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness)
+{
+    return self->AddNgon(center,radius,col,num_segments,thickness);
+}
+CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments)
+{
+    return self->AddNgonFilled(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)
 {
    return self->AddText(pos,col,text_begin,text_end);
@@ -1875,9 +1888,9 @@ CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* po
 {
    return self->AddConvexPolyFilled(points,num_points,col);
 }
-CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,const ImVec2 cp0,const ImVec2 cp1,const ImVec2 pos1,ImU32 col,float thickness,int num_segments)
+CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int num_segments)
 {
-    return self->AddBezierCurve(pos0,cp0,cp1,pos1,col,thickness,num_segments);
+    return self->AddBezierCurve(p1,p2,p3,p4,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)
 {
@@ -1919,9 +1932,9 @@ CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,fl
 {
    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)
+CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments)
 {
-    return self->PathBezierCurveTo(p1,p2,p3,num_segments);
+    return self->PathBezierCurveTo(p2,p3,p4,num_segments);
 }
 CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners)
 {
@@ -1963,6 +1976,10 @@ CIMGUI_API void ImDrawList_PrimReserve(ImDrawList* self,int idx_count,int vtx_co
 {
    return self->PrimReserve(idx_count,vtx_count);
 }
+CIMGUI_API void ImDrawList_PrimUnreserve(ImDrawList* self,int idx_count,int vtx_count)
+{
+    return self->PrimUnreserve(idx_count,vtx_count);
+}
 CIMGUI_API void ImDrawList_PrimRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col)
 {
    return self->PrimRect(a,b,col);
@@ -2429,11 +2446,11 @@ CIMGUI_API ImVec2_Simple igGetMousePosOnOpeningCurrentPopup_nonUDT2()
    ImVec2_Simple ret2 = ImVec2ToSimple(ret);
    return ret2;
 }
-CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,int button,float lock_threshold)
+CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold)
 {
    *pOut = ImGui::GetMouseDragDelta(button,lock_threshold);
 }
-CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(int button,float lock_threshold)
+CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(ImGuiMouseButton button,float lock_threshold)
 {
    ImVec2 ret = ImGui::GetMouseDragDelta(button,lock_threshold);
    ImVec2_Simple ret2 = ImVec2ToSimple(ret);
@@ -2519,6 +2536,11 @@ CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 	return IM_NEW(ImVector<ImWchar>) ();
 }

+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self)
+{
+    IM_DELETE(self);
+}
+
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p)
 {
 	IM_PLACEMENT_NEW(p) ImVector<ImWchar>();
--- a/cimgui.h
+++ b/cimgui.h
@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.73" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.75" from Dear ImGui https://github.com/ocornut/imgui
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
 #include <stdio.h>
@@ -105,6 +105,7 @@ typedef int ImGuiDataType;
 typedef int ImGuiDir;
 typedef int ImGuiKey;
 typedef int ImGuiNavInput;
+typedef int ImGuiMouseButton;
 typedef int ImGuiMouseCursor;
 typedef int ImGuiStyleVar;
 typedef int ImDrawCornerFlags;
@@ -134,7 +135,8 @@ typedef unsigned int ImU32;
 typedef int64_t ImS64;
 typedef uint64_t ImU64;
 typedef void (*ImDrawCallback)(const ImDrawList* parent_list, const ImDrawCmd* cmd);
-typedef unsigned short ImDrawIdx;typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
+typedef unsigned short ImDrawIdx;
+typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
 typedef struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
 typedef struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
 typedef struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
@@ -161,8 +163,7 @@ struct ImVec4
 {
    float x, y, z, w;
 };
-enum ImGuiWindowFlags_
-{
+typedef enum {
    ImGuiWindowFlags_None = 0,
    ImGuiWindowFlags_NoTitleBar = 1 << 0,
    ImGuiWindowFlags_NoResize = 1 << 1,
@@ -193,9 +194,8 @@ enum ImGuiWindowFlags_
    ImGuiWindowFlags_Popup = 1 << 26,
    ImGuiWindowFlags_Modal = 1 << 27,
    ImGuiWindowFlags_ChildMenu = 1 << 28
-};
-enum ImGuiInputTextFlags_
-{
+}ImGuiWindowFlags_;
+typedef enum {
    ImGuiInputTextFlags_None = 0,
    ImGuiInputTextFlags_CharsDecimal = 1 << 0,
    ImGuiInputTextFlags_CharsHexadecimal = 1 << 1,
@@ -218,9 +218,8 @@ enum ImGuiInputTextFlags_
    ImGuiInputTextFlags_CallbackResize = 1 << 18,
    ImGuiInputTextFlags_Multiline = 1 << 20,
    ImGuiInputTextFlags_NoMarkEdited = 1 << 21
-};
-enum ImGuiTreeNodeFlags_
-{
+}ImGuiInputTextFlags_;
+typedef enum {
    ImGuiTreeNodeFlags_None = 0,
    ImGuiTreeNodeFlags_Selected = 1 << 0,
    ImGuiTreeNodeFlags_Framed = 1 << 1,
@@ -237,18 +236,16 @@ enum ImGuiTreeNodeFlags_
    ImGuiTreeNodeFlags_SpanFullWidth = 1 << 12,
    ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 13,
    ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog
-};
-enum ImGuiSelectableFlags_
-{
+}ImGuiTreeNodeFlags_;
+typedef enum {
    ImGuiSelectableFlags_None = 0,
    ImGuiSelectableFlags_DontClosePopups = 1 << 0,
    ImGuiSelectableFlags_SpanAllColumns = 1 << 1,
    ImGuiSelectableFlags_AllowDoubleClick = 1 << 2,
    ImGuiSelectableFlags_Disabled = 1 << 3,
    ImGuiSelectableFlags_AllowItemOverlap = 1 << 4
-};
-enum ImGuiComboFlags_
-{
+}ImGuiSelectableFlags_;
+typedef enum {
    ImGuiComboFlags_None = 0,
    ImGuiComboFlags_PopupAlignLeft = 1 << 0,
    ImGuiComboFlags_HeightSmall = 1 << 1,
@@ -258,9 +255,8 @@ enum ImGuiComboFlags_
    ImGuiComboFlags_NoArrowButton = 1 << 5,
    ImGuiComboFlags_NoPreview = 1 << 6,
    ImGuiComboFlags_HeightMask_ = ImGuiComboFlags_HeightSmall | ImGuiComboFlags_HeightRegular | ImGuiComboFlags_HeightLarge | ImGuiComboFlags_HeightLargest
-};
-enum ImGuiTabBarFlags_
-{
+}ImGuiComboFlags_;
+typedef enum {
    ImGuiTabBarFlags_None = 0,
    ImGuiTabBarFlags_Reorderable = 1 << 0,
    ImGuiTabBarFlags_AutoSelectNewTabs = 1 << 1,
@@ -272,25 +268,22 @@ enum ImGuiTabBarFlags_
    ImGuiTabBarFlags_FittingPolicyScroll = 1 << 7,
    ImGuiTabBarFlags_FittingPolicyMask_ = ImGuiTabBarFlags_FittingPolicyResizeDown | ImGuiTabBarFlags_FittingPolicyScroll,
    ImGuiTabBarFlags_FittingPolicyDefault_ = ImGuiTabBarFlags_FittingPolicyResizeDown
-};
-enum ImGuiTabItemFlags_
-{
+}ImGuiTabBarFlags_;
+typedef enum {
    ImGuiTabItemFlags_None = 0,
    ImGuiTabItemFlags_UnsavedDocument = 1 << 0,
    ImGuiTabItemFlags_SetSelected = 1 << 1,
    ImGuiTabItemFlags_NoCloseWithMiddleMouseButton = 1 << 2,
    ImGuiTabItemFlags_NoPushId = 1 << 3
-};
-enum ImGuiFocusedFlags_
-{
+}ImGuiTabItemFlags_;
+typedef enum {
    ImGuiFocusedFlags_None = 0,
    ImGuiFocusedFlags_ChildWindows = 1 << 0,
    ImGuiFocusedFlags_RootWindow = 1 << 1,
    ImGuiFocusedFlags_AnyWindow = 1 << 2,
    ImGuiFocusedFlags_RootAndChildWindows = ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows
-};
-enum ImGuiHoveredFlags_
-{
+}ImGuiFocusedFlags_;
+typedef enum {
    ImGuiHoveredFlags_None = 0,
    ImGuiHoveredFlags_ChildWindows = 1 << 0,
    ImGuiHoveredFlags_RootWindow = 1 << 1,
@@ -301,9 +294,8 @@ enum ImGuiHoveredFlags_
    ImGuiHoveredFlags_AllowWhenDisabled = 1 << 7,
    ImGuiHoveredFlags_RectOnly = ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem | ImGuiHoveredFlags_AllowWhenOverlapped,
    ImGuiHoveredFlags_RootAndChildWindows = ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows
-};
-enum ImGuiDragDropFlags_
-{
+}ImGuiHoveredFlags_;
+typedef enum {
    ImGuiDragDropFlags_None = 0,
    ImGuiDragDropFlags_SourceNoPreviewTooltip = 1 << 0,
    ImGuiDragDropFlags_SourceNoDisableHover = 1 << 1,
@@ -315,9 +307,8 @@ enum ImGuiDragDropFlags_
    ImGuiDragDropFlags_AcceptNoDrawDefaultRect = 1 << 11,
    ImGuiDragDropFlags_AcceptNoPreviewTooltip = 1 << 12,
    ImGuiDragDropFlags_AcceptPeekOnly = ImGuiDragDropFlags_AcceptBeforeDelivery | ImGuiDragDropFlags_AcceptNoDrawDefaultRect
-};
-enum ImGuiDataType_
-{
+}ImGuiDragDropFlags_;
+typedef enum {
    ImGuiDataType_S8,
    ImGuiDataType_U8,
    ImGuiDataType_S16,
@@ -329,18 +320,16 @@ enum ImGuiDataType_
    ImGuiDataType_Float,
    ImGuiDataType_Double,
    ImGuiDataType_COUNT
-};
-enum ImGuiDir_
-{
+}ImGuiDataType_;
+typedef enum {
    ImGuiDir_None = -1,
    ImGuiDir_Left = 0,
    ImGuiDir_Right = 1,
    ImGuiDir_Up = 2,
    ImGuiDir_Down = 3,
    ImGuiDir_COUNT
-};
-enum ImGuiKey_
-{
+}ImGuiDir_;
+typedef enum {
    ImGuiKey_Tab,
    ImGuiKey_LeftArrow,
    ImGuiKey_RightArrow,
@@ -364,9 +353,8 @@ enum ImGuiKey_
    ImGuiKey_Y,
    ImGuiKey_Z,
    ImGuiKey_COUNT
-};
-enum ImGuiNavInput_
-{
+}ImGuiKey_;
+typedef enum {
    ImGuiNavInput_Activate,
    ImGuiNavInput_Cancel,
    ImGuiNavInput_Input,
@@ -384,16 +372,14 @@ enum ImGuiNavInput_
    ImGuiNavInput_TweakSlow,
    ImGuiNavInput_TweakFast,
    ImGuiNavInput_KeyMenu_,
-    ImGuiNavInput_KeyTab_,
    ImGuiNavInput_KeyLeft_,
    ImGuiNavInput_KeyRight_,
    ImGuiNavInput_KeyUp_,
    ImGuiNavInput_KeyDown_,
    ImGuiNavInput_COUNT,
    ImGuiNavInput_InternalStart_ = ImGuiNavInput_KeyMenu_
-};
-enum ImGuiConfigFlags_
-{
+}ImGuiNavInput_;
+typedef enum {
    ImGuiConfigFlags_None = 0,
    ImGuiConfigFlags_NavEnableKeyboard = 1 << 0,
    ImGuiConfigFlags_NavEnableGamepad = 1 << 1,
@@ -403,17 +389,15 @@ enum ImGuiConfigFlags_
    ImGuiConfigFlags_NoMouseCursorChange = 1 << 5,
    ImGuiConfigFlags_IsSRGB = 1 << 20,
    ImGuiConfigFlags_IsTouchScreen = 1 << 21
-};
-enum ImGuiBackendFlags_
-{
+}ImGuiConfigFlags_;
+typedef enum {
    ImGuiBackendFlags_None = 0,
    ImGuiBackendFlags_HasGamepad = 1 << 0,
    ImGuiBackendFlags_HasMouseCursors = 1 << 1,
    ImGuiBackendFlags_HasSetMousePos = 1 << 2,
    ImGuiBackendFlags_RendererHasVtxOffset = 1 << 3
-};
-enum ImGuiCol_
-{
+}ImGuiBackendFlags_;
+typedef enum {
    ImGuiCol_Text,
    ImGuiCol_TextDisabled,
    ImGuiCol_WindowBg,
@@ -463,9 +447,8 @@ enum ImGuiCol_
    ImGuiCol_NavWindowingDimBg,
    ImGuiCol_ModalWindowDimBg,
    ImGuiCol_COUNT
-};
-enum ImGuiStyleVar_
-{
+}ImGuiCol_;
+typedef enum {
    ImGuiStyleVar_Alpha,
    ImGuiStyleVar_WindowPadding,
    ImGuiStyleVar_WindowRounding,
@@ -490,9 +473,8 @@ enum ImGuiStyleVar_
    ImGuiStyleVar_ButtonTextAlign,
    ImGuiStyleVar_SelectableTextAlign,
    ImGuiStyleVar_COUNT
-};
-enum ImGuiColorEditFlags_
-{
+}ImGuiStyleVar_;
+typedef enum {
    ImGuiColorEditFlags_None = 0,
    ImGuiColorEditFlags_NoAlpha = 1 << 1,
    ImGuiColorEditFlags_NoPicker = 1 << 2,
@@ -521,9 +503,14 @@ enum ImGuiColorEditFlags_
    ImGuiColorEditFlags__DataTypeMask = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float,
    ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar,
    ImGuiColorEditFlags__InputMask = ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV
-};
-enum ImGuiMouseCursor_
-{
+}ImGuiColorEditFlags_;
+typedef enum {
+    ImGuiMouseButton_Left = 0,
+    ImGuiMouseButton_Right = 1,
+    ImGuiMouseButton_Middle = 2,
+    ImGuiMouseButton_COUNT = 5
+}ImGuiMouseButton_;
+typedef enum {
    ImGuiMouseCursor_None = -1,
    ImGuiMouseCursor_Arrow = 0,
    ImGuiMouseCursor_TextInput,
@@ -533,15 +520,15 @@ enum ImGuiMouseCursor_
    ImGuiMouseCursor_ResizeNESW,
    ImGuiMouseCursor_ResizeNWSE,
    ImGuiMouseCursor_Hand,
+    ImGuiMouseCursor_NotAllowed,
    ImGuiMouseCursor_COUNT
-};
-enum ImGuiCond_
-{
+}ImGuiMouseCursor_;
+typedef enum {
    ImGuiCond_Always = 1 << 0,
    ImGuiCond_Once = 1 << 1,
    ImGuiCond_FirstUseEver = 1 << 2,
    ImGuiCond_Appearing = 1 << 3
-};
+}ImGuiCond_;
 struct ImGuiStyle
 {
    float Alpha;
@@ -578,6 +565,7 @@ struct ImGuiStyle
    bool AntiAliasedLines;
    bool AntiAliasedFill;
    float CurveTessellationTol;
+    float CircleSegmentMaxError;
    ImVec4 Colors[ImGuiCol_COUNT];
 };
 struct ImGuiIO
@@ -713,9 +701,11 @@ struct ImGuiStorage
 };
 struct ImGuiListClipper
 {
-    float StartPosY;
+    int DisplayStart, DisplayEnd;
+    int ItemsCount;
+    int StepNo;
    float ItemsHeight;
-    int ItemsCount, StepNo, DisplayStart, DisplayEnd;
+    float StartPosY;
 };
 struct ImColor
 {
@@ -748,8 +738,7 @@ struct ImDrawListSplitter
    int _Count;
    ImVector_ImDrawChannel _Channels;
 };
-enum ImDrawCornerFlags_
-{
+typedef enum {
    ImDrawCornerFlags_None = 0,
    ImDrawCornerFlags_TopLeft = 1 << 0,
    ImDrawCornerFlags_TopRight = 1 << 1,
@@ -760,14 +749,13 @@ enum ImDrawCornerFlags_
    ImDrawCornerFlags_Left = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft,
    ImDrawCornerFlags_Right = ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight,
    ImDrawCornerFlags_All = 0xF
-};
-enum ImDrawListFlags_
-{
+}ImDrawCornerFlags_;
+typedef enum {
    ImDrawListFlags_None = 0,
    ImDrawListFlags_AntiAliasedLines = 1 << 0,
    ImDrawListFlags_AntiAliasedFill = 1 << 1,
    ImDrawListFlags_AllowVtxOffset = 1 << 2
-};
+}ImDrawListFlags_;
 struct ImDrawList
 {
    ImVector_ImDrawCmd CmdBuffer;
@@ -838,12 +826,11 @@ struct ImFontAtlasCustomRect
    ImVec2 GlyphOffset;
    ImFont* Font;
 };
-enum ImFontAtlasFlags_
-{
+typedef enum {
    ImFontAtlasFlags_None = 0,
    ImFontAtlasFlags_NoPowerOfTwoHeight = 1 << 0,
    ImFontAtlasFlags_NoMouseCursors = 1 << 1
-};
+}ImFontAtlasFlags_;
 struct ImFontAtlas
 {
    bool Locked;
@@ -876,10 +863,10 @@ struct ImFont
    short ConfigDataCount;
    ImWchar FallbackChar;
    ImWchar EllipsisChar;
+    bool DirtyLookupTables;
    float Scale;
    float Ascent, Descent;
    int MetricsTotalSurface;
-    bool DirtyLookupTables;
 };
    struct ImGuiTextRange
    {
@@ -1109,8 +1096,8 @@ CIMGUI_API bool igDragInt2(const char* label,int v[2],float v_speed,int v_min,in
 CIMGUI_API bool igDragInt3(const char* label,int v[3],float v_speed,int v_min,int v_max,const char* format);
 CIMGUI_API bool igDragInt4(const char* label,int v[4],float v_speed,int v_min,int v_max,const char* format);
 CIMGUI_API bool igDragIntRange2(const char* label,int* v_current_min,int* v_current_max,float v_speed,int v_min,int v_max,const char* format,const char* 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 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 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);
+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);
 CIMGUI_API bool igSliderFloat(const char* label,float* v,float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igSliderFloat2(const char* label,float v[2],float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igSliderFloat3(const char* label,float v[3],float v_min,float v_max,const char* format,float power);
@@ -1120,11 +1107,11 @@ CIMGUI_API bool igSliderInt(const char* label,int* v,int v_min,int v_max,const c
 CIMGUI_API bool igSliderInt2(const char* label,int v[2],int v_min,int v_max,const char* format);
 CIMGUI_API bool igSliderInt3(const char* label,int v[3],int v_min,int v_max,const char* format);
 CIMGUI_API bool igSliderInt4(const char* label,int v[4],int v_min,int v_max,const char* 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 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 igSliderScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_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);
 CIMGUI_API bool igVSliderFloat(const char* label,const ImVec2 size,float* v,float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igVSliderInt(const char* label,const ImVec2 size,int* v,int v_min,int v_max,const char* 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);
 CIMGUI_API bool igInputText(const char* label,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
 CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size,const ImVec2 size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
 CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
@@ -1137,8 +1124,8 @@ CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags flags
 CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags flags);
 CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags flags);
 CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags flags);
-CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags 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 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);
+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);
 CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags);
 CIMGUI_API bool igColorEdit4(const char* label,float col[4],ImGuiColorEditFlags flags);
 CIMGUI_API bool igColorPicker3(const char* label,float col[3],ImGuiColorEditFlags flags);
@@ -1177,10 +1164,10 @@ CIMGUI_API void igValueBool(const char* prefix,bool b);
 CIMGUI_API void igValueInt(const char* prefix,int v);
 CIMGUI_API void igValueUint(const char* prefix,unsigned int v);
 CIMGUI_API void igValueFloat(const char* prefix,float v,const char* float_format);
-CIMGUI_API bool igBeginMainMenuBar(void);
-CIMGUI_API void igEndMainMenuBar(void);
 CIMGUI_API bool igBeginMenuBar(void);
 CIMGUI_API void igEndMenuBar(void);
+CIMGUI_API bool igBeginMainMenuBar(void);
+CIMGUI_API void igEndMainMenuBar(void);
 CIMGUI_API bool igBeginMenu(const char* label,bool enabled);
 CIMGUI_API void igEndMenu(void);
 CIMGUI_API bool igMenuItemBool(const char* label,const char* shortcut,bool selected,bool enabled);
@@ -1191,12 +1178,12 @@ CIMGUI_API void igSetTooltip(const char* fmt,...);
 CIMGUI_API void igSetTooltipV(const char* fmt,va_list args);
 CIMGUI_API void igOpenPopup(const char* str_id);
 CIMGUI_API bool igBeginPopup(const char* str_id,ImGuiWindowFlags flags);
-CIMGUI_API bool igBeginPopupContextItem(const char* str_id,int mouse_button);
-CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,int mouse_button,bool also_over_items);
-CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,int mouse_button);
+CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiMouseButton mouse_button);
+CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items);
+CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiMouseButton mouse_button);
 CIMGUI_API bool igBeginPopupModal(const char* name,bool* p_open,ImGuiWindowFlags flags);
 CIMGUI_API void igEndPopup(void);
-CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,int mouse_button);
+CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,ImGuiMouseButton mouse_button);
 CIMGUI_API bool igIsPopupOpen(const char* str_id);
 CIMGUI_API void igCloseCurrentPopup(void);
 CIMGUI_API void igColumns(int count,const char* id,bool border);
@@ -1231,12 +1218,13 @@ CIMGUI_API void igSetKeyboardFocusHere(int offset);
 CIMGUI_API bool igIsItemHovered(ImGuiHoveredFlags flags);
 CIMGUI_API bool igIsItemActive(void);
 CIMGUI_API bool igIsItemFocused(void);
-CIMGUI_API bool igIsItemClicked(int mouse_button);
+CIMGUI_API bool igIsItemClicked(ImGuiMouseButton mouse_button);
 CIMGUI_API bool igIsItemVisible(void);
 CIMGUI_API bool igIsItemEdited(void);
 CIMGUI_API bool igIsItemActivated(void);
 CIMGUI_API bool igIsItemDeactivated(void);
 CIMGUI_API bool igIsItemDeactivatedAfterEdit(void);
+CIMGUI_API bool igIsItemToggledOpen(void);
 CIMGUI_API bool igIsAnyItemHovered(void);
 CIMGUI_API bool igIsAnyItemActive(void);
 CIMGUI_API bool igIsAnyItemFocused(void);
@@ -1265,21 +1253,21 @@ CIMGUI_API bool igIsKeyDown(int user_key_index);
 CIMGUI_API bool igIsKeyPressed(int user_key_index,bool repeat);
 CIMGUI_API bool igIsKeyReleased(int user_key_index);
 CIMGUI_API int igGetKeyPressedAmount(int key_index,float repeat_delay,float rate);
-CIMGUI_API bool igIsMouseDown(int button);
-CIMGUI_API bool igIsAnyMouseDown(void);
-CIMGUI_API bool igIsMouseClicked(int button,bool repeat);
-CIMGUI_API bool igIsMouseDoubleClicked(int button);
-CIMGUI_API bool igIsMouseReleased(int button);
-CIMGUI_API bool igIsMouseDragging(int button,float lock_threshold);
+CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value);
+CIMGUI_API bool igIsMouseDown(ImGuiMouseButton button);
+CIMGUI_API bool igIsMouseClicked(ImGuiMouseButton button,bool repeat);
+CIMGUI_API bool igIsMouseReleased(ImGuiMouseButton button);
+CIMGUI_API bool igIsMouseDoubleClicked(ImGuiMouseButton button);
 CIMGUI_API bool igIsMouseHoveringRect(const ImVec2 r_min,const ImVec2 r_max,bool clip);
 CIMGUI_API bool igIsMousePosValid(const ImVec2* mouse_pos);
+CIMGUI_API bool igIsAnyMouseDown(void);
 CIMGUI_API ImVec2 igGetMousePos(void);
 CIMGUI_API ImVec2 igGetMousePosOnOpeningCurrentPopup(void);
-CIMGUI_API ImVec2 igGetMouseDragDelta(int button,float lock_threshold);
-CIMGUI_API void igResetMouseDragDelta(int button);
+CIMGUI_API bool igIsMouseDragging(ImGuiMouseButton button,float lock_threshold);
+CIMGUI_API ImVec2 igGetMouseDragDelta(ImGuiMouseButton button,float lock_threshold);
+CIMGUI_API void igResetMouseDragDelta(ImGuiMouseButton button);
 CIMGUI_API ImGuiMouseCursor igGetMouseCursor(void);
-CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type);
-CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value);
+CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor cursor_type);
 CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value);
 CIMGUI_API const char* igGetClipboardText(void);
 CIMGUI_API void igSetClipboardText(const char* text);
@@ -1394,11 +1382,13 @@ CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 p1,const Im
 CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col);
 CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness);
 CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments);
+CIMGUI_API void ImDrawList_AddNgon(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness);
+CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments);
 CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end);
 CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect);
 CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness);
 CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col);
-CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,const ImVec2 cp0,const ImVec2 cp1,const ImVec2 pos1,ImU32 col,float thickness,int num_segments);
+CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int 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);
 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);
 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);
@@ -1409,7 +1399,7 @@ CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* self,ImU32 col);
 CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,float thickness);
 CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments);
 CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,float radius,int a_min_of_12,int a_max_of_12);
-CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,int num_segments);
+CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments);
 CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners);
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data);
 CIMGUI_API void ImDrawList_AddDrawCmd(ImDrawList* self);
@@ -1420,6 +1410,7 @@ CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int n);
 CIMGUI_API void ImDrawList_Clear(ImDrawList* self);
 CIMGUI_API void ImDrawList_ClearFreeMemory(ImDrawList* self);
 CIMGUI_API void ImDrawList_PrimReserve(ImDrawList* self,int idx_count,int vtx_count);
+CIMGUI_API void ImDrawList_PrimUnreserve(ImDrawList* self,int idx_count,int vtx_count);
 CIMGUI_API void ImDrawList_PrimRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col);
 CIMGUI_API void ImDrawList_PrimRectUV(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col);
 CIMGUI_API void ImDrawList_PrimQuadUV(ImDrawList* self,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);
@@ -1528,8 +1519,8 @@ CIMGUI_API void igGetMousePos_nonUDT(ImVec2 *pOut);
 CIMGUI_API ImVec2_Simple igGetMousePos_nonUDT2(void);
 CIMGUI_API void igGetMousePosOnOpeningCurrentPopup_nonUDT(ImVec2 *pOut);
 CIMGUI_API ImVec2_Simple igGetMousePosOnOpeningCurrentPopup_nonUDT2(void);
-CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,int button,float lock_threshold);
-CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(int button,float lock_threshold);
+CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold);
+CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(ImGuiMouseButton button,float lock_threshold);
 CIMGUI_API void ImColor_HSV_nonUDT(ImColor *pOut,ImColor* self,float h,float s,float v,float a);
 CIMGUI_API ImColor_Simple ImColor_HSV_nonUDT2(ImColor* self,float h,float s,float v,float a);
 CIMGUI_API void ImDrawList_GetClipRectMin_nonUDT(ImVec2 *pOut,ImDrawList* self);
@@ -1552,6 +1543,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* self);
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);
 #endif //CIMGUI_INCLUDED
--- 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"

@@ -44,6 +45,11 @@ CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 	return IM_NEW(ImVector<ImWchar>) ();
 }

+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self)
+{
+    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,6 +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* self);
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);
 #endif //CIMGUI_INCLUDED
--- a/generator/config_generator.lua
+++ b/generator/config_generator.lua
@@ -0,0 +1,3 @@
+return {
+	vulkan = {[[C:\VulkanSDK\1.1.130.0\Include]]}
+}
--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
@@ -104,7 +104,7 @@ local function strip(cad)
    return cad:gsub("^%s*(.-)%s*$","%1") --remove initial and final spaces
 end
 local function strip_end(cad)
-    return cad:gsub("^(.-)%s*$","%1") --remove initial and final spaces
+    return cad:gsub("^(.-)%s*$","%1") --remove  final spaces
 end
 local function clean_spaces(cad)
    cad = strip(cad)
@@ -342,7 +342,7 @@ local function parseFunction(self,stname,lineorig,namespace)
 	--skip template
 	if line:match("template") then return end
    
-    local ret = line:match("([^%(%)]+[%*%s])%s?~?[_%w]+%b()")
+    local ret = line:match("([^%(%):,]+[%*%s])%s?~?[_%w]+%b()")
    --local funcname, args = line:match("(~?[_%w]+)%s*(%b())")
 	local funcname, args, extraconst = line:match("(~?[_%w]+)%s*(%b())(.*)")
 	extraconst = extraconst:match("const")
@@ -630,6 +630,7 @@ end

 --only basic ending
 local c_types = {
+    ["bool"]=true,
    ["char"]=true,
    ["int"]=true,
    ["float"]=true,
@@ -641,6 +642,7 @@ local c_types = {
    ["size_t"]=true,
    ["ptrdiff_t"]=true,
 }
+M.c_types = c_types
 local function check_arg_detection(fdefs,typedefs)
    print"-----------------check arg detection---------------------------"
    for k,defT in pairs(fdefs) do
@@ -808,6 +810,7 @@ function M.Parser()
 				--local ttype,template = it.item:match("([^%s,%(%)]+)%s*<(.+)>")
 				local ttype,template =    it.item:match"([^%s,%(%)]+)%s*<(.+)>"
 				if template then
+					--if template=="T" then print("T found in---------");print(stru) end
 					local te = template:gsub("%s","_")
 					te = te:gsub("%*","Ptr")
 					self.templates[ttype] = self.templates[ttype] or {}
@@ -817,6 +820,8 @@ function M.Parser()
 				end
 				--clean mutable
 				it2 = it2:gsub("mutable","")
+				--clean namespaces
+				it2 = it2:gsub("%w+::","")
 				--skip static variables
 				if not (it.re_name == "vardef_re" and it2:match"static") then
 					table.insert(outtab,it2)
@@ -847,10 +852,26 @@ function M.Parser()
 				end
 			end
 		end
+		--get structs in namespace
+		for i,it in ipairs(itemsarr) do
+			if it.re_name == "namespace_re" then
+				local nsp = it.item:match("%b{}"):sub(2,-2)
+				local namespace = it.item:match("namespace%s+(%S+)")
+				local nspparr,itemsnsp = parseItems(nsp)
+				for insp,itnsp in ipairs(nspparr) do
+					if itnsp.re_name == "struct_re" then --or itnsp.re_name == "functionD_re" then
+						--print("in mamespace",itnsp.item,namespace)
+						table.insert(outtab,itnsp.item)
+					end
+				end
+			end
+		end
 		--then structs and enums
 		for i,it in ipairs(itemsarr) do
 			if it.re_name == "enum_re" then
-				table.insert(outtab,it.item)
+				local enumname, enumbody = it.item:match"^%s*enum%s+([^%s;{}]+)[%s\n\r]*(%b{})"
+				--print("enum is:",enumname, enumbody)
+				table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";")
 			elseif it.re_name == "struct_re" then
 				local cleanst,structname = self:clean_struct(it.item)
 				--if not void stname or templated
@@ -913,15 +934,44 @@ function M.Parser()
 	end
 	function par:gen_structs_and_enums_table()
 		local outtab = {enums={},structs={}}
-		local outtabpre = {}
-		local typedefs_table = {}
+		self.typedefs_table = {}
+		self.vardefs = {}

 		self.inerstructs = {}
+		self.order = {}
+		
+		--first typedefs
+		for i,it in ipairs(itemsarr) do
+			if it.re_name == "typedef_re" then --or it.re_name == "functypedef_re" or it.re_name == "vardef_re" then
+				local typedefdef,typedefname = it.item:match"typedef(.+)%s([^%s;]+);$"
+				typedefname = strip(typedefname)
+				self.typedefs_table[typedefname] = strip(typedefdef)
+				self.order[typedefname] = i
+				-- add typedef after struct name
+				-- if it.re_name == "vardef_re" and it.item:match"struct" then
+					-- local stname = it.item:match("struct%s*(%S+)%s*;")
+					-- table.insert(typedefs_table,"typedef struct "..stname.." "..stname..";\n")
+					-- self.typedefs_dict[stname]="struct "..stname
+				-- end
+			end
+		end
+		--vardefs
+		for i,it in ipairs(itemsarr) do
+			if it.re_name == "vardef_re" then 
+				local stname = it.item:match"struct%s(%S+)$"
+				if stname then
+					stname = strip(stname)
+					self.vardefs[stname] = true
+					self.order[stname] = i
+				end
+			end
+		end
 		--then structs and enums
 		for i,it in ipairs(itemsarr) do
 			if it.re_name == "enum_re" then
 				local enumname = it.item:match"^%s*enum%s+([^%s;{}]+)"
 				outtab.enums[enumname] = {}
+				self.order[enumname] = i
 				local inner = strip_end(it.item:match("%b{}"):sub(2,-2))
 				local enumarr = str_split(inner,",")
 				for j,line in ipairs(enumarr) do
@@ -941,6 +991,7 @@ function M.Parser()
 				--M.prtable(cleanst,structname,strtab)
 				if structname and not self.typenames[structname] then
 					outtab.structs[structname] = {}
+					self.order[structname]=i
 					for j=3,#strtab-1 do
 						self:parse_struct_line(strtab[j],outtab.structs[structname])
 					end
@@ -1239,7 +1290,7 @@ M.serializeTableF = function(t)
 	return M.serializeTable("defs",t).."\nreturn defs"
 end
 --iterates lines from a gcc/clang -E in a specific location
-local function location(file,locpathT,defines)
+local function location(file,locpathT,defines,COMPILER)
 	local define_re = "^#define%s+([^%s]+)%s+([^%s]+)$"
 	local number_re = "^-?[0-9]+u*$"
 	local hex_re = "0x[0-9a-fA-F]+u*$"
@@ -1249,6 +1300,7 @@ local function location(file,locpathT,defines)
    else --gcc, clang
        location_re = '^# (%d+) "([^"]*)"'
    end
+
    local path_reT = {}
    for i,locpath in ipairs(locpathT) do
        table.insert(path_reT,'^.*[\\/]('..locpath..')%.h$')
@@ -1274,6 +1326,7 @@ local function location(file,locpathT,defines)
            if #line==0 then --nothing on emptyline
            elseif not line:match("%S") then --nothing if only spaces
            elseif line:sub(1,1) == "#" then
+			--elseif line:match"^%s*#" then
                -- Is this a location pragma?
                local loc_num_t,location_match = line:match(location_re)
                if location_match then
--- 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:\anima;C:\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\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
@@ -189,6 +189,13 @@ end


 --------------------------------functions for C generation
+--load parser module
+local cpp2ffi = require"cpp2ffi"
+local read_data = cpp2ffi.read_data
+local save_data = cpp2ffi.save_data
+local copyfile = cpp2ffi.copyfile
+local serializeTableF = cpp2ffi.serializeTableF
+
 local function func_header_impl_generate(FP)

    local outtab = {}
@@ -197,11 +204,19 @@ local function func_header_impl_generate(FP)
        if t.cimguiname then
            local cimf = FP.defsT[t.cimguiname]
            local def = cimf[t.signature]
-            if def.ret then --not constructor
-                local addcoment = def.comment or ""
+			local addcoment = def.comment or ""
+			if def.constructor then
+				-- it happens with vulkan impl but constructor ImGui_ImplVulkanH_Window is not needed
+			    --assert(def.stname ~= "","constructor without struct")
+                --table.insert(outtab,"CIMGUI_API "..def.stname.."* "..def.ov_cimguiname ..(empty and "(void)" or --def.args)..";"..addcoment.."\n")
+            elseif def.destructor then
+                --table.insert(outtab,"CIMGUI_API void "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
+			else
+                
                if def.stname == "" then --ImGui namespace or top level
                    table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
                else
+					cpp2ffi.prtable(def)
                    error("class function in implementations")
                end
            end
@@ -220,6 +235,7 @@ local function func_header_generate(FP)
    for k,v in pairs(FP.embeded_structs) do
        table.insert(outtab,"typedef "..v.." "..k..";\n")
    end
+
    for ttype,v in pairs(FP.templates) do
 		for ttypein,_ in pairs(v) do
 			local te = ttypein:gsub("%s","_")
@@ -269,14 +285,15 @@ local function ImGui_f_implementation(outtab,def)
    local ptret = def.retref and "&" or ""
    table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname..def.args.."\n")
    table.insert(outtab,"{\n")
+	local namespace = def.namespace and def.namespace.."::" or ""
    if def.isvararg then
        local call_args = def.call_args:gsub("%.%.%.","args")
        table.insert(outtab,"    va_list args;\n")
        table.insert(outtab,"    va_start(args, fmt);\n")
        if def.ret~="void" then
-            table.insert(outtab,"    "..def.ret.." ret = ImGui::"..def.funcname.."V"..call_args..";\n")
+            table.insert(outtab,"    "..def.ret.." ret = "..namespace..def.funcname.."V"..call_args..";\n")
        else
-            table.insert(outtab,"    ImGui::"..def.funcname.."V"..call_args..";\n")
+            table.insert(outtab,"    "..namespace..def.funcname.."V"..call_args..";\n")
        end
        table.insert(outtab,"    va_end(args);\n")
        if def.ret~="void" then
@@ -284,14 +301,14 @@ local function ImGui_f_implementation(outtab,def)
        end
    elseif def.nonUDT then
        if def.nonUDT == 1 then
-            table.insert(outtab,"    *pOut = ImGui::"..def.funcname..def.call_args..";\n")
+            table.insert(outtab,"    *pOut = "..namespace..def.funcname..def.call_args..";\n")
        else --nonUDT==2
-            table.insert(outtab,"    "..def.retorig.." ret = ImGui::"..def.funcname..def.call_args..";\n")
+            table.insert(outtab,"    "..def.retorig.." ret = "..namespace..def.funcname..def.call_args..";\n")
            table.insert(outtab,"    "..def.ret.." ret2 = "..def.retorig.."ToSimple(ret);\n")
            table.insert(outtab,"    return ret2;\n")
        end
    else --standard ImGui
-        table.insert(outtab,"    return "..ptret.."ImGui::"..def.funcname..def.call_args..";\n")
+        table.insert(outtab,"    return "..ptret..namespace..def.funcname..def.call_args..";\n")
    end
    table.insert(outtab,"}\n")
 end
@@ -422,30 +439,35 @@ local function DefsByStruct(FP)
 end  


--load parser module
-local cpp2ffi = require"cpp2ffi"
-local read_data = cpp2ffi.read_data
-local save_data = cpp2ffi.save_data
-local copyfile = cpp2ffi.copyfile
-local serializeTableF = cpp2ffi.serializeTableF
+

 ----------custom ImVector templates
 local function generate_templates(code,templates)
-    table.insert(code,[[typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;]].."\n")
+    table.insert(code,"\n"..[[typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;]].."\n")
    for ttype,v in pairs(templates) do
        --local te = k:gsub("%s","_")
        --te = te:gsub("%*","Ptr")
 		if ttype == "ImVector" then
-		for te,newte in pairs(v) do
-        table.insert(code,"typedef struct ImVector_"..newte.." {int Size;int Capacity;"..te.."* Data;} ImVector_"..newte..";\n")
-		end
+			for te,newte in pairs(v) do
+				table.insert(code,"typedef struct ImVector_"..newte.." {int Size;int Capacity;"..te.."* Data;} ImVector_"..newte..";\n")
+			end
+		elseif ttype == "ImPool" then
+			--declare ImGuiStorage
+			for te,newte in pairs(v) do
+				table.insert(code,"typedef struct ImVector_"..newte.." {int Size;int Capacity;"..te.."* Data;} ImVector_"..newte..";\n")
+				table.insert(code,"typedef struct ImPool_"..newte.." {ImVector_"..te.." Buf;ImGuiStorage Map;ImPoolIdx FreeIdx;} ImPool_"..newte..";\n")
+			end
+		elseif ttype == "ImChunkStream" then
+			for te,newte in pairs(v) do
+				table.insert(code,"typedef struct ImVector_"..newte.." {int Size;int Capacity;"..te.."* Data;} ImVector_"..newte..";\n")
+				table.insert(code,"typedef struct ImChunkStream_"..newte.." {ImVector_"..te.." Buf;} ImChunkStream_"..newte..";\n")
+			end
 		end
    end
 end
 --generate cimgui.cpp cimgui.h 
 local function cimgui_generation(parser)
-	cpp2ffi.prtable(parser.templates)
-	cpp2ffi.prtable(parser.typenames)
+
 --[[
 	-- clean ImVector:contains() for not applicable types
 	local clean_f = {}
@@ -470,12 +492,14 @@ local function cimgui_generation(parser)
    local hstrfile = read_data"./cimgui_template.h"

 	local outpre,outpost = parser:gen_structs_and_enums()
-	--parser.templates get completely defined here
-	--cpp2ffi.prtable(parser.templates)
+	parser.templates.ImVector.T = nil
+	cpp2ffi.prtable(parser.templates)
+	cpp2ffi.prtable(parser.typenames)
 	
 	local outtab = {}
    generate_templates(outtab,parser.templates)
-	local cstructsstr = outpre..table.concat(outtab,"")..outpost
+
+	local cstructsstr = outpre..table.concat(outtab,"")..outpost..(extra or "")

    hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
    local cfuncsstr = func_header_generate(parser)
@@ -513,46 +537,149 @@ if HAVE_COMPILER then
    gdefines = get_defines{"IMGUI_VERSION","FLT_MAX"}
 end                                 

+--funtion for parsing imgui headers
+local function parseImGuiHeader(header,names)
+	--prepare parser
+	local parser = cpp2ffi.Parser()
+	parser.getCname = function(stname,funcname)
+		local pre = (stname == "") and "ig" or stname.."_"
+		return pre..funcname
+	end
+	parser.cname_overloads = cimgui_overloads
+	parser.manuals = cimgui_manuals
+	parser.UDTs = {"ImVec2","ImVec4","ImColor"}
+	
+	local pipe,err
+	if HAVE_COMPILER then
+		pipe,err = io.popen(CPRE..header,"r")
+	else
+		pipe,err = io.open(header,"r")
+	end
+	
+	if not pipe then
+		error("could not execute gcc "..err)
+	end
+	
+	local iterator = (HAVE_COMPILER and cpp2ffi.location) or filelines
+	
+	local tableo = {}
+	--[[
+	local line
+	repeat 
+		line =pipe:read"*l"
+		table.insert(tableo,line)
+	until not line
+	cpp2ffi.save_data("cdefs1.lua",table.concat(tableo,"\n"))
+	--]]
+	for line,loca,loca2 in iterator(pipe,names,{},COMPILER) do
+		parser:insert(line)
+		--table.insert(tableo,line)
+		--print(loca,loca2)
+	end
+	--cpp2ffi.save_data("cdefs1.lua",table.concat(tableo))
+	pipe:close()
+	return parser
+end
 --generation
 print("------------------generation with "..COMPILER.."------------------------")
-local typedefs_dict2
--prepare parser
-local parser1 = cpp2ffi.Parser()
-parser1.getCname = function(stname,funcname)
-    local pre = (stname == "") and "ig" or stname.."_"
-    return pre..funcname
-end
-parser1.cname_overloads = cimgui_overloads
-parser1.manuals = cimgui_manuals
-parser1.UDTs = {"ImVec2","ImVec4","ImColor"}
-
-local pipe,err
-if HAVE_COMPILER then
-    pipe,err = io.popen(CPRE..[[../imgui/imgui.h]],"r")
-else
-    pipe,err = io.open([[../imgui/imgui.h]],"r")
-end
-
-if not pipe then
-    error("could not execute gcc "..err)
-end
-
--local file,err = io.open("output_compiler.txt","w")
--if not file then error(err) end
-
-local iterator = (HAVE_COMPILER and cpp2ffi.location) or filelines
-
-for line in iterator(pipe,{"imgui"},{}) do
-	parser1:insert(line)
-	--file:write(line)
-end
--file:close()
-pipe:close()

+--local parser1 = parseImGuiHeader([[headers.h]],{[[imgui]],[[imgui_internal]],[[imstb_textedit]]})
+local parser1 = parseImGuiHeader([[../imgui/imgui.h]],{[[imgui]]})
 parser1:do_parse()
--table.sort(parser1.funcdefs, function(a,b) return a.cimguiname < b.cimguiname end)
--parser1:dump_alltypes()
--parser1:printItems()
+
+---------- generate cimgui_internal.h
+--[=[
+local parser1i = parseImGuiHeader([[../imgui/imgui_internal.h]],{[[imgui_internal]],[[imstb_textedit]]})
+parser1i:do_parse()
+local outpre,outpost = parser1i:gen_structs_and_enums()
+--avoid T
+parser1i.templates.ImVector.T = nil
+for k,v in pairs(parser1i.templates.ImVector) do
+	if parser1.templates.ImVector[k] then parser1i.templates.ImVector[k]=nil end
+end
+local outtab = {}
+generate_templates(outtab,parser1i.templates)
+--drop first
+table.remove(outtab,1)
+local cstructsstr = outpre..table.concat(outtab,"")..outpost..(extra or "")
+local cfuncsstr = func_header_generate(parser1i)
+save_data("./output/cimgui_internal.h",cimgui_header,"#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n",cstructsstr,"\n#endif\n")--,cfuncsstr)
+copyfile("./output/cimgui_internal.h", "../cimgui_internal.h")
+--]=]
+----------- add only ImGuiContext from imgui_internal.h to parser1
+--[=[
+local parser1i = parseImGuiHeader([[../imgui/imgui_internal.h]],{[[imgui_internal]],[[imstb_textedit]]})
+parser1i:do_parse()
+local p1isten = parser1i:gen_structs_and_enums_table()
+--parser1i:printItems()
+print"typedefs_table---------------------------"
+cpp2ffi.prtable(parser1i.typedefs_table)
+print"typedefs_table end---------------------------"
+local needed = {ImGuiContext = {type = "ImGuiContext", kind = "structs", order = parser1i.order["ImGuiContext"]}}
+local seen = {}
+local function RecurseNeeded(Ini,IniKind,level)
+	--if level > 5 then return end
+	if seen[Ini] then return end
+	seen[Ini] = true
+	print("RecurseNeeded",Ini,IniKind,level)
+	for i,v in ipairs(p1isten[IniKind][Ini]) do
+		--if not v.type then print("nil type in",Ini,IniKind) end
+		--dont want pointers
+		local type = v.type:match"([^%*]+)"
+		--ImVector out
+		if type:match"ImVector_" then type=type:match"ImVector_(.+)" end
+		
+		local kind = p1isten.enums[type] and "enums" or p1isten.structs[type] and "structs" or nil
+		if kind=="structs" then
+			if not needed[type] then RecurseNeeded(type,kind,level+1) end
+			needed[type] = {type = type, kind = kind, order = parser1i.order[type]}
+		elseif kind=="enums" then
+			needed[type] = {type = type, kind = kind, order = parser1i.order[type]}
+		elseif parser1i.typedefs_table[type] then
+			needed[type] = {type = type, kind = "typedef", order = parser1i.order[type]}
+		elseif parser1i.vardefs[type] then
+			needed[type] = {type = type, kind = "vardef", order = parser1i.order[type]}
+		elseif not cpp2ffi.c_types[type] then
+			print("RecurseNeded failed",type)
+			--error"failed recurse"
+		end
+	end
+end
+
+RecurseNeeded("ImGuiContext","structs",0)
+
+
+local ordered_needed = {}
+for k,v in pairs(needed) do
+	table.insert(ordered_needed,v)
+end
+table.sort(ordered_needed, function(a,b) return a.order < b.order end)
+
+print"needed are-----------------------"
+for i,vv in ipairs(ordered_needed) do
+	print(vv.order,vv.type,vv.kind)
+	local v = parser1i.itemsarr[vv.order]
+
+	--if v.item:match"^[%s\n\r]*struct%s*ImGuiContext" then
+	if vv.kind=="structs" then
+			--add enum keyword where necessary
+			--print"setting enum keyword------------------------"
+			local newitem = ""
+			for line in v.item:gmatch("([^\n]+)") do
+				local typen = line:match"^%s*(%S+)"
+				if p1isten.enums[typen] then
+					print("add enum",typen)
+					newitem = newitem.."\nenum"..line
+				else
+					newitem = newitem.."\n"..line
+				end
+			end
+			v.item = newitem
+	end
+	table.insert(parser1.itemsarr,v)
+end
+--]=]
+----------------------

 save_data("./output/overloads.txt",parser1.overloadstxt)
 cimgui_generation(parser1)
@@ -578,12 +705,14 @@ end
 save_data("./output/structs_and_enums.lua",serializeTableF(structs_and_enums_table))
 save_data("./output/typedefs_dict.lua",serializeTableF(parser1.typedefs_dict))

+
 --check every function has ov_cimguiname
 -- for k,v in pairs(parser1.defsT) do
 	-- for _,def in ipairs(v) do
 		-- assert(def.ov_cimguiname)
 	-- end
 -- end
+
 --=================================Now implementations

 local parser2
@@ -591,14 +720,22 @@ local parser2
 if #implementations > 0 then

    parser2 = cpp2ffi.Parser()
-
+	
+	local config = require"config_generator"
    
    for i,impl in ipairs(implementations) do
        local source = [[../imgui/examples/imgui_impl_]].. impl .. ".h "
        local locati = [[imgui_impl_]].. impl
        local pipe,err
+		local extra_includes = ""
+		local include_cmd = COMPILER=="cl" and [[ /I ]] or [[ -I ]]
+		if config[impl] then
+			for j,inc in ipairs(config[impl]) do
+				extra_includes = extra_includes .. include_cmd .. inc .. " "
+			end
+		end
        if HAVE_COMPILER then
-            pipe,err = io.popen(CPRE..source,"r")
+            pipe,err = io.popen(CPRE..extra_includes..source,"r")
        else
            pipe,err = io.open(source,"r")
        end
@@ -608,7 +745,7 @@ if #implementations > 0 then
        
        local iterator = (HAVE_COMPILER and cpp2ffi.location) or filelines
        
-        for line,locat in iterator(pipe,{locati},{}) do
+        for line,locat in iterator(pipe,{locati},{},COMPILER) do
            --local line, comment = split_comment(line)
 			parser2:insert(line)
        end
--- 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.73" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.75" 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)
 {
@@ -700,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)
 {
@@ -744,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)
 {
@@ -760,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)
 {
@@ -812,13 +813,13 @@ CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double ste
 {
    return ImGui::InputDouble(label,v,step,step_fast,format,flags);
 }
-CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags 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::InputScalar(label,data_type,v,step,step_fast,format,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* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags 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,v,components,step,step_fast,format,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)
 {
@@ -988,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();
@@ -1004,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);
@@ -1047,15 +1048,15 @@ CIMGUI_API bool igBeginPopup(const char* str_id,ImGuiWindowFlags flags)
 {
    return ImGui::BeginPopup(str_id,flags);
 }
-CIMGUI_API bool igBeginPopupContextItem(const char* str_id,int mouse_button)
+CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiMouseButton mouse_button)
 {
    return ImGui::BeginPopupContextItem(str_id,mouse_button);
 }
-CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,int mouse_button,bool also_over_items)
+CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items)
 {
    return ImGui::BeginPopupContextWindow(str_id,mouse_button,also_over_items);
 }
-CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,int mouse_button)
+CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiMouseButton mouse_button)
 {
    return ImGui::BeginPopupContextVoid(str_id,mouse_button);
 }
@@ -1067,7 +1068,7 @@ CIMGUI_API void igEndPopup()
 {
    return ImGui::EndPopup();
 }
-CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,int mouse_button)
+CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,ImGuiMouseButton mouse_button)
 {
    return ImGui::OpenPopupOnItemClick(str_id,mouse_button);
 }
@@ -1207,7 +1208,7 @@ CIMGUI_API bool igIsItemFocused()
 {
    return ImGui::IsItemFocused();
 }
-CIMGUI_API bool igIsItemClicked(int mouse_button)
+CIMGUI_API bool igIsItemClicked(ImGuiMouseButton mouse_button)
 {
    return ImGui::IsItemClicked(mouse_button);
 }
@@ -1231,6 +1232,10 @@ CIMGUI_API bool igIsItemDeactivatedAfterEdit()
 {
    return ImGui::IsItemDeactivatedAfterEdit();
 }
+CIMGUI_API bool igIsItemToggledOpen()
+{
+    return ImGui::IsItemToggledOpen();
+}
 CIMGUI_API bool igIsAnyItemHovered()
 {
    return ImGui::IsAnyItemHovered();
@@ -1343,29 +1348,25 @@ CIMGUI_API int igGetKeyPressedAmount(int key_index,float repeat_delay,float rate
 {
    return ImGui::GetKeyPressedAmount(key_index,repeat_delay,rate);
 }
-CIMGUI_API bool igIsMouseDown(int button)
+CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value)
+{
+    return ImGui::CaptureKeyboardFromApp(want_capture_keyboard_value);
+}
+CIMGUI_API bool igIsMouseDown(ImGuiMouseButton button)
 {
    return ImGui::IsMouseDown(button);
 }
-CIMGUI_API bool igIsAnyMouseDown()
-{
-    return ImGui::IsAnyMouseDown();
-}
-CIMGUI_API bool igIsMouseClicked(int button,bool repeat)
+CIMGUI_API bool igIsMouseClicked(ImGuiMouseButton button,bool repeat)
 {
    return ImGui::IsMouseClicked(button,repeat);
 }
-CIMGUI_API bool igIsMouseDoubleClicked(int button)
-{
-    return ImGui::IsMouseDoubleClicked(button);
-}
-CIMGUI_API bool igIsMouseReleased(int button)
+CIMGUI_API bool igIsMouseReleased(ImGuiMouseButton button)
 {
    return ImGui::IsMouseReleased(button);
 }
-CIMGUI_API bool igIsMouseDragging(int button,float lock_threshold)
+CIMGUI_API bool igIsMouseDoubleClicked(ImGuiMouseButton button)
 {
-    return ImGui::IsMouseDragging(button,lock_threshold);
+    return ImGui::IsMouseDoubleClicked(button);
 }
 CIMGUI_API bool igIsMouseHoveringRect(const ImVec2 r_min,const ImVec2 r_max,bool clip)
 {
@@ -1375,6 +1376,10 @@ CIMGUI_API bool igIsMousePosValid(const ImVec2* mouse_pos)
 {
    return ImGui::IsMousePosValid(mouse_pos);
 }
+CIMGUI_API bool igIsAnyMouseDown()
+{
+    return ImGui::IsAnyMouseDown();
+}
 CIMGUI_API ImVec2 igGetMousePos()
 {
    return ImGui::GetMousePos();
@@ -1383,11 +1388,15 @@ CIMGUI_API ImVec2 igGetMousePosOnOpeningCurrentPopup()
 {
    return ImGui::GetMousePosOnOpeningCurrentPopup();
 }
-CIMGUI_API ImVec2 igGetMouseDragDelta(int button,float lock_threshold)
+CIMGUI_API bool igIsMouseDragging(ImGuiMouseButton button,float lock_threshold)
+{
+    return ImGui::IsMouseDragging(button,lock_threshold);
+}
+CIMGUI_API ImVec2 igGetMouseDragDelta(ImGuiMouseButton button,float lock_threshold)
 {
    return ImGui::GetMouseDragDelta(button,lock_threshold);
 }
-CIMGUI_API void igResetMouseDragDelta(int button)
+CIMGUI_API void igResetMouseDragDelta(ImGuiMouseButton button)
 {
    return ImGui::ResetMouseDragDelta(button);
 }
@@ -1395,13 +1404,9 @@ CIMGUI_API ImGuiMouseCursor igGetMouseCursor()
 {
    return ImGui::GetMouseCursor();
 }
-CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type)
+CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor cursor_type)
 {
-    return ImGui::SetMouseCursor(type);
-}
-CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value)
-{
-    return ImGui::CaptureKeyboardFromApp(want_capture_keyboard_value);
+    return ImGui::SetMouseCursor(cursor_type);
 }
 CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value)
 {
@@ -1859,6 +1864,14 @@ CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,
 {
    return self->AddCircleFilled(center,radius,col,num_segments);
 }
+CIMGUI_API void ImDrawList_AddNgon(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness)
+{
+    return self->AddNgon(center,radius,col,num_segments,thickness);
+}
+CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments)
+{
+    return self->AddNgonFilled(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)
 {
    return self->AddText(pos,col,text_begin,text_end);
@@ -1875,9 +1888,9 @@ CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* po
 {
    return self->AddConvexPolyFilled(points,num_points,col);
 }
-CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,const ImVec2 cp0,const ImVec2 cp1,const ImVec2 pos1,ImU32 col,float thickness,int num_segments)
+CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int num_segments)
 {
-    return self->AddBezierCurve(pos0,cp0,cp1,pos1,col,thickness,num_segments);
+    return self->AddBezierCurve(p1,p2,p3,p4,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)
 {
@@ -1919,9 +1932,9 @@ CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,fl
 {
    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)
+CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments)
 {
-    return self->PathBezierCurveTo(p1,p2,p3,num_segments);
+    return self->PathBezierCurveTo(p2,p3,p4,num_segments);
 }
 CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners)
 {
@@ -1963,6 +1976,10 @@ CIMGUI_API void ImDrawList_PrimReserve(ImDrawList* self,int idx_count,int vtx_co
 {
    return self->PrimReserve(idx_count,vtx_count);
 }
+CIMGUI_API void ImDrawList_PrimUnreserve(ImDrawList* self,int idx_count,int vtx_count)
+{
+    return self->PrimUnreserve(idx_count,vtx_count);
+}
 CIMGUI_API void ImDrawList_PrimRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col)
 {
    return self->PrimRect(a,b,col);
@@ -2429,11 +2446,11 @@ CIMGUI_API ImVec2_Simple igGetMousePosOnOpeningCurrentPopup_nonUDT2()
    ImVec2_Simple ret2 = ImVec2ToSimple(ret);
    return ret2;
 }
-CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,int button,float lock_threshold)
+CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold)
 {
    *pOut = ImGui::GetMouseDragDelta(button,lock_threshold);
 }
-CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(int button,float lock_threshold)
+CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(ImGuiMouseButton button,float lock_threshold)
 {
    ImVec2 ret = ImGui::GetMouseDragDelta(button,lock_threshold);
    ImVec2_Simple ret2 = ImVec2ToSimple(ret);
@@ -2519,6 +2536,11 @@ CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 	return IM_NEW(ImVector<ImWchar>) ();
 }

+CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self)
+{
+    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
@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.73" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.75" from Dear ImGui https://github.com/ocornut/imgui
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
 #include <stdio.h>
@@ -105,6 +105,7 @@ typedef int ImGuiDataType;
 typedef int ImGuiDir;
 typedef int ImGuiKey;
 typedef int ImGuiNavInput;
+typedef int ImGuiMouseButton;
 typedef int ImGuiMouseCursor;
 typedef int ImGuiStyleVar;
 typedef int ImDrawCornerFlags;
@@ -134,7 +135,8 @@ typedef unsigned int ImU32;
 typedef int64_t ImS64;
 typedef uint64_t ImU64;
 typedef void (*ImDrawCallback)(const ImDrawList* parent_list, const ImDrawCmd* cmd);
-typedef unsigned short ImDrawIdx;typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
+typedef unsigned short ImDrawIdx;
+typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
 typedef struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
 typedef struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
 typedef struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
@@ -161,8 +163,7 @@ struct ImVec4
 {
    float x, y, z, w;
 };
-enum ImGuiWindowFlags_
-{
+typedef enum {
    ImGuiWindowFlags_None = 0,
    ImGuiWindowFlags_NoTitleBar = 1 << 0,
    ImGuiWindowFlags_NoResize = 1 << 1,
@@ -193,9 +194,8 @@ enum ImGuiWindowFlags_
    ImGuiWindowFlags_Popup = 1 << 26,
    ImGuiWindowFlags_Modal = 1 << 27,
    ImGuiWindowFlags_ChildMenu = 1 << 28
-};
-enum ImGuiInputTextFlags_
-{
+}ImGuiWindowFlags_;
+typedef enum {
    ImGuiInputTextFlags_None = 0,
    ImGuiInputTextFlags_CharsDecimal = 1 << 0,
    ImGuiInputTextFlags_CharsHexadecimal = 1 << 1,
@@ -218,9 +218,8 @@ enum ImGuiInputTextFlags_
    ImGuiInputTextFlags_CallbackResize = 1 << 18,
    ImGuiInputTextFlags_Multiline = 1 << 20,
    ImGuiInputTextFlags_NoMarkEdited = 1 << 21
-};
-enum ImGuiTreeNodeFlags_
-{
+}ImGuiInputTextFlags_;
+typedef enum {
    ImGuiTreeNodeFlags_None = 0,
    ImGuiTreeNodeFlags_Selected = 1 << 0,
    ImGuiTreeNodeFlags_Framed = 1 << 1,
@@ -237,18 +236,16 @@ enum ImGuiTreeNodeFlags_
    ImGuiTreeNodeFlags_SpanFullWidth = 1 << 12,
    ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 13,
    ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog
-};
-enum ImGuiSelectableFlags_
-{
+}ImGuiTreeNodeFlags_;
+typedef enum {
    ImGuiSelectableFlags_None = 0,
    ImGuiSelectableFlags_DontClosePopups = 1 << 0,
    ImGuiSelectableFlags_SpanAllColumns = 1 << 1,
    ImGuiSelectableFlags_AllowDoubleClick = 1 << 2,
    ImGuiSelectableFlags_Disabled = 1 << 3,
    ImGuiSelectableFlags_AllowItemOverlap = 1 << 4
-};
-enum ImGuiComboFlags_
-{
+}ImGuiSelectableFlags_;
+typedef enum {
    ImGuiComboFlags_None = 0,
    ImGuiComboFlags_PopupAlignLeft = 1 << 0,
    ImGuiComboFlags_HeightSmall = 1 << 1,
@@ -258,9 +255,8 @@ enum ImGuiComboFlags_
    ImGuiComboFlags_NoArrowButton = 1 << 5,
    ImGuiComboFlags_NoPreview = 1 << 6,
    ImGuiComboFlags_HeightMask_ = ImGuiComboFlags_HeightSmall | ImGuiComboFlags_HeightRegular | ImGuiComboFlags_HeightLarge | ImGuiComboFlags_HeightLargest
-};
-enum ImGuiTabBarFlags_
-{
+}ImGuiComboFlags_;
+typedef enum {
    ImGuiTabBarFlags_None = 0,
    ImGuiTabBarFlags_Reorderable = 1 << 0,
    ImGuiTabBarFlags_AutoSelectNewTabs = 1 << 1,
@@ -272,25 +268,22 @@ enum ImGuiTabBarFlags_
    ImGuiTabBarFlags_FittingPolicyScroll = 1 << 7,
    ImGuiTabBarFlags_FittingPolicyMask_ = ImGuiTabBarFlags_FittingPolicyResizeDown | ImGuiTabBarFlags_FittingPolicyScroll,
    ImGuiTabBarFlags_FittingPolicyDefault_ = ImGuiTabBarFlags_FittingPolicyResizeDown
-};
-enum ImGuiTabItemFlags_
-{
+}ImGuiTabBarFlags_;
+typedef enum {
    ImGuiTabItemFlags_None = 0,
    ImGuiTabItemFlags_UnsavedDocument = 1 << 0,
    ImGuiTabItemFlags_SetSelected = 1 << 1,
    ImGuiTabItemFlags_NoCloseWithMiddleMouseButton = 1 << 2,
    ImGuiTabItemFlags_NoPushId = 1 << 3
-};
-enum ImGuiFocusedFlags_
-{
+}ImGuiTabItemFlags_;
+typedef enum {
    ImGuiFocusedFlags_None = 0,
    ImGuiFocusedFlags_ChildWindows = 1 << 0,
    ImGuiFocusedFlags_RootWindow = 1 << 1,
    ImGuiFocusedFlags_AnyWindow = 1 << 2,
    ImGuiFocusedFlags_RootAndChildWindows = ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows
-};
-enum ImGuiHoveredFlags_
-{
+}ImGuiFocusedFlags_;
+typedef enum {
    ImGuiHoveredFlags_None = 0,
    ImGuiHoveredFlags_ChildWindows = 1 << 0,
    ImGuiHoveredFlags_RootWindow = 1 << 1,
@@ -301,9 +294,8 @@ enum ImGuiHoveredFlags_
    ImGuiHoveredFlags_AllowWhenDisabled = 1 << 7,
    ImGuiHoveredFlags_RectOnly = ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem | ImGuiHoveredFlags_AllowWhenOverlapped,
    ImGuiHoveredFlags_RootAndChildWindows = ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows
-};
-enum ImGuiDragDropFlags_
-{
+}ImGuiHoveredFlags_;
+typedef enum {
    ImGuiDragDropFlags_None = 0,
    ImGuiDragDropFlags_SourceNoPreviewTooltip = 1 << 0,
    ImGuiDragDropFlags_SourceNoDisableHover = 1 << 1,
@@ -315,9 +307,8 @@ enum ImGuiDragDropFlags_
    ImGuiDragDropFlags_AcceptNoDrawDefaultRect = 1 << 11,
    ImGuiDragDropFlags_AcceptNoPreviewTooltip = 1 << 12,
    ImGuiDragDropFlags_AcceptPeekOnly = ImGuiDragDropFlags_AcceptBeforeDelivery | ImGuiDragDropFlags_AcceptNoDrawDefaultRect
-};
-enum ImGuiDataType_
-{
+}ImGuiDragDropFlags_;
+typedef enum {
    ImGuiDataType_S8,
    ImGuiDataType_U8,
    ImGuiDataType_S16,
@@ -329,18 +320,16 @@ enum ImGuiDataType_
    ImGuiDataType_Float,
    ImGuiDataType_Double,
    ImGuiDataType_COUNT
-};
-enum ImGuiDir_
-{
+}ImGuiDataType_;
+typedef enum {
    ImGuiDir_None = -1,
    ImGuiDir_Left = 0,
    ImGuiDir_Right = 1,
    ImGuiDir_Up = 2,
    ImGuiDir_Down = 3,
    ImGuiDir_COUNT
-};
-enum ImGuiKey_
-{
+}ImGuiDir_;
+typedef enum {
    ImGuiKey_Tab,
    ImGuiKey_LeftArrow,
    ImGuiKey_RightArrow,
@@ -364,9 +353,8 @@ enum ImGuiKey_
    ImGuiKey_Y,
    ImGuiKey_Z,
    ImGuiKey_COUNT
-};
-enum ImGuiNavInput_
-{
+}ImGuiKey_;
+typedef enum {
    ImGuiNavInput_Activate,
    ImGuiNavInput_Cancel,
    ImGuiNavInput_Input,
@@ -384,16 +372,14 @@ enum ImGuiNavInput_
    ImGuiNavInput_TweakSlow,
    ImGuiNavInput_TweakFast,
    ImGuiNavInput_KeyMenu_,
-    ImGuiNavInput_KeyTab_,
    ImGuiNavInput_KeyLeft_,
    ImGuiNavInput_KeyRight_,
    ImGuiNavInput_KeyUp_,
    ImGuiNavInput_KeyDown_,
    ImGuiNavInput_COUNT,
    ImGuiNavInput_InternalStart_ = ImGuiNavInput_KeyMenu_
-};
-enum ImGuiConfigFlags_
-{
+}ImGuiNavInput_;
+typedef enum {
    ImGuiConfigFlags_None = 0,
    ImGuiConfigFlags_NavEnableKeyboard = 1 << 0,
    ImGuiConfigFlags_NavEnableGamepad = 1 << 1,
@@ -403,17 +389,15 @@ enum ImGuiConfigFlags_
    ImGuiConfigFlags_NoMouseCursorChange = 1 << 5,
    ImGuiConfigFlags_IsSRGB = 1 << 20,
    ImGuiConfigFlags_IsTouchScreen = 1 << 21
-};
-enum ImGuiBackendFlags_
-{
+}ImGuiConfigFlags_;
+typedef enum {
    ImGuiBackendFlags_None = 0,
    ImGuiBackendFlags_HasGamepad = 1 << 0,
    ImGuiBackendFlags_HasMouseCursors = 1 << 1,
    ImGuiBackendFlags_HasSetMousePos = 1 << 2,
    ImGuiBackendFlags_RendererHasVtxOffset = 1 << 3
-};
-enum ImGuiCol_
-{
+}ImGuiBackendFlags_;
+typedef enum {
    ImGuiCol_Text,
    ImGuiCol_TextDisabled,
    ImGuiCol_WindowBg,
@@ -463,9 +447,8 @@ enum ImGuiCol_
    ImGuiCol_NavWindowingDimBg,
    ImGuiCol_ModalWindowDimBg,
    ImGuiCol_COUNT
-};
-enum ImGuiStyleVar_
-{
+}ImGuiCol_;
+typedef enum {
    ImGuiStyleVar_Alpha,
    ImGuiStyleVar_WindowPadding,
    ImGuiStyleVar_WindowRounding,
@@ -490,9 +473,8 @@ enum ImGuiStyleVar_
    ImGuiStyleVar_ButtonTextAlign,
    ImGuiStyleVar_SelectableTextAlign,
    ImGuiStyleVar_COUNT
-};
-enum ImGuiColorEditFlags_
-{
+}ImGuiStyleVar_;
+typedef enum {
    ImGuiColorEditFlags_None = 0,
    ImGuiColorEditFlags_NoAlpha = 1 << 1,
    ImGuiColorEditFlags_NoPicker = 1 << 2,
@@ -521,9 +503,14 @@ enum ImGuiColorEditFlags_
    ImGuiColorEditFlags__DataTypeMask = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float,
    ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar,
    ImGuiColorEditFlags__InputMask = ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV
-};
-enum ImGuiMouseCursor_
-{
+}ImGuiColorEditFlags_;
+typedef enum {
+    ImGuiMouseButton_Left = 0,
+    ImGuiMouseButton_Right = 1,
+    ImGuiMouseButton_Middle = 2,
+    ImGuiMouseButton_COUNT = 5
+}ImGuiMouseButton_;
+typedef enum {
    ImGuiMouseCursor_None = -1,
    ImGuiMouseCursor_Arrow = 0,
    ImGuiMouseCursor_TextInput,
@@ -533,15 +520,15 @@ enum ImGuiMouseCursor_
    ImGuiMouseCursor_ResizeNESW,
    ImGuiMouseCursor_ResizeNWSE,
    ImGuiMouseCursor_Hand,
+    ImGuiMouseCursor_NotAllowed,
    ImGuiMouseCursor_COUNT
-};
-enum ImGuiCond_
-{
+}ImGuiMouseCursor_;
+typedef enum {
    ImGuiCond_Always = 1 << 0,
    ImGuiCond_Once = 1 << 1,
    ImGuiCond_FirstUseEver = 1 << 2,
    ImGuiCond_Appearing = 1 << 3
-};
+}ImGuiCond_;
 struct ImGuiStyle
 {
    float Alpha;
@@ -578,6 +565,7 @@ struct ImGuiStyle
    bool AntiAliasedLines;
    bool AntiAliasedFill;
    float CurveTessellationTol;
+    float CircleSegmentMaxError;
    ImVec4 Colors[ImGuiCol_COUNT];
 };
 struct ImGuiIO
@@ -713,9 +701,11 @@ struct ImGuiStorage
 };
 struct ImGuiListClipper
 {
-    float StartPosY;
+    int DisplayStart, DisplayEnd;
+    int ItemsCount;
+    int StepNo;
    float ItemsHeight;
-    int ItemsCount, StepNo, DisplayStart, DisplayEnd;
+    float StartPosY;
 };
 struct ImColor
 {
@@ -748,8 +738,7 @@ struct ImDrawListSplitter
    int _Count;
    ImVector_ImDrawChannel _Channels;
 };
-enum ImDrawCornerFlags_
-{
+typedef enum {
    ImDrawCornerFlags_None = 0,
    ImDrawCornerFlags_TopLeft = 1 << 0,
    ImDrawCornerFlags_TopRight = 1 << 1,
@@ -760,14 +749,13 @@ enum ImDrawCornerFlags_
    ImDrawCornerFlags_Left = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft,
    ImDrawCornerFlags_Right = ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight,
    ImDrawCornerFlags_All = 0xF
-};
-enum ImDrawListFlags_
-{
+}ImDrawCornerFlags_;
+typedef enum {
    ImDrawListFlags_None = 0,
    ImDrawListFlags_AntiAliasedLines = 1 << 0,
    ImDrawListFlags_AntiAliasedFill = 1 << 1,
    ImDrawListFlags_AllowVtxOffset = 1 << 2
-};
+}ImDrawListFlags_;
 struct ImDrawList
 {
    ImVector_ImDrawCmd CmdBuffer;
@@ -838,12 +826,11 @@ struct ImFontAtlasCustomRect
    ImVec2 GlyphOffset;
    ImFont* Font;
 };
-enum ImFontAtlasFlags_
-{
+typedef enum {
    ImFontAtlasFlags_None = 0,
    ImFontAtlasFlags_NoPowerOfTwoHeight = 1 << 0,
    ImFontAtlasFlags_NoMouseCursors = 1 << 1
-};
+}ImFontAtlasFlags_;
 struct ImFontAtlas
 {
    bool Locked;
@@ -876,10 +863,10 @@ struct ImFont
    short ConfigDataCount;
    ImWchar FallbackChar;
    ImWchar EllipsisChar;
+    bool DirtyLookupTables;
    float Scale;
    float Ascent, Descent;
    int MetricsTotalSurface;
-    bool DirtyLookupTables;
 };
    struct ImGuiTextRange
    {
@@ -1109,8 +1096,8 @@ CIMGUI_API bool igDragInt2(const char* label,int v[2],float v_speed,int v_min,in
 CIMGUI_API bool igDragInt3(const char* label,int v[3],float v_speed,int v_min,int v_max,const char* format);
 CIMGUI_API bool igDragInt4(const char* label,int v[4],float v_speed,int v_min,int v_max,const char* format);
 CIMGUI_API bool igDragIntRange2(const char* label,int* v_current_min,int* v_current_max,float v_speed,int v_min,int v_max,const char* format,const char* 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 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 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);
+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);
 CIMGUI_API bool igSliderFloat(const char* label,float* v,float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igSliderFloat2(const char* label,float v[2],float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igSliderFloat3(const char* label,float v[3],float v_min,float v_max,const char* format,float power);
@@ -1120,11 +1107,11 @@ CIMGUI_API bool igSliderInt(const char* label,int* v,int v_min,int v_max,const c
 CIMGUI_API bool igSliderInt2(const char* label,int v[2],int v_min,int v_max,const char* format);
 CIMGUI_API bool igSliderInt3(const char* label,int v[3],int v_min,int v_max,const char* format);
 CIMGUI_API bool igSliderInt4(const char* label,int v[4],int v_min,int v_max,const char* 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 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 igSliderScalar(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_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);
 CIMGUI_API bool igVSliderFloat(const char* label,const ImVec2 size,float* v,float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igVSliderInt(const char* label,const ImVec2 size,int* v,int v_min,int v_max,const char* 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);
 CIMGUI_API bool igInputText(const char* label,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
 CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size,const ImVec2 size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
 CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
@@ -1137,8 +1124,8 @@ CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags flags
 CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags flags);
 CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags flags);
 CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags flags);
-CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags 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 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);
+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);
 CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags);
 CIMGUI_API bool igColorEdit4(const char* label,float col[4],ImGuiColorEditFlags flags);
 CIMGUI_API bool igColorPicker3(const char* label,float col[3],ImGuiColorEditFlags flags);
@@ -1177,10 +1164,10 @@ CIMGUI_API void igValueBool(const char* prefix,bool b);
 CIMGUI_API void igValueInt(const char* prefix,int v);
 CIMGUI_API void igValueUint(const char* prefix,unsigned int v);
 CIMGUI_API void igValueFloat(const char* prefix,float v,const char* float_format);
-CIMGUI_API bool igBeginMainMenuBar(void);
-CIMGUI_API void igEndMainMenuBar(void);
 CIMGUI_API bool igBeginMenuBar(void);
 CIMGUI_API void igEndMenuBar(void);
+CIMGUI_API bool igBeginMainMenuBar(void);
+CIMGUI_API void igEndMainMenuBar(void);
 CIMGUI_API bool igBeginMenu(const char* label,bool enabled);
 CIMGUI_API void igEndMenu(void);
 CIMGUI_API bool igMenuItemBool(const char* label,const char* shortcut,bool selected,bool enabled);
@@ -1191,12 +1178,12 @@ CIMGUI_API void igSetTooltip(const char* fmt,...);
 CIMGUI_API void igSetTooltipV(const char* fmt,va_list args);
 CIMGUI_API void igOpenPopup(const char* str_id);
 CIMGUI_API bool igBeginPopup(const char* str_id,ImGuiWindowFlags flags);
-CIMGUI_API bool igBeginPopupContextItem(const char* str_id,int mouse_button);
-CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,int mouse_button,bool also_over_items);
-CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,int mouse_button);
+CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiMouseButton mouse_button);
+CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items);
+CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiMouseButton mouse_button);
 CIMGUI_API bool igBeginPopupModal(const char* name,bool* p_open,ImGuiWindowFlags flags);
 CIMGUI_API void igEndPopup(void);
-CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,int mouse_button);
+CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,ImGuiMouseButton mouse_button);
 CIMGUI_API bool igIsPopupOpen(const char* str_id);
 CIMGUI_API void igCloseCurrentPopup(void);
 CIMGUI_API void igColumns(int count,const char* id,bool border);
@@ -1231,12 +1218,13 @@ CIMGUI_API void igSetKeyboardFocusHere(int offset);
 CIMGUI_API bool igIsItemHovered(ImGuiHoveredFlags flags);
 CIMGUI_API bool igIsItemActive(void);
 CIMGUI_API bool igIsItemFocused(void);
-CIMGUI_API bool igIsItemClicked(int mouse_button);
+CIMGUI_API bool igIsItemClicked(ImGuiMouseButton mouse_button);
 CIMGUI_API bool igIsItemVisible(void);
 CIMGUI_API bool igIsItemEdited(void);
 CIMGUI_API bool igIsItemActivated(void);
 CIMGUI_API bool igIsItemDeactivated(void);
 CIMGUI_API bool igIsItemDeactivatedAfterEdit(void);
+CIMGUI_API bool igIsItemToggledOpen(void);
 CIMGUI_API bool igIsAnyItemHovered(void);
 CIMGUI_API bool igIsAnyItemActive(void);
 CIMGUI_API bool igIsAnyItemFocused(void);
@@ -1265,21 +1253,21 @@ CIMGUI_API bool igIsKeyDown(int user_key_index);
 CIMGUI_API bool igIsKeyPressed(int user_key_index,bool repeat);
 CIMGUI_API bool igIsKeyReleased(int user_key_index);
 CIMGUI_API int igGetKeyPressedAmount(int key_index,float repeat_delay,float rate);
-CIMGUI_API bool igIsMouseDown(int button);
-CIMGUI_API bool igIsAnyMouseDown(void);
-CIMGUI_API bool igIsMouseClicked(int button,bool repeat);
-CIMGUI_API bool igIsMouseDoubleClicked(int button);
-CIMGUI_API bool igIsMouseReleased(int button);
-CIMGUI_API bool igIsMouseDragging(int button,float lock_threshold);
+CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value);
+CIMGUI_API bool igIsMouseDown(ImGuiMouseButton button);
+CIMGUI_API bool igIsMouseClicked(ImGuiMouseButton button,bool repeat);
+CIMGUI_API bool igIsMouseReleased(ImGuiMouseButton button);
+CIMGUI_API bool igIsMouseDoubleClicked(ImGuiMouseButton button);
 CIMGUI_API bool igIsMouseHoveringRect(const ImVec2 r_min,const ImVec2 r_max,bool clip);
 CIMGUI_API bool igIsMousePosValid(const ImVec2* mouse_pos);
+CIMGUI_API bool igIsAnyMouseDown(void);
 CIMGUI_API ImVec2 igGetMousePos(void);
 CIMGUI_API ImVec2 igGetMousePosOnOpeningCurrentPopup(void);
-CIMGUI_API ImVec2 igGetMouseDragDelta(int button,float lock_threshold);
-CIMGUI_API void igResetMouseDragDelta(int button);
+CIMGUI_API bool igIsMouseDragging(ImGuiMouseButton button,float lock_threshold);
+CIMGUI_API ImVec2 igGetMouseDragDelta(ImGuiMouseButton button,float lock_threshold);
+CIMGUI_API void igResetMouseDragDelta(ImGuiMouseButton button);
 CIMGUI_API ImGuiMouseCursor igGetMouseCursor(void);
-CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type);
-CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value);
+CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor cursor_type);
 CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value);
 CIMGUI_API const char* igGetClipboardText(void);
 CIMGUI_API void igSetClipboardText(const char* text);
@@ -1394,11 +1382,13 @@ CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 p1,const Im
 CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col);
 CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness);
 CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments);
+CIMGUI_API void ImDrawList_AddNgon(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness);
+CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments);
 CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end);
 CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect);
 CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness);
 CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col);
-CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,const ImVec2 cp0,const ImVec2 cp1,const ImVec2 pos1,ImU32 col,float thickness,int num_segments);
+CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int 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);
 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);
 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);
@@ -1409,7 +1399,7 @@ CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* self,ImU32 col);
 CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,float thickness);
 CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments);
 CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,float radius,int a_min_of_12,int a_max_of_12);
-CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,int num_segments);
+CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments);
 CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners);
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data);
 CIMGUI_API void ImDrawList_AddDrawCmd(ImDrawList* self);
@@ -1420,6 +1410,7 @@ CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int n);
 CIMGUI_API void ImDrawList_Clear(ImDrawList* self);
 CIMGUI_API void ImDrawList_ClearFreeMemory(ImDrawList* self);
 CIMGUI_API void ImDrawList_PrimReserve(ImDrawList* self,int idx_count,int vtx_count);
+CIMGUI_API void ImDrawList_PrimUnreserve(ImDrawList* self,int idx_count,int vtx_count);
 CIMGUI_API void ImDrawList_PrimRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col);
 CIMGUI_API void ImDrawList_PrimRectUV(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col);
 CIMGUI_API void ImDrawList_PrimQuadUV(ImDrawList* self,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);
@@ -1528,8 +1519,8 @@ CIMGUI_API void igGetMousePos_nonUDT(ImVec2 *pOut);
 CIMGUI_API ImVec2_Simple igGetMousePos_nonUDT2(void);
 CIMGUI_API void igGetMousePosOnOpeningCurrentPopup_nonUDT(ImVec2 *pOut);
 CIMGUI_API ImVec2_Simple igGetMousePosOnOpeningCurrentPopup_nonUDT2(void);
-CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,int button,float lock_threshold);
-CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(int button,float lock_threshold);
+CIMGUI_API void igGetMouseDragDelta_nonUDT(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold);
+CIMGUI_API ImVec2_Simple igGetMouseDragDelta_nonUDT2(ImGuiMouseButton button,float lock_threshold);
 CIMGUI_API void ImColor_HSV_nonUDT(ImColor *pOut,ImColor* self,float h,float s,float v,float a);
 CIMGUI_API ImColor_Simple ImColor_HSV_nonUDT2(ImColor* self,float h,float s,float v,float a);
 CIMGUI_API void ImDrawList_GetClipRectMin_nonUDT(ImVec2 *pOut,ImDrawList* self);
@@ -1552,6 +1543,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* self);
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);
 #endif //CIMGUI_INCLUDED
--- a/generator/output/definitions.json
+++ b/generator/output/definitions.json
--- a/generator/output/definitions.lua
+++ b/generator/output/definitions.lua
@@ -481,22 +481,22 @@ defs["ImDrawListSplitter_destroy"][1]["stname"] = "ImDrawListSplitter"
 defs["ImDrawListSplitter_destroy"]["(ImDrawListSplitter*)"] = defs["ImDrawListSplitter_destroy"][1]
 defs["ImDrawList_AddBezierCurve"] = {}
 defs["ImDrawList_AddBezierCurve"][1] = {}
-defs["ImDrawList_AddBezierCurve"][1]["args"] = "(ImDrawList* self,const ImVec2 pos0,const ImVec2 cp0,const ImVec2 cp1,const ImVec2 pos1,ImU32 col,float thickness,int num_segments)"
+defs["ImDrawList_AddBezierCurve"][1]["args"] = "(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int num_segments)"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"] = {}
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][1] = {}
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][1]["name"] = "self"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][1]["type"] = "ImDrawList*"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][2] = {}
-defs["ImDrawList_AddBezierCurve"][1]["argsT"][2]["name"] = "pos0"
+defs["ImDrawList_AddBezierCurve"][1]["argsT"][2]["name"] = "p1"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][2]["type"] = "const ImVec2"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][3] = {}
-defs["ImDrawList_AddBezierCurve"][1]["argsT"][3]["name"] = "cp0"
+defs["ImDrawList_AddBezierCurve"][1]["argsT"][3]["name"] = "p2"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][3]["type"] = "const ImVec2"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][4] = {}
-defs["ImDrawList_AddBezierCurve"][1]["argsT"][4]["name"] = "cp1"
+defs["ImDrawList_AddBezierCurve"][1]["argsT"][4]["name"] = "p3"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][4]["type"] = "const ImVec2"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][5] = {}
-defs["ImDrawList_AddBezierCurve"][1]["argsT"][5]["name"] = "pos1"
+defs["ImDrawList_AddBezierCurve"][1]["argsT"][5]["name"] = "p4"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][5]["type"] = "const ImVec2"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][6] = {}
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][6]["name"] = "col"
@@ -507,8 +507,8 @@ defs["ImDrawList_AddBezierCurve"][1]["argsT"][7]["type"] = "float"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][8] = {}
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][8]["name"] = "num_segments"
 defs["ImDrawList_AddBezierCurve"][1]["argsT"][8]["type"] = "int"
-defs["ImDrawList_AddBezierCurve"][1]["argsoriginal"] = "(const ImVec2& pos0,const ImVec2& cp0,const ImVec2& cp1,const ImVec2& pos1,ImU32 col,float thickness,int num_segments=0)"
-defs["ImDrawList_AddBezierCurve"][1]["call_args"] = "(pos0,cp0,cp1,pos1,col,thickness,num_segments)"
+defs["ImDrawList_AddBezierCurve"][1]["argsoriginal"] = "(const ImVec2& p1,const ImVec2& p2,const ImVec2& p3,const ImVec2& p4,ImU32 col,float thickness,int num_segments=0)"
+defs["ImDrawList_AddBezierCurve"][1]["call_args"] = "(p1,p2,p3,p4,col,thickness,num_segments)"
 defs["ImDrawList_AddBezierCurve"][1]["cimguiname"] = "ImDrawList_AddBezierCurve"
 defs["ImDrawList_AddBezierCurve"][1]["defaults"] = {}
 defs["ImDrawList_AddBezierCurve"][1]["defaults"]["num_segments"] = "0"
@@ -810,6 +810,68 @@ defs["ImDrawList_AddLine"][1]["ret"] = "void"
 defs["ImDrawList_AddLine"][1]["signature"] = "(const ImVec2,const ImVec2,ImU32,float)"
 defs["ImDrawList_AddLine"][1]["stname"] = "ImDrawList"
 defs["ImDrawList_AddLine"]["(const ImVec2,const ImVec2,ImU32,float)"] = defs["ImDrawList_AddLine"][1]
+defs["ImDrawList_AddNgon"] = {}
+defs["ImDrawList_AddNgon"][1] = {}
+defs["ImDrawList_AddNgon"][1]["args"] = "(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness)"
+defs["ImDrawList_AddNgon"][1]["argsT"] = {}
+defs["ImDrawList_AddNgon"][1]["argsT"][1] = {}
+defs["ImDrawList_AddNgon"][1]["argsT"][1]["name"] = "self"
+defs["ImDrawList_AddNgon"][1]["argsT"][1]["type"] = "ImDrawList*"
+defs["ImDrawList_AddNgon"][1]["argsT"][2] = {}
+defs["ImDrawList_AddNgon"][1]["argsT"][2]["name"] = "center"
+defs["ImDrawList_AddNgon"][1]["argsT"][2]["type"] = "const ImVec2"
+defs["ImDrawList_AddNgon"][1]["argsT"][3] = {}
+defs["ImDrawList_AddNgon"][1]["argsT"][3]["name"] = "radius"
+defs["ImDrawList_AddNgon"][1]["argsT"][3]["type"] = "float"
+defs["ImDrawList_AddNgon"][1]["argsT"][4] = {}
+defs["ImDrawList_AddNgon"][1]["argsT"][4]["name"] = "col"
+defs["ImDrawList_AddNgon"][1]["argsT"][4]["type"] = "ImU32"
+defs["ImDrawList_AddNgon"][1]["argsT"][5] = {}
+defs["ImDrawList_AddNgon"][1]["argsT"][5]["name"] = "num_segments"
+defs["ImDrawList_AddNgon"][1]["argsT"][5]["type"] = "int"
+defs["ImDrawList_AddNgon"][1]["argsT"][6] = {}
+defs["ImDrawList_AddNgon"][1]["argsT"][6]["name"] = "thickness"
+defs["ImDrawList_AddNgon"][1]["argsT"][6]["type"] = "float"
+defs["ImDrawList_AddNgon"][1]["argsoriginal"] = "(const ImVec2& center,float radius,ImU32 col,int num_segments,float thickness=1.0f)"
+defs["ImDrawList_AddNgon"][1]["call_args"] = "(center,radius,col,num_segments,thickness)"
+defs["ImDrawList_AddNgon"][1]["cimguiname"] = "ImDrawList_AddNgon"
+defs["ImDrawList_AddNgon"][1]["defaults"] = {}
+defs["ImDrawList_AddNgon"][1]["defaults"]["thickness"] = "1.0f"
+defs["ImDrawList_AddNgon"][1]["funcname"] = "AddNgon"
+defs["ImDrawList_AddNgon"][1]["ov_cimguiname"] = "ImDrawList_AddNgon"
+defs["ImDrawList_AddNgon"][1]["ret"] = "void"
+defs["ImDrawList_AddNgon"][1]["signature"] = "(const ImVec2,float,ImU32,int,float)"
+defs["ImDrawList_AddNgon"][1]["stname"] = "ImDrawList"
+defs["ImDrawList_AddNgon"]["(const ImVec2,float,ImU32,int,float)"] = defs["ImDrawList_AddNgon"][1]
+defs["ImDrawList_AddNgonFilled"] = {}
+defs["ImDrawList_AddNgonFilled"][1] = {}
+defs["ImDrawList_AddNgonFilled"][1]["args"] = "(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments)"
+defs["ImDrawList_AddNgonFilled"][1]["argsT"] = {}
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][1] = {}
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][1]["name"] = "self"
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][1]["type"] = "ImDrawList*"
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][2] = {}
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][2]["name"] = "center"
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][2]["type"] = "const ImVec2"
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][3] = {}
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][3]["name"] = "radius"
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][3]["type"] = "float"
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][4] = {}
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][4]["name"] = "col"
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][4]["type"] = "ImU32"
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][5] = {}
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][5]["name"] = "num_segments"
+defs["ImDrawList_AddNgonFilled"][1]["argsT"][5]["type"] = "int"
+defs["ImDrawList_AddNgonFilled"][1]["argsoriginal"] = "(const ImVec2& center,float radius,ImU32 col,int num_segments)"
+defs["ImDrawList_AddNgonFilled"][1]["call_args"] = "(center,radius,col,num_segments)"
+defs["ImDrawList_AddNgonFilled"][1]["cimguiname"] = "ImDrawList_AddNgonFilled"
+defs["ImDrawList_AddNgonFilled"][1]["defaults"] = {}
+defs["ImDrawList_AddNgonFilled"][1]["funcname"] = "AddNgonFilled"
+defs["ImDrawList_AddNgonFilled"][1]["ov_cimguiname"] = "ImDrawList_AddNgonFilled"
+defs["ImDrawList_AddNgonFilled"][1]["ret"] = "void"
+defs["ImDrawList_AddNgonFilled"][1]["signature"] = "(const ImVec2,float,ImU32,int)"
+defs["ImDrawList_AddNgonFilled"][1]["stname"] = "ImDrawList"
+defs["ImDrawList_AddNgonFilled"]["(const ImVec2,float,ImU32,int)"] = defs["ImDrawList_AddNgonFilled"][1]
 defs["ImDrawList_AddPolyline"] = {}
 defs["ImDrawList_AddPolyline"][1] = {}
 defs["ImDrawList_AddPolyline"][1]["args"] = "(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)"
@@ -1451,25 +1513,25 @@ defs["ImDrawList_PathArcToFast"][1]["stname"] = "ImDrawList"
 defs["ImDrawList_PathArcToFast"]["(const ImVec2,float,int,int)"] = defs["ImDrawList_PathArcToFast"][1]
 defs["ImDrawList_PathBezierCurveTo"] = {}
 defs["ImDrawList_PathBezierCurveTo"][1] = {}
-defs["ImDrawList_PathBezierCurveTo"][1]["args"] = "(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,int num_segments)"
+defs["ImDrawList_PathBezierCurveTo"][1]["args"] = "(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments)"
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"] = {}
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][1] = {}
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][1]["name"] = "self"
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][1]["type"] = "ImDrawList*"
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][2] = {}
-defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][2]["name"] = "p1"
+defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][2]["name"] = "p2"
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][2]["type"] = "const ImVec2"
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][3] = {}
-defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][3]["name"] = "p2"
+defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][3]["name"] = "p3"
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][3]["type"] = "const ImVec2"
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][4] = {}
-defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][4]["name"] = "p3"
+defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][4]["name"] = "p4"
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][4]["type"] = "const ImVec2"
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][5] = {}
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][5]["name"] = "num_segments"
 defs["ImDrawList_PathBezierCurveTo"][1]["argsT"][5]["type"] = "int"
-defs["ImDrawList_PathBezierCurveTo"][1]["argsoriginal"] = "(const ImVec2& p1,const ImVec2& p2,const ImVec2& p3,int num_segments=0)"
-defs["ImDrawList_PathBezierCurveTo"][1]["call_args"] = "(p1,p2,p3,num_segments)"
+defs["ImDrawList_PathBezierCurveTo"][1]["argsoriginal"] = "(const ImVec2& p2,const ImVec2& p3,const ImVec2& p4,int num_segments=0)"
+defs["ImDrawList_PathBezierCurveTo"][1]["call_args"] = "(p2,p3,p4,num_segments)"
 defs["ImDrawList_PathBezierCurveTo"][1]["cimguiname"] = "ImDrawList_PathBezierCurveTo"
 defs["ImDrawList_PathBezierCurveTo"][1]["defaults"] = {}
 defs["ImDrawList_PathBezierCurveTo"][1]["defaults"]["num_segments"] = "0"
@@ -1773,6 +1835,29 @@ defs["ImDrawList_PrimReserve"][1]["ret"] = "void"
 defs["ImDrawList_PrimReserve"][1]["signature"] = "(int,int)"
 defs["ImDrawList_PrimReserve"][1]["stname"] = "ImDrawList"
 defs["ImDrawList_PrimReserve"]["(int,int)"] = defs["ImDrawList_PrimReserve"][1]
+defs["ImDrawList_PrimUnreserve"] = {}
+defs["ImDrawList_PrimUnreserve"][1] = {}
+defs["ImDrawList_PrimUnreserve"][1]["args"] = "(ImDrawList* self,int idx_count,int vtx_count)"
+defs["ImDrawList_PrimUnreserve"][1]["argsT"] = {}
+defs["ImDrawList_PrimUnreserve"][1]["argsT"][1] = {}
+defs["ImDrawList_PrimUnreserve"][1]["argsT"][1]["name"] = "self"
+defs["ImDrawList_PrimUnreserve"][1]["argsT"][1]["type"] = "ImDrawList*"
+defs["ImDrawList_PrimUnreserve"][1]["argsT"][2] = {}
+defs["ImDrawList_PrimUnreserve"][1]["argsT"][2]["name"] = "idx_count"
+defs["ImDrawList_PrimUnreserve"][1]["argsT"][2]["type"] = "int"
+defs["ImDrawList_PrimUnreserve"][1]["argsT"][3] = {}
+defs["ImDrawList_PrimUnreserve"][1]["argsT"][3]["name"] = "vtx_count"
+defs["ImDrawList_PrimUnreserve"][1]["argsT"][3]["type"] = "int"
+defs["ImDrawList_PrimUnreserve"][1]["argsoriginal"] = "(int idx_count,int vtx_count)"
+defs["ImDrawList_PrimUnreserve"][1]["call_args"] = "(idx_count,vtx_count)"
+defs["ImDrawList_PrimUnreserve"][1]["cimguiname"] = "ImDrawList_PrimUnreserve"
+defs["ImDrawList_PrimUnreserve"][1]["defaults"] = {}
+defs["ImDrawList_PrimUnreserve"][1]["funcname"] = "PrimUnreserve"
+defs["ImDrawList_PrimUnreserve"][1]["ov_cimguiname"] = "ImDrawList_PrimUnreserve"
+defs["ImDrawList_PrimUnreserve"][1]["ret"] = "void"
+defs["ImDrawList_PrimUnreserve"][1]["signature"] = "(int,int)"
+defs["ImDrawList_PrimUnreserve"][1]["stname"] = "ImDrawList"
+defs["ImDrawList_PrimUnreserve"]["(int,int)"] = defs["ImDrawList_PrimUnreserve"][1]
 defs["ImDrawList_PrimVtx"] = {}
 defs["ImDrawList_PrimVtx"][1] = {}
 defs["ImDrawList_PrimVtx"][1]["args"] = "(ImDrawList* self,const ImVec2 pos,const ImVec2 uv,ImU32 col)"
@@ -2279,9 +2364,9 @@ defs["ImFontAtlas_CalcCustomRectUV"][1]["defaults"] = {}
 defs["ImFontAtlas_CalcCustomRectUV"][1]["funcname"] = "CalcCustomRectUV"
 defs["ImFontAtlas_CalcCustomRectUV"][1]["ov_cimguiname"] = "ImFontAtlas_CalcCustomRectUV"
 defs["ImFontAtlas_CalcCustomRectUV"][1]["ret"] = "void"
-defs["ImFontAtlas_CalcCustomRectUV"][1]["signature"] = "(const ImFontAtlasCustomRect*,ImVec2*,ImVec2*)"
+defs["ImFontAtlas_CalcCustomRectUV"][1]["signature"] = "(const ImFontAtlasCustomRect*,ImVec2*,ImVec2*)const"
 defs["ImFontAtlas_CalcCustomRectUV"][1]["stname"] = "ImFontAtlas"
-defs["ImFontAtlas_CalcCustomRectUV"]["(const ImFontAtlasCustomRect*,ImVec2*,ImVec2*)"] = defs["ImFontAtlas_CalcCustomRectUV"][1]
+defs["ImFontAtlas_CalcCustomRectUV"]["(const ImFontAtlasCustomRect*,ImVec2*,ImVec2*)const"] = defs["ImFontAtlas_CalcCustomRectUV"][1]
 defs["ImFontAtlas_Clear"] = {}
 defs["ImFontAtlas_Clear"][1] = {}
 defs["ImFontAtlas_Clear"][1]["args"] = "(ImFontAtlas* self)"
@@ -2626,9 +2711,9 @@ defs["ImFontAtlas_IsBuilt"][1]["defaults"] = {}
 defs["ImFontAtlas_IsBuilt"][1]["funcname"] = "IsBuilt"
 defs["ImFontAtlas_IsBuilt"][1]["ov_cimguiname"] = "ImFontAtlas_IsBuilt"
 defs["ImFontAtlas_IsBuilt"][1]["ret"] = "bool"
-defs["ImFontAtlas_IsBuilt"][1]["signature"] = "()"
+defs["ImFontAtlas_IsBuilt"][1]["signature"] = "()const"
 defs["ImFontAtlas_IsBuilt"][1]["stname"] = "ImFontAtlas"
-defs["ImFontAtlas_IsBuilt"]["()"] = defs["ImFontAtlas_IsBuilt"][1]
+defs["ImFontAtlas_IsBuilt"]["()const"] = defs["ImFontAtlas_IsBuilt"][1]
 defs["ImFontAtlas_SetTexID"] = {}
 defs["ImFontAtlas_SetTexID"][1] = {}
 defs["ImFontAtlas_SetTexID"][1]["args"] = "(ImFontAtlas* self,ImTextureID id)"
@@ -4392,9 +4477,9 @@ defs["ImGuiTextBuffer_empty"][1]["defaults"] = {}
 defs["ImGuiTextBuffer_empty"][1]["funcname"] = "empty"
 defs["ImGuiTextBuffer_empty"][1]["ov_cimguiname"] = "ImGuiTextBuffer_empty"
 defs["ImGuiTextBuffer_empty"][1]["ret"] = "bool"
-defs["ImGuiTextBuffer_empty"][1]["signature"] = "()"
+defs["ImGuiTextBuffer_empty"][1]["signature"] = "()const"
 defs["ImGuiTextBuffer_empty"][1]["stname"] = "ImGuiTextBuffer"
-defs["ImGuiTextBuffer_empty"]["()"] = defs["ImGuiTextBuffer_empty"][1]
+defs["ImGuiTextBuffer_empty"]["()const"] = defs["ImGuiTextBuffer_empty"][1]
 defs["ImGuiTextBuffer_end"] = {}
 defs["ImGuiTextBuffer_end"][1] = {}
 defs["ImGuiTextBuffer_end"][1]["args"] = "(ImGuiTextBuffer* self)"
@@ -5383,6 +5468,27 @@ defs["ImVector_resize"][2]["stname"] = "ImVector"
 defs["ImVector_resize"][2]["templated"] = true
 defs["ImVector_resize"]["(int)"] = defs["ImVector_resize"][1]
 defs["ImVector_resize"]["(int,const T)"] = defs["ImVector_resize"][2]
+defs["ImVector_shrink"] = {}
+defs["ImVector_shrink"][1] = {}
+defs["ImVector_shrink"][1]["args"] = "(ImVector* self,int new_size)"
+defs["ImVector_shrink"][1]["argsT"] = {}
+defs["ImVector_shrink"][1]["argsT"][1] = {}
+defs["ImVector_shrink"][1]["argsT"][1]["name"] = "self"
+defs["ImVector_shrink"][1]["argsT"][1]["type"] = "ImVector*"
+defs["ImVector_shrink"][1]["argsT"][2] = {}
+defs["ImVector_shrink"][1]["argsT"][2]["name"] = "new_size"
+defs["ImVector_shrink"][1]["argsT"][2]["type"] = "int"
+defs["ImVector_shrink"][1]["argsoriginal"] = "(int new_size)"
+defs["ImVector_shrink"][1]["call_args"] = "(new_size)"
+defs["ImVector_shrink"][1]["cimguiname"] = "ImVector_shrink"
+defs["ImVector_shrink"][1]["defaults"] = {}
+defs["ImVector_shrink"][1]["funcname"] = "shrink"
+defs["ImVector_shrink"][1]["ov_cimguiname"] = "ImVector_shrink"
+defs["ImVector_shrink"][1]["ret"] = "void"
+defs["ImVector_shrink"][1]["signature"] = "(int)"
+defs["ImVector_shrink"][1]["stname"] = "ImVector"
+defs["ImVector_shrink"][1]["templated"] = true
+defs["ImVector_shrink"]["(int)"] = defs["ImVector_shrink"][1]
 defs["ImVector_size"] = {}
 defs["ImVector_size"][1] = {}
 defs["ImVector_size"][1]["args"] = "(ImVector* self)"
@@ -5758,15 +5864,15 @@ defs["igBeginPopup"][1]["stname"] = ""
 defs["igBeginPopup"]["(const char*,ImGuiWindowFlags)"] = defs["igBeginPopup"][1]
 defs["igBeginPopupContextItem"] = {}
 defs["igBeginPopupContextItem"][1] = {}
-defs["igBeginPopupContextItem"][1]["args"] = "(const char* str_id,int mouse_button)"
+defs["igBeginPopupContextItem"][1]["args"] = "(const char* str_id,ImGuiMouseButton mouse_button)"
 defs["igBeginPopupContextItem"][1]["argsT"] = {}
 defs["igBeginPopupContextItem"][1]["argsT"][1] = {}
 defs["igBeginPopupContextItem"][1]["argsT"][1]["name"] = "str_id"
 defs["igBeginPopupContextItem"][1]["argsT"][1]["type"] = "const char*"
 defs["igBeginPopupContextItem"][1]["argsT"][2] = {}
 defs["igBeginPopupContextItem"][1]["argsT"][2]["name"] = "mouse_button"
-defs["igBeginPopupContextItem"][1]["argsT"][2]["type"] = "int"
-defs["igBeginPopupContextItem"][1]["argsoriginal"] = "(const char* str_id=((void*)0),int mouse_button=1)"
+defs["igBeginPopupContextItem"][1]["argsT"][2]["type"] = "ImGuiMouseButton"
+defs["igBeginPopupContextItem"][1]["argsoriginal"] = "(const char* str_id=((void*)0),ImGuiMouseButton mouse_button=1)"
 defs["igBeginPopupContextItem"][1]["call_args"] = "(str_id,mouse_button)"
 defs["igBeginPopupContextItem"][1]["cimguiname"] = "igBeginPopupContextItem"
 defs["igBeginPopupContextItem"][1]["defaults"] = {}
@@ -5776,20 +5882,20 @@ defs["igBeginPopupContextItem"][1]["funcname"] = "BeginPopupContextItem"
 defs["igBeginPopupContextItem"][1]["namespace"] = "ImGui"
 defs["igBeginPopupContextItem"][1]["ov_cimguiname"] = "igBeginPopupContextItem"
 defs["igBeginPopupContextItem"][1]["ret"] = "bool"
-defs["igBeginPopupContextItem"][1]["signature"] = "(const char*,int)"
+defs["igBeginPopupContextItem"][1]["signature"] = "(const char*,ImGuiMouseButton)"
 defs["igBeginPopupContextItem"][1]["stname"] = ""
-defs["igBeginPopupContextItem"]["(const char*,int)"] = defs["igBeginPopupContextItem"][1]
+defs["igBeginPopupContextItem"]["(const char*,ImGuiMouseButton)"] = defs["igBeginPopupContextItem"][1]
 defs["igBeginPopupContextVoid"] = {}
 defs["igBeginPopupContextVoid"][1] = {}
-defs["igBeginPopupContextVoid"][1]["args"] = "(const char* str_id,int mouse_button)"
+defs["igBeginPopupContextVoid"][1]["args"] = "(const char* str_id,ImGuiMouseButton mouse_button)"
 defs["igBeginPopupContextVoid"][1]["argsT"] = {}
 defs["igBeginPopupContextVoid"][1]["argsT"][1] = {}
 defs["igBeginPopupContextVoid"][1]["argsT"][1]["name"] = "str_id"
 defs["igBeginPopupContextVoid"][1]["argsT"][1]["type"] = "const char*"
 defs["igBeginPopupContextVoid"][1]["argsT"][2] = {}
 defs["igBeginPopupContextVoid"][1]["argsT"][2]["name"] = "mouse_button"
-defs["igBeginPopupContextVoid"][1]["argsT"][2]["type"] = "int"
-defs["igBeginPopupContextVoid"][1]["argsoriginal"] = "(const char* str_id=((void*)0),int mouse_button=1)"
+defs["igBeginPopupContextVoid"][1]["argsT"][2]["type"] = "ImGuiMouseButton"
+defs["igBeginPopupContextVoid"][1]["argsoriginal"] = "(const char* str_id=((void*)0),ImGuiMouseButton mouse_button=1)"
 defs["igBeginPopupContextVoid"][1]["call_args"] = "(str_id,mouse_button)"
 defs["igBeginPopupContextVoid"][1]["cimguiname"] = "igBeginPopupContextVoid"
 defs["igBeginPopupContextVoid"][1]["defaults"] = {}
@@ -5799,23 +5905,23 @@ defs["igBeginPopupContextVoid"][1]["funcname"] = "BeginPopupContextVoid"
 defs["igBeginPopupContextVoid"][1]["namespace"] = "ImGui"
 defs["igBeginPopupContextVoid"][1]["ov_cimguiname"] = "igBeginPopupContextVoid"
 defs["igBeginPopupContextVoid"][1]["ret"] = "bool"
-defs["igBeginPopupContextVoid"][1]["signature"] = "(const char*,int)"
+defs["igBeginPopupContextVoid"][1]["signature"] = "(const char*,ImGuiMouseButton)"
 defs["igBeginPopupContextVoid"][1]["stname"] = ""
-defs["igBeginPopupContextVoid"]["(const char*,int)"] = defs["igBeginPopupContextVoid"][1]
+defs["igBeginPopupContextVoid"]["(const char*,ImGuiMouseButton)"] = defs["igBeginPopupContextVoid"][1]
 defs["igBeginPopupContextWindow"] = {}
 defs["igBeginPopupContextWindow"][1] = {}
-defs["igBeginPopupContextWindow"][1]["args"] = "(const char* str_id,int mouse_button,bool also_over_items)"
+defs["igBeginPopupContextWindow"][1]["args"] = "(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items)"
 defs["igBeginPopupContextWindow"][1]["argsT"] = {}
 defs["igBeginPopupContextWindow"][1]["argsT"][1] = {}
 defs["igBeginPopupContextWindow"][1]["argsT"][1]["name"] = "str_id"
 defs["igBeginPopupContextWindow"][1]["argsT"][1]["type"] = "const char*"
 defs["igBeginPopupContextWindow"][1]["argsT"][2] = {}
 defs["igBeginPopupContextWindow"][1]["argsT"][2]["name"] = "mouse_button"
-defs["igBeginPopupContextWindow"][1]["argsT"][2]["type"] = "int"
+defs["igBeginPopupContextWindow"][1]["argsT"][2]["type"] = "ImGuiMouseButton"
 defs["igBeginPopupContextWindow"][1]["argsT"][3] = {}
 defs["igBeginPopupContextWindow"][1]["argsT"][3]["name"] = "also_over_items"
 defs["igBeginPopupContextWindow"][1]["argsT"][3]["type"] = "bool"
-defs["igBeginPopupContextWindow"][1]["argsoriginal"] = "(const char* str_id=((void*)0),int mouse_button=1,bool also_over_items=true)"
+defs["igBeginPopupContextWindow"][1]["argsoriginal"] = "(const char* str_id=((void*)0),ImGuiMouseButton mouse_button=1,bool also_over_items=true)"
 defs["igBeginPopupContextWindow"][1]["call_args"] = "(str_id,mouse_button,also_over_items)"
 defs["igBeginPopupContextWindow"][1]["cimguiname"] = "igBeginPopupContextWindow"
 defs["igBeginPopupContextWindow"][1]["defaults"] = {}
@@ -5826,9 +5932,9 @@ defs["igBeginPopupContextWindow"][1]["funcname"] = "BeginPopupContextWindow"
 defs["igBeginPopupContextWindow"][1]["namespace"] = "ImGui"
 defs["igBeginPopupContextWindow"][1]["ov_cimguiname"] = "igBeginPopupContextWindow"
 defs["igBeginPopupContextWindow"][1]["ret"] = "bool"
-defs["igBeginPopupContextWindow"][1]["signature"] = "(const char*,int,bool)"
+defs["igBeginPopupContextWindow"][1]["signature"] = "(const char*,ImGuiMouseButton,bool)"
 defs["igBeginPopupContextWindow"][1]["stname"] = ""
-defs["igBeginPopupContextWindow"]["(const char*,int,bool)"] = defs["igBeginPopupContextWindow"][1]
+defs["igBeginPopupContextWindow"]["(const char*,ImGuiMouseButton,bool)"] = defs["igBeginPopupContextWindow"][1]
 defs["igBeginPopupModal"] = {}
 defs["igBeginPopupModal"][1] = {}
 defs["igBeginPopupModal"][1]["args"] = "(const char* name,bool* p_open,ImGuiWindowFlags flags)"
@@ -7149,7 +7255,7 @@ defs["igDragIntRange2"][1]["stname"] = ""
 defs["igDragIntRange2"]["(const char*,int*,int*,float,int,int,const char*,const char*)"] = defs["igDragIntRange2"][1]
 defs["igDragScalar"] = {}
 defs["igDragScalar"][1] = {}
-defs["igDragScalar"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* v,float v_speed,const void* v_min,const void* v_max,const char* format,float power)"
+defs["igDragScalar"][1]["args"] = "(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)"
 defs["igDragScalar"][1]["argsT"] = {}
 defs["igDragScalar"][1]["argsT"][1] = {}
 defs["igDragScalar"][1]["argsT"][1]["name"] = "label"
@@ -7158,16 +7264,16 @@ defs["igDragScalar"][1]["argsT"][2] = {}
 defs["igDragScalar"][1]["argsT"][2]["name"] = "data_type"
 defs["igDragScalar"][1]["argsT"][2]["type"] = "ImGuiDataType"
 defs["igDragScalar"][1]["argsT"][3] = {}
-defs["igDragScalar"][1]["argsT"][3]["name"] = "v"
+defs["igDragScalar"][1]["argsT"][3]["name"] = "p_data"
 defs["igDragScalar"][1]["argsT"][3]["type"] = "void*"
 defs["igDragScalar"][1]["argsT"][4] = {}
 defs["igDragScalar"][1]["argsT"][4]["name"] = "v_speed"
 defs["igDragScalar"][1]["argsT"][4]["type"] = "float"
 defs["igDragScalar"][1]["argsT"][5] = {}
-defs["igDragScalar"][1]["argsT"][5]["name"] = "v_min"
+defs["igDragScalar"][1]["argsT"][5]["name"] = "p_min"
 defs["igDragScalar"][1]["argsT"][5]["type"] = "const void*"
 defs["igDragScalar"][1]["argsT"][6] = {}
-defs["igDragScalar"][1]["argsT"][6]["name"] = "v_max"
+defs["igDragScalar"][1]["argsT"][6]["name"] = "p_max"
 defs["igDragScalar"][1]["argsT"][6]["type"] = "const void*"
 defs["igDragScalar"][1]["argsT"][7] = {}
 defs["igDragScalar"][1]["argsT"][7]["name"] = "format"
@@ -7175,14 +7281,14 @@ defs["igDragScalar"][1]["argsT"][7]["type"] = "const char*"
 defs["igDragScalar"][1]["argsT"][8] = {}
 defs["igDragScalar"][1]["argsT"][8]["name"] = "power"
 defs["igDragScalar"][1]["argsT"][8]["type"] = "float"
-defs["igDragScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,float v_speed,const void* v_min=((void*)0),const void* v_max=((void*)0),const char* format=((void*)0),float power=1.0f)"
-defs["igDragScalar"][1]["call_args"] = "(label,data_type,v,v_speed,v_min,v_max,format,power)"
+defs["igDragScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,float v_speed,const void* p_min=((void*)0),const void* p_max=((void*)0),const char* format=((void*)0),float power=1.0f)"
+defs["igDragScalar"][1]["call_args"] = "(label,data_type,p_data,v_speed,p_min,p_max,format,power)"
 defs["igDragScalar"][1]["cimguiname"] = "igDragScalar"
 defs["igDragScalar"][1]["defaults"] = {}
 defs["igDragScalar"][1]["defaults"]["format"] = "((void*)0)"
+defs["igDragScalar"][1]["defaults"]["p_max"] = "((void*)0)"
+defs["igDragScalar"][1]["defaults"]["p_min"] = "((void*)0)"
 defs["igDragScalar"][1]["defaults"]["power"] = "1.0f"
-defs["igDragScalar"][1]["defaults"]["v_max"] = "((void*)0)"
-defs["igDragScalar"][1]["defaults"]["v_min"] = "((void*)0)"
 defs["igDragScalar"][1]["funcname"] = "DragScalar"
 defs["igDragScalar"][1]["namespace"] = "ImGui"
 defs["igDragScalar"][1]["ov_cimguiname"] = "igDragScalar"
@@ -7192,7 +7298,7 @@ defs["igDragScalar"][1]["stname"] = ""
 defs["igDragScalar"]["(const char*,ImGuiDataType,void*,float,const void*,const void*,const char*,float)"] = defs["igDragScalar"][1]
 defs["igDragScalarN"] = {}
 defs["igDragScalarN"][1] = {}
-defs["igDragScalarN"][1]["args"] = "(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)"
+defs["igDragScalarN"][1]["args"] = "(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)"
 defs["igDragScalarN"][1]["argsT"] = {}
 defs["igDragScalarN"][1]["argsT"][1] = {}
 defs["igDragScalarN"][1]["argsT"][1]["name"] = "label"
@@ -7201,7 +7307,7 @@ defs["igDragScalarN"][1]["argsT"][2] = {}
 defs["igDragScalarN"][1]["argsT"][2]["name"] = "data_type"
 defs["igDragScalarN"][1]["argsT"][2]["type"] = "ImGuiDataType"
 defs["igDragScalarN"][1]["argsT"][3] = {}
-defs["igDragScalarN"][1]["argsT"][3]["name"] = "v"
+defs["igDragScalarN"][1]["argsT"][3]["name"] = "p_data"
 defs["igDragScalarN"][1]["argsT"][3]["type"] = "void*"
 defs["igDragScalarN"][1]["argsT"][4] = {}
 defs["igDragScalarN"][1]["argsT"][4]["name"] = "components"
@@ -7210,10 +7316,10 @@ defs["igDragScalarN"][1]["argsT"][5] = {}
 defs["igDragScalarN"][1]["argsT"][5]["name"] = "v_speed"
 defs["igDragScalarN"][1]["argsT"][5]["type"] = "float"
 defs["igDragScalarN"][1]["argsT"][6] = {}
-defs["igDragScalarN"][1]["argsT"][6]["name"] = "v_min"
+defs["igDragScalarN"][1]["argsT"][6]["name"] = "p_min"
 defs["igDragScalarN"][1]["argsT"][6]["type"] = "const void*"
 defs["igDragScalarN"][1]["argsT"][7] = {}
-defs["igDragScalarN"][1]["argsT"][7]["name"] = "v_max"
+defs["igDragScalarN"][1]["argsT"][7]["name"] = "p_max"
 defs["igDragScalarN"][1]["argsT"][7]["type"] = "const void*"
 defs["igDragScalarN"][1]["argsT"][8] = {}
 defs["igDragScalarN"][1]["argsT"][8]["name"] = "format"
@@ -7221,14 +7327,14 @@ defs["igDragScalarN"][1]["argsT"][8]["type"] = "const char*"
 defs["igDragScalarN"][1]["argsT"][9] = {}
 defs["igDragScalarN"][1]["argsT"][9]["name"] = "power"
 defs["igDragScalarN"][1]["argsT"][9]["type"] = "float"
-defs["igDragScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,int components,float v_speed,const void* v_min=((void*)0),const void* v_max=((void*)0),const char* format=((void*)0),float power=1.0f)"
-defs["igDragScalarN"][1]["call_args"] = "(label,data_type,v,components,v_speed,v_min,v_max,format,power)"
+defs["igDragScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,int components,float v_speed,const void* p_min=((void*)0),const void* p_max=((void*)0),const char* format=((void*)0),float power=1.0f)"
+defs["igDragScalarN"][1]["call_args"] = "(label,data_type,p_data,components,v_speed,p_min,p_max,format,power)"
 defs["igDragScalarN"][1]["cimguiname"] = "igDragScalarN"
 defs["igDragScalarN"][1]["defaults"] = {}
 defs["igDragScalarN"][1]["defaults"]["format"] = "((void*)0)"
+defs["igDragScalarN"][1]["defaults"]["p_max"] = "((void*)0)"
+defs["igDragScalarN"][1]["defaults"]["p_min"] = "((void*)0)"
 defs["igDragScalarN"][1]["defaults"]["power"] = "1.0f"
-defs["igDragScalarN"][1]["defaults"]["v_max"] = "((void*)0)"
-defs["igDragScalarN"][1]["defaults"]["v_min"] = "((void*)0)"
 defs["igDragScalarN"][1]["funcname"] = "DragScalarN"
 defs["igDragScalarN"][1]["namespace"] = "ImGui"
 defs["igDragScalarN"][1]["ov_cimguiname"] = "igDragScalarN"
@@ -8384,15 +8490,15 @@ defs["igGetMouseCursor"][1]["stname"] = ""
 defs["igGetMouseCursor"]["()"] = defs["igGetMouseCursor"][1]
 defs["igGetMouseDragDelta"] = {}
 defs["igGetMouseDragDelta"][1] = {}
-defs["igGetMouseDragDelta"][1]["args"] = "(int button,float lock_threshold)"
+defs["igGetMouseDragDelta"][1]["args"] = "(ImGuiMouseButton button,float lock_threshold)"
 defs["igGetMouseDragDelta"][1]["argsT"] = {}
 defs["igGetMouseDragDelta"][1]["argsT"][1] = {}
 defs["igGetMouseDragDelta"][1]["argsT"][1]["name"] = "button"
-defs["igGetMouseDragDelta"][1]["argsT"][1]["type"] = "int"
+defs["igGetMouseDragDelta"][1]["argsT"][1]["type"] = "ImGuiMouseButton"
 defs["igGetMouseDragDelta"][1]["argsT"][2] = {}
 defs["igGetMouseDragDelta"][1]["argsT"][2]["name"] = "lock_threshold"
 defs["igGetMouseDragDelta"][1]["argsT"][2]["type"] = "float"
-defs["igGetMouseDragDelta"][1]["argsoriginal"] = "(int button=0,float lock_threshold=-1.0f)"
+defs["igGetMouseDragDelta"][1]["argsoriginal"] = "(ImGuiMouseButton button=0,float lock_threshold=-1.0f)"
 defs["igGetMouseDragDelta"][1]["call_args"] = "(button,lock_threshold)"
 defs["igGetMouseDragDelta"][1]["cimguiname"] = "igGetMouseDragDelta"
 defs["igGetMouseDragDelta"][1]["defaults"] = {}
@@ -8402,21 +8508,21 @@ defs["igGetMouseDragDelta"][1]["funcname"] = "GetMouseDragDelta"
 defs["igGetMouseDragDelta"][1]["namespace"] = "ImGui"
 defs["igGetMouseDragDelta"][1]["ov_cimguiname"] = "igGetMouseDragDelta"
 defs["igGetMouseDragDelta"][1]["ret"] = "ImVec2"
-defs["igGetMouseDragDelta"][1]["signature"] = "(int,float)"
+defs["igGetMouseDragDelta"][1]["signature"] = "(ImGuiMouseButton,float)"
 defs["igGetMouseDragDelta"][1]["stname"] = ""
 defs["igGetMouseDragDelta"][2] = {}
-defs["igGetMouseDragDelta"][2]["args"] = "(ImVec2 *pOut,int button,float lock_threshold)"
+defs["igGetMouseDragDelta"][2]["args"] = "(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold)"
 defs["igGetMouseDragDelta"][2]["argsT"] = {}
 defs["igGetMouseDragDelta"][2]["argsT"][1] = {}
 defs["igGetMouseDragDelta"][2]["argsT"][1]["name"] = "pOut"
 defs["igGetMouseDragDelta"][2]["argsT"][1]["type"] = "ImVec2*"
 defs["igGetMouseDragDelta"][2]["argsT"][2] = {}
 defs["igGetMouseDragDelta"][2]["argsT"][2]["name"] = "button"
-defs["igGetMouseDragDelta"][2]["argsT"][2]["type"] = "int"
+defs["igGetMouseDragDelta"][2]["argsT"][2]["type"] = "ImGuiMouseButton"
 defs["igGetMouseDragDelta"][2]["argsT"][3] = {}
 defs["igGetMouseDragDelta"][2]["argsT"][3]["name"] = "lock_threshold"
 defs["igGetMouseDragDelta"][2]["argsT"][3]["type"] = "float"
-defs["igGetMouseDragDelta"][2]["argsoriginal"] = "(int button=0,float lock_threshold=-1.0f)"
+defs["igGetMouseDragDelta"][2]["argsoriginal"] = "(ImGuiMouseButton button=0,float lock_threshold=-1.0f)"
 defs["igGetMouseDragDelta"][2]["call_args"] = "(button,lock_threshold)"
 defs["igGetMouseDragDelta"][2]["cimguiname"] = "igGetMouseDragDelta"
 defs["igGetMouseDragDelta"][2]["defaults"] = defs["igGetMouseDragDelta"][1]["defaults"]
@@ -8425,18 +8531,18 @@ defs["igGetMouseDragDelta"][2]["namespace"] = "ImGui"
 defs["igGetMouseDragDelta"][2]["nonUDT"] = 1
 defs["igGetMouseDragDelta"][2]["ov_cimguiname"] = "igGetMouseDragDelta_nonUDT"
 defs["igGetMouseDragDelta"][2]["ret"] = "void"
-defs["igGetMouseDragDelta"][2]["signature"] = "(int,float)"
+defs["igGetMouseDragDelta"][2]["signature"] = "(ImGuiMouseButton,float)"
 defs["igGetMouseDragDelta"][2]["stname"] = ""
 defs["igGetMouseDragDelta"][3] = {}
-defs["igGetMouseDragDelta"][3]["args"] = "(int button,float lock_threshold)"
+defs["igGetMouseDragDelta"][3]["args"] = "(ImGuiMouseButton button,float lock_threshold)"
 defs["igGetMouseDragDelta"][3]["argsT"] = {}
 defs["igGetMouseDragDelta"][3]["argsT"][1] = {}
 defs["igGetMouseDragDelta"][3]["argsT"][1]["name"] = "button"
-defs["igGetMouseDragDelta"][3]["argsT"][1]["type"] = "int"
+defs["igGetMouseDragDelta"][3]["argsT"][1]["type"] = "ImGuiMouseButton"
 defs["igGetMouseDragDelta"][3]["argsT"][2] = {}
 defs["igGetMouseDragDelta"][3]["argsT"][2]["name"] = "lock_threshold"
 defs["igGetMouseDragDelta"][3]["argsT"][2]["type"] = "float"
-defs["igGetMouseDragDelta"][3]["argsoriginal"] = "(int button=0,float lock_threshold=-1.0f)"
+defs["igGetMouseDragDelta"][3]["argsoriginal"] = "(ImGuiMouseButton button=0,float lock_threshold=-1.0f)"
 defs["igGetMouseDragDelta"][3]["call_args"] = "(button,lock_threshold)"
 defs["igGetMouseDragDelta"][3]["cimguiname"] = "igGetMouseDragDelta"
 defs["igGetMouseDragDelta"][3]["defaults"] = defs["igGetMouseDragDelta"][1]["defaults"]
@@ -8446,11 +8552,11 @@ defs["igGetMouseDragDelta"][3]["nonUDT"] = 2
 defs["igGetMouseDragDelta"][3]["ov_cimguiname"] = "igGetMouseDragDelta_nonUDT2"
 defs["igGetMouseDragDelta"][3]["ret"] = "ImVec2_Simple"
 defs["igGetMouseDragDelta"][3]["retorig"] = "ImVec2"
-defs["igGetMouseDragDelta"][3]["signature"] = "(int,float)"
+defs["igGetMouseDragDelta"][3]["signature"] = "(ImGuiMouseButton,float)"
 defs["igGetMouseDragDelta"][3]["stname"] = ""
-defs["igGetMouseDragDelta"]["(int,float)"] = defs["igGetMouseDragDelta"][1]
-defs["igGetMouseDragDelta"]["(int,float)nonUDT"] = defs["igGetMouseDragDelta"][2]
-defs["igGetMouseDragDelta"]["(int,float)nonUDT2"] = defs["igGetMouseDragDelta"][3]
+defs["igGetMouseDragDelta"]["(ImGuiMouseButton,float)"] = defs["igGetMouseDragDelta"][1]
+defs["igGetMouseDragDelta"]["(ImGuiMouseButton,float)nonUDT"] = defs["igGetMouseDragDelta"][2]
+defs["igGetMouseDragDelta"]["(ImGuiMouseButton,float)nonUDT2"] = defs["igGetMouseDragDelta"][3]
 defs["igGetMousePos"] = {}
 defs["igGetMousePos"][1] = {}
 defs["igGetMousePos"][1]["args"] = "()"
@@ -9376,7 +9482,7 @@ defs["igInputInt4"][1]["stname"] = ""
 defs["igInputInt4"]["(const char*,int[4],ImGuiInputTextFlags)"] = defs["igInputInt4"][1]
 defs["igInputScalar"] = {}
 defs["igInputScalar"][1] = {}
-defs["igInputScalar"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)"
+defs["igInputScalar"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_step,const void* p_step_fast,const char* format,ImGuiInputTextFlags flags)"
 defs["igInputScalar"][1]["argsT"] = {}
 defs["igInputScalar"][1]["argsT"][1] = {}
 defs["igInputScalar"][1]["argsT"][1]["name"] = "label"
@@ -9385,13 +9491,13 @@ defs["igInputScalar"][1]["argsT"][2] = {}
 defs["igInputScalar"][1]["argsT"][2]["name"] = "data_type"
 defs["igInputScalar"][1]["argsT"][2]["type"] = "ImGuiDataType"
 defs["igInputScalar"][1]["argsT"][3] = {}
-defs["igInputScalar"][1]["argsT"][3]["name"] = "v"
+defs["igInputScalar"][1]["argsT"][3]["name"] = "p_data"
 defs["igInputScalar"][1]["argsT"][3]["type"] = "void*"
 defs["igInputScalar"][1]["argsT"][4] = {}
-defs["igInputScalar"][1]["argsT"][4]["name"] = "step"
+defs["igInputScalar"][1]["argsT"][4]["name"] = "p_step"
 defs["igInputScalar"][1]["argsT"][4]["type"] = "const void*"
 defs["igInputScalar"][1]["argsT"][5] = {}
-defs["igInputScalar"][1]["argsT"][5]["name"] = "step_fast"
+defs["igInputScalar"][1]["argsT"][5]["name"] = "p_step_fast"
 defs["igInputScalar"][1]["argsT"][5]["type"] = "const void*"
 defs["igInputScalar"][1]["argsT"][6] = {}
 defs["igInputScalar"][1]["argsT"][6]["name"] = "format"
@@ -9399,14 +9505,14 @@ defs["igInputScalar"][1]["argsT"][6]["type"] = "const char*"
 defs["igInputScalar"][1]["argsT"][7] = {}
 defs["igInputScalar"][1]["argsT"][7]["name"] = "flags"
 defs["igInputScalar"][1]["argsT"][7]["type"] = "ImGuiInputTextFlags"
-defs["igInputScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,const void* step=((void*)0),const void* step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)"
-defs["igInputScalar"][1]["call_args"] = "(label,data_type,v,step,step_fast,format,flags)"
+defs["igInputScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_step=((void*)0),const void* p_step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)"
+defs["igInputScalar"][1]["call_args"] = "(label,data_type,p_data,p_step,p_step_fast,format,flags)"
 defs["igInputScalar"][1]["cimguiname"] = "igInputScalar"
 defs["igInputScalar"][1]["defaults"] = {}
 defs["igInputScalar"][1]["defaults"]["flags"] = "0"
 defs["igInputScalar"][1]["defaults"]["format"] = "((void*)0)"
-defs["igInputScalar"][1]["defaults"]["step"] = "((void*)0)"
-defs["igInputScalar"][1]["defaults"]["step_fast"] = "((void*)0)"
+defs["igInputScalar"][1]["defaults"]["p_step"] = "((void*)0)"
+defs["igInputScalar"][1]["defaults"]["p_step_fast"] = "((void*)0)"
 defs["igInputScalar"][1]["funcname"] = "InputScalar"
 defs["igInputScalar"][1]["namespace"] = "ImGui"
 defs["igInputScalar"][1]["ov_cimguiname"] = "igInputScalar"
@@ -9416,7 +9522,7 @@ defs["igInputScalar"][1]["stname"] = ""
 defs["igInputScalar"]["(const char*,ImGuiDataType,void*,const void*,const void*,const char*,ImGuiInputTextFlags)"] = defs["igInputScalar"][1]
 defs["igInputScalarN"] = {}
 defs["igInputScalarN"][1] = {}
-defs["igInputScalarN"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)"
+defs["igInputScalarN"][1]["args"] = "(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)"
 defs["igInputScalarN"][1]["argsT"] = {}
 defs["igInputScalarN"][1]["argsT"][1] = {}
 defs["igInputScalarN"][1]["argsT"][1]["name"] = "label"
@@ -9425,16 +9531,16 @@ defs["igInputScalarN"][1]["argsT"][2] = {}
 defs["igInputScalarN"][1]["argsT"][2]["name"] = "data_type"
 defs["igInputScalarN"][1]["argsT"][2]["type"] = "ImGuiDataType"
 defs["igInputScalarN"][1]["argsT"][3] = {}
-defs["igInputScalarN"][1]["argsT"][3]["name"] = "v"
+defs["igInputScalarN"][1]["argsT"][3]["name"] = "p_data"
 defs["igInputScalarN"][1]["argsT"][3]["type"] = "void*"
 defs["igInputScalarN"][1]["argsT"][4] = {}
 defs["igInputScalarN"][1]["argsT"][4]["name"] = "components"
 defs["igInputScalarN"][1]["argsT"][4]["type"] = "int"
 defs["igInputScalarN"][1]["argsT"][5] = {}
-defs["igInputScalarN"][1]["argsT"][5]["name"] = "step"
+defs["igInputScalarN"][1]["argsT"][5]["name"] = "p_step"
 defs["igInputScalarN"][1]["argsT"][5]["type"] = "const void*"
 defs["igInputScalarN"][1]["argsT"][6] = {}
-defs["igInputScalarN"][1]["argsT"][6]["name"] = "step_fast"
+defs["igInputScalarN"][1]["argsT"][6]["name"] = "p_step_fast"
 defs["igInputScalarN"][1]["argsT"][6]["type"] = "const void*"
 defs["igInputScalarN"][1]["argsT"][7] = {}
 defs["igInputScalarN"][1]["argsT"][7]["name"] = "format"
@@ -9442,14 +9548,14 @@ defs["igInputScalarN"][1]["argsT"][7]["type"] = "const char*"
 defs["igInputScalarN"][1]["argsT"][8] = {}
 defs["igInputScalarN"][1]["argsT"][8]["name"] = "flags"
 defs["igInputScalarN"][1]["argsT"][8]["type"] = "ImGuiInputTextFlags"
-defs["igInputScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,int components,const void* step=((void*)0),const void* step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)"
-defs["igInputScalarN"][1]["call_args"] = "(label,data_type,v,components,step,step_fast,format,flags)"
+defs["igInputScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_step=((void*)0),const void* p_step_fast=((void*)0),const char* format=((void*)0),ImGuiInputTextFlags flags=0)"
+defs["igInputScalarN"][1]["call_args"] = "(label,data_type,p_data,components,p_step,p_step_fast,format,flags)"
 defs["igInputScalarN"][1]["cimguiname"] = "igInputScalarN"
 defs["igInputScalarN"][1]["defaults"] = {}
 defs["igInputScalarN"][1]["defaults"]["flags"] = "0"
 defs["igInputScalarN"][1]["defaults"]["format"] = "((void*)0)"
-defs["igInputScalarN"][1]["defaults"]["step"] = "((void*)0)"
-defs["igInputScalarN"][1]["defaults"]["step_fast"] = "((void*)0)"
+defs["igInputScalarN"][1]["defaults"]["p_step"] = "((void*)0)"
+defs["igInputScalarN"][1]["defaults"]["p_step_fast"] = "((void*)0)"
 defs["igInputScalarN"][1]["funcname"] = "InputScalarN"
 defs["igInputScalarN"][1]["namespace"] = "ImGui"
 defs["igInputScalarN"][1]["ov_cimguiname"] = "igInputScalarN"
@@ -9685,12 +9791,12 @@ defs["igIsItemActive"][1]["stname"] = ""
 defs["igIsItemActive"]["()"] = defs["igIsItemActive"][1]
 defs["igIsItemClicked"] = {}
 defs["igIsItemClicked"][1] = {}
-defs["igIsItemClicked"][1]["args"] = "(int mouse_button)"
+defs["igIsItemClicked"][1]["args"] = "(ImGuiMouseButton mouse_button)"
 defs["igIsItemClicked"][1]["argsT"] = {}
 defs["igIsItemClicked"][1]["argsT"][1] = {}
 defs["igIsItemClicked"][1]["argsT"][1]["name"] = "mouse_button"
-defs["igIsItemClicked"][1]["argsT"][1]["type"] = "int"
-defs["igIsItemClicked"][1]["argsoriginal"] = "(int mouse_button=0)"
+defs["igIsItemClicked"][1]["argsT"][1]["type"] = "ImGuiMouseButton"
+defs["igIsItemClicked"][1]["argsoriginal"] = "(ImGuiMouseButton mouse_button=0)"
 defs["igIsItemClicked"][1]["call_args"] = "(mouse_button)"
 defs["igIsItemClicked"][1]["cimguiname"] = "igIsItemClicked"
 defs["igIsItemClicked"][1]["defaults"] = {}
@@ -9699,9 +9805,9 @@ defs["igIsItemClicked"][1]["funcname"] = "IsItemClicked"
 defs["igIsItemClicked"][1]["namespace"] = "ImGui"
 defs["igIsItemClicked"][1]["ov_cimguiname"] = "igIsItemClicked"
 defs["igIsItemClicked"][1]["ret"] = "bool"
-defs["igIsItemClicked"][1]["signature"] = "(int)"
+defs["igIsItemClicked"][1]["signature"] = "(ImGuiMouseButton)"
 defs["igIsItemClicked"][1]["stname"] = ""
-defs["igIsItemClicked"]["(int)"] = defs["igIsItemClicked"][1]
+defs["igIsItemClicked"]["(ImGuiMouseButton)"] = defs["igIsItemClicked"][1]
 defs["igIsItemDeactivated"] = {}
 defs["igIsItemDeactivated"][1] = {}
 defs["igIsItemDeactivated"][1]["args"] = "()"
@@ -9781,6 +9887,21 @@ defs["igIsItemHovered"][1]["ret"] = "bool"
 defs["igIsItemHovered"][1]["signature"] = "(ImGuiHoveredFlags)"
 defs["igIsItemHovered"][1]["stname"] = ""
 defs["igIsItemHovered"]["(ImGuiHoveredFlags)"] = defs["igIsItemHovered"][1]
+defs["igIsItemToggledOpen"] = {}
+defs["igIsItemToggledOpen"][1] = {}
+defs["igIsItemToggledOpen"][1]["args"] = "()"
+defs["igIsItemToggledOpen"][1]["argsT"] = {}
+defs["igIsItemToggledOpen"][1]["argsoriginal"] = "()"
+defs["igIsItemToggledOpen"][1]["call_args"] = "()"
+defs["igIsItemToggledOpen"][1]["cimguiname"] = "igIsItemToggledOpen"
+defs["igIsItemToggledOpen"][1]["defaults"] = {}
+defs["igIsItemToggledOpen"][1]["funcname"] = "IsItemToggledOpen"
+defs["igIsItemToggledOpen"][1]["namespace"] = "ImGui"
+defs["igIsItemToggledOpen"][1]["ov_cimguiname"] = "igIsItemToggledOpen"
+defs["igIsItemToggledOpen"][1]["ret"] = "bool"
+defs["igIsItemToggledOpen"][1]["signature"] = "()"
+defs["igIsItemToggledOpen"][1]["stname"] = ""
+defs["igIsItemToggledOpen"]["()"] = defs["igIsItemToggledOpen"][1]
 defs["igIsItemVisible"] = {}
 defs["igIsItemVisible"][1] = {}
 defs["igIsItemVisible"][1]["args"] = "()"
@@ -9856,15 +9977,15 @@ defs["igIsKeyReleased"][1]["stname"] = ""
 defs["igIsKeyReleased"]["(int)"] = defs["igIsKeyReleased"][1]
 defs["igIsMouseClicked"] = {}
 defs["igIsMouseClicked"][1] = {}
-defs["igIsMouseClicked"][1]["args"] = "(int button,bool repeat)"
+defs["igIsMouseClicked"][1]["args"] = "(ImGuiMouseButton button,bool repeat)"
 defs["igIsMouseClicked"][1]["argsT"] = {}
 defs["igIsMouseClicked"][1]["argsT"][1] = {}
 defs["igIsMouseClicked"][1]["argsT"][1]["name"] = "button"
-defs["igIsMouseClicked"][1]["argsT"][1]["type"] = "int"
+defs["igIsMouseClicked"][1]["argsT"][1]["type"] = "ImGuiMouseButton"
 defs["igIsMouseClicked"][1]["argsT"][2] = {}
 defs["igIsMouseClicked"][1]["argsT"][2]["name"] = "repeat"
 defs["igIsMouseClicked"][1]["argsT"][2]["type"] = "bool"
-defs["igIsMouseClicked"][1]["argsoriginal"] = "(int button,bool repeat=false)"
+defs["igIsMouseClicked"][1]["argsoriginal"] = "(ImGuiMouseButton button,bool repeat=false)"
 defs["igIsMouseClicked"][1]["call_args"] = "(button,repeat)"
 defs["igIsMouseClicked"][1]["cimguiname"] = "igIsMouseClicked"
 defs["igIsMouseClicked"][1]["defaults"] = {}
@@ -9873,17 +9994,17 @@ defs["igIsMouseClicked"][1]["funcname"] = "IsMouseClicked"
 defs["igIsMouseClicked"][1]["namespace"] = "ImGui"
 defs["igIsMouseClicked"][1]["ov_cimguiname"] = "igIsMouseClicked"
 defs["igIsMouseClicked"][1]["ret"] = "bool"
-defs["igIsMouseClicked"][1]["signature"] = "(int,bool)"
+defs["igIsMouseClicked"][1]["signature"] = "(ImGuiMouseButton,bool)"
 defs["igIsMouseClicked"][1]["stname"] = ""
-defs["igIsMouseClicked"]["(int,bool)"] = defs["igIsMouseClicked"][1]
+defs["igIsMouseClicked"]["(ImGuiMouseButton,bool)"] = defs["igIsMouseClicked"][1]
 defs["igIsMouseDoubleClicked"] = {}
 defs["igIsMouseDoubleClicked"][1] = {}
-defs["igIsMouseDoubleClicked"][1]["args"] = "(int button)"
+defs["igIsMouseDoubleClicked"][1]["args"] = "(ImGuiMouseButton button)"
 defs["igIsMouseDoubleClicked"][1]["argsT"] = {}
 defs["igIsMouseDoubleClicked"][1]["argsT"][1] = {}
 defs["igIsMouseDoubleClicked"][1]["argsT"][1]["name"] = "button"
-defs["igIsMouseDoubleClicked"][1]["argsT"][1]["type"] = "int"
-defs["igIsMouseDoubleClicked"][1]["argsoriginal"] = "(int button)"
+defs["igIsMouseDoubleClicked"][1]["argsT"][1]["type"] = "ImGuiMouseButton"
+defs["igIsMouseDoubleClicked"][1]["argsoriginal"] = "(ImGuiMouseButton button)"
 defs["igIsMouseDoubleClicked"][1]["call_args"] = "(button)"
 defs["igIsMouseDoubleClicked"][1]["cimguiname"] = "igIsMouseDoubleClicked"
 defs["igIsMouseDoubleClicked"][1]["defaults"] = {}
@@ -9891,17 +10012,17 @@ defs["igIsMouseDoubleClicked"][1]["funcname"] = "IsMouseDoubleClicked"
 defs["igIsMouseDoubleClicked"][1]["namespace"] = "ImGui"
 defs["igIsMouseDoubleClicked"][1]["ov_cimguiname"] = "igIsMouseDoubleClicked"
 defs["igIsMouseDoubleClicked"][1]["ret"] = "bool"
-defs["igIsMouseDoubleClicked"][1]["signature"] = "(int)"
+defs["igIsMouseDoubleClicked"][1]["signature"] = "(ImGuiMouseButton)"
 defs["igIsMouseDoubleClicked"][1]["stname"] = ""
-defs["igIsMouseDoubleClicked"]["(int)"] = defs["igIsMouseDoubleClicked"][1]
+defs["igIsMouseDoubleClicked"]["(ImGuiMouseButton)"] = defs["igIsMouseDoubleClicked"][1]
 defs["igIsMouseDown"] = {}
 defs["igIsMouseDown"][1] = {}
-defs["igIsMouseDown"][1]["args"] = "(int button)"
+defs["igIsMouseDown"][1]["args"] = "(ImGuiMouseButton button)"
 defs["igIsMouseDown"][1]["argsT"] = {}
 defs["igIsMouseDown"][1]["argsT"][1] = {}
 defs["igIsMouseDown"][1]["argsT"][1]["name"] = "button"
-defs["igIsMouseDown"][1]["argsT"][1]["type"] = "int"
-defs["igIsMouseDown"][1]["argsoriginal"] = "(int button)"
+defs["igIsMouseDown"][1]["argsT"][1]["type"] = "ImGuiMouseButton"
+defs["igIsMouseDown"][1]["argsoriginal"] = "(ImGuiMouseButton button)"
 defs["igIsMouseDown"][1]["call_args"] = "(button)"
 defs["igIsMouseDown"][1]["cimguiname"] = "igIsMouseDown"
 defs["igIsMouseDown"][1]["defaults"] = {}
@@ -9909,32 +10030,31 @@ defs["igIsMouseDown"][1]["funcname"] = "IsMouseDown"
 defs["igIsMouseDown"][1]["namespace"] = "ImGui"
 defs["igIsMouseDown"][1]["ov_cimguiname"] = "igIsMouseDown"
 defs["igIsMouseDown"][1]["ret"] = "bool"
-defs["igIsMouseDown"][1]["signature"] = "(int)"
+defs["igIsMouseDown"][1]["signature"] = "(ImGuiMouseButton)"
 defs["igIsMouseDown"][1]["stname"] = ""
-defs["igIsMouseDown"]["(int)"] = defs["igIsMouseDown"][1]
+defs["igIsMouseDown"]["(ImGuiMouseButton)"] = defs["igIsMouseDown"][1]
 defs["igIsMouseDragging"] = {}
 defs["igIsMouseDragging"][1] = {}
-defs["igIsMouseDragging"][1]["args"] = "(int button,float lock_threshold)"
+defs["igIsMouseDragging"][1]["args"] = "(ImGuiMouseButton button,float lock_threshold)"
 defs["igIsMouseDragging"][1]["argsT"] = {}
 defs["igIsMouseDragging"][1]["argsT"][1] = {}
 defs["igIsMouseDragging"][1]["argsT"][1]["name"] = "button"
-defs["igIsMouseDragging"][1]["argsT"][1]["type"] = "int"
+defs["igIsMouseDragging"][1]["argsT"][1]["type"] = "ImGuiMouseButton"
 defs["igIsMouseDragging"][1]["argsT"][2] = {}
 defs["igIsMouseDragging"][1]["argsT"][2]["name"] = "lock_threshold"
 defs["igIsMouseDragging"][1]["argsT"][2]["type"] = "float"
-defs["igIsMouseDragging"][1]["argsoriginal"] = "(int button=0,float lock_threshold=-1.0f)"
+defs["igIsMouseDragging"][1]["argsoriginal"] = "(ImGuiMouseButton button,float lock_threshold=-1.0f)"
 defs["igIsMouseDragging"][1]["call_args"] = "(button,lock_threshold)"
 defs["igIsMouseDragging"][1]["cimguiname"] = "igIsMouseDragging"
 defs["igIsMouseDragging"][1]["defaults"] = {}
-defs["igIsMouseDragging"][1]["defaults"]["button"] = "0"
 defs["igIsMouseDragging"][1]["defaults"]["lock_threshold"] = "-1.0f"
 defs["igIsMouseDragging"][1]["funcname"] = "IsMouseDragging"
 defs["igIsMouseDragging"][1]["namespace"] = "ImGui"
 defs["igIsMouseDragging"][1]["ov_cimguiname"] = "igIsMouseDragging"
 defs["igIsMouseDragging"][1]["ret"] = "bool"
-defs["igIsMouseDragging"][1]["signature"] = "(int,float)"
+defs["igIsMouseDragging"][1]["signature"] = "(ImGuiMouseButton,float)"
 defs["igIsMouseDragging"][1]["stname"] = ""
-defs["igIsMouseDragging"]["(int,float)"] = defs["igIsMouseDragging"][1]
+defs["igIsMouseDragging"]["(ImGuiMouseButton,float)"] = defs["igIsMouseDragging"][1]
 defs["igIsMouseHoveringRect"] = {}
 defs["igIsMouseHoveringRect"][1] = {}
 defs["igIsMouseHoveringRect"][1]["args"] = "(const ImVec2 r_min,const ImVec2 r_max,bool clip)"
@@ -9981,12 +10101,12 @@ defs["igIsMousePosValid"][1]["stname"] = ""
 defs["igIsMousePosValid"]["(const ImVec2*)"] = defs["igIsMousePosValid"][1]
 defs["igIsMouseReleased"] = {}
 defs["igIsMouseReleased"][1] = {}
-defs["igIsMouseReleased"][1]["args"] = "(int button)"
+defs["igIsMouseReleased"][1]["args"] = "(ImGuiMouseButton button)"
 defs["igIsMouseReleased"][1]["argsT"] = {}
 defs["igIsMouseReleased"][1]["argsT"][1] = {}
 defs["igIsMouseReleased"][1]["argsT"][1]["name"] = "button"
-defs["igIsMouseReleased"][1]["argsT"][1]["type"] = "int"
-defs["igIsMouseReleased"][1]["argsoriginal"] = "(int button)"
+defs["igIsMouseReleased"][1]["argsT"][1]["type"] = "ImGuiMouseButton"
+defs["igIsMouseReleased"][1]["argsoriginal"] = "(ImGuiMouseButton button)"
 defs["igIsMouseReleased"][1]["call_args"] = "(button)"
 defs["igIsMouseReleased"][1]["cimguiname"] = "igIsMouseReleased"
 defs["igIsMouseReleased"][1]["defaults"] = {}
@@ -9994,9 +10114,9 @@ defs["igIsMouseReleased"][1]["funcname"] = "IsMouseReleased"
 defs["igIsMouseReleased"][1]["namespace"] = "ImGui"
 defs["igIsMouseReleased"][1]["ov_cimguiname"] = "igIsMouseReleased"
 defs["igIsMouseReleased"][1]["ret"] = "bool"
-defs["igIsMouseReleased"][1]["signature"] = "(int)"
+defs["igIsMouseReleased"][1]["signature"] = "(ImGuiMouseButton)"
 defs["igIsMouseReleased"][1]["stname"] = ""
-defs["igIsMouseReleased"]["(int)"] = defs["igIsMouseReleased"][1]
+defs["igIsMouseReleased"]["(ImGuiMouseButton)"] = defs["igIsMouseReleased"][1]
 defs["igIsPopupOpen"] = {}
 defs["igIsPopupOpen"][1] = {}
 defs["igIsPopupOpen"][1]["args"] = "(const char* str_id)"
@@ -10609,15 +10729,15 @@ defs["igOpenPopup"][1]["stname"] = ""
 defs["igOpenPopup"]["(const char*)"] = defs["igOpenPopup"][1]
 defs["igOpenPopupOnItemClick"] = {}
 defs["igOpenPopupOnItemClick"][1] = {}
-defs["igOpenPopupOnItemClick"][1]["args"] = "(const char* str_id,int mouse_button)"
+defs["igOpenPopupOnItemClick"][1]["args"] = "(const char* str_id,ImGuiMouseButton mouse_button)"
 defs["igOpenPopupOnItemClick"][1]["argsT"] = {}
 defs["igOpenPopupOnItemClick"][1]["argsT"][1] = {}
 defs["igOpenPopupOnItemClick"][1]["argsT"][1]["name"] = "str_id"
 defs["igOpenPopupOnItemClick"][1]["argsT"][1]["type"] = "const char*"
 defs["igOpenPopupOnItemClick"][1]["argsT"][2] = {}
 defs["igOpenPopupOnItemClick"][1]["argsT"][2]["name"] = "mouse_button"
-defs["igOpenPopupOnItemClick"][1]["argsT"][2]["type"] = "int"
-defs["igOpenPopupOnItemClick"][1]["argsoriginal"] = "(const char* str_id=((void*)0),int mouse_button=1)"
+defs["igOpenPopupOnItemClick"][1]["argsT"][2]["type"] = "ImGuiMouseButton"
+defs["igOpenPopupOnItemClick"][1]["argsoriginal"] = "(const char* str_id=((void*)0),ImGuiMouseButton mouse_button=1)"
 defs["igOpenPopupOnItemClick"][1]["call_args"] = "(str_id,mouse_button)"
 defs["igOpenPopupOnItemClick"][1]["cimguiname"] = "igOpenPopupOnItemClick"
 defs["igOpenPopupOnItemClick"][1]["defaults"] = {}
@@ -10627,9 +10747,9 @@ defs["igOpenPopupOnItemClick"][1]["funcname"] = "OpenPopupOnItemClick"
 defs["igOpenPopupOnItemClick"][1]["namespace"] = "ImGui"
 defs["igOpenPopupOnItemClick"][1]["ov_cimguiname"] = "igOpenPopupOnItemClick"
 defs["igOpenPopupOnItemClick"][1]["ret"] = "bool"
-defs["igOpenPopupOnItemClick"][1]["signature"] = "(const char*,int)"
+defs["igOpenPopupOnItemClick"][1]["signature"] = "(const char*,ImGuiMouseButton)"
 defs["igOpenPopupOnItemClick"][1]["stname"] = ""
-defs["igOpenPopupOnItemClick"]["(const char*,int)"] = defs["igOpenPopupOnItemClick"][1]
+defs["igOpenPopupOnItemClick"]["(const char*,ImGuiMouseButton)"] = defs["igOpenPopupOnItemClick"][1]
 defs["igPlotHistogram"] = {}
 defs["igPlotHistogram"][1] = {}
 defs["igPlotHistogram"][1]["args"] = "(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride)"
@@ -10661,7 +10781,7 @@ defs["igPlotHistogram"][1]["argsT"][8]["type"] = "ImVec2"
 defs["igPlotHistogram"][1]["argsT"][9] = {}
 defs["igPlotHistogram"][1]["argsT"][9]["name"] = "stride"
 defs["igPlotHistogram"][1]["argsT"][9]["type"] = "int"
-defs["igPlotHistogram"][1]["argsoriginal"] = "(const char* label,const float* values,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859812e+38F,float scale_max=3.40282346638528859812e+38F,ImVec2 graph_size=ImVec2(0,0),int stride=sizeof(float))"
+defs["igPlotHistogram"][1]["argsoriginal"] = "(const char* label,const float* values,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859811704183484516925e+38F,float scale_max=3.40282346638528859811704183484516925e+38F,ImVec2 graph_size=ImVec2(0,0),int stride=sizeof(float))"
 defs["igPlotHistogram"][1]["call_args"] = "(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride)"
 defs["igPlotHistogram"][1]["cimguiname"] = "igPlotHistogram"
 defs["igPlotHistogram"][1]["defaults"] = {}
@@ -10709,7 +10829,7 @@ defs["igPlotHistogram"][2]["argsT"][8]["type"] = "float"
 defs["igPlotHistogram"][2]["argsT"][9] = {}
 defs["igPlotHistogram"][2]["argsT"][9]["name"] = "graph_size"
 defs["igPlotHistogram"][2]["argsT"][9]["type"] = "ImVec2"
-defs["igPlotHistogram"][2]["argsoriginal"] = "(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859812e+38F,float scale_max=3.40282346638528859812e+38F,ImVec2 graph_size=ImVec2(0,0))"
+defs["igPlotHistogram"][2]["argsoriginal"] = "(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859811704183484516925e+38F,float scale_max=3.40282346638528859811704183484516925e+38F,ImVec2 graph_size=ImVec2(0,0))"
 defs["igPlotHistogram"][2]["call_args"] = "(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size)"
 defs["igPlotHistogram"][2]["cimguiname"] = "igPlotHistogram"
 defs["igPlotHistogram"][2]["defaults"] = {}
@@ -10757,7 +10877,7 @@ defs["igPlotLines"][1]["argsT"][8]["type"] = "ImVec2"
 defs["igPlotLines"][1]["argsT"][9] = {}
 defs["igPlotLines"][1]["argsT"][9]["name"] = "stride"
 defs["igPlotLines"][1]["argsT"][9]["type"] = "int"
-defs["igPlotLines"][1]["argsoriginal"] = "(const char* label,const float* values,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859812e+38F,float scale_max=3.40282346638528859812e+38F,ImVec2 graph_size=ImVec2(0,0),int stride=sizeof(float))"
+defs["igPlotLines"][1]["argsoriginal"] = "(const char* label,const float* values,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859811704183484516925e+38F,float scale_max=3.40282346638528859811704183484516925e+38F,ImVec2 graph_size=ImVec2(0,0),int stride=sizeof(float))"
 defs["igPlotLines"][1]["call_args"] = "(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride)"
 defs["igPlotLines"][1]["cimguiname"] = "igPlotLines"
 defs["igPlotLines"][1]["defaults"] = {}
@@ -10805,7 +10925,7 @@ defs["igPlotLines"][2]["argsT"][8]["type"] = "float"
 defs["igPlotLines"][2]["argsT"][9] = {}
 defs["igPlotLines"][2]["argsT"][9]["name"] = "graph_size"
 defs["igPlotLines"][2]["argsT"][9]["type"] = "ImVec2"
-defs["igPlotLines"][2]["argsoriginal"] = "(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859812e+38F,float scale_max=3.40282346638528859812e+38F,ImVec2 graph_size=ImVec2(0,0))"
+defs["igPlotLines"][2]["argsoriginal"] = "(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859811704183484516925e+38F,float scale_max=3.40282346638528859811704183484516925e+38F,ImVec2 graph_size=ImVec2(0,0))"
 defs["igPlotLines"][2]["call_args"] = "(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size)"
 defs["igPlotLines"][2]["cimguiname"] = "igPlotLines"
 defs["igPlotLines"][2]["defaults"] = {}
@@ -11321,12 +11441,12 @@ defs["igRender"][1]["stname"] = ""
 defs["igRender"]["()"] = defs["igRender"][1]
 defs["igResetMouseDragDelta"] = {}
 defs["igResetMouseDragDelta"][1] = {}
-defs["igResetMouseDragDelta"][1]["args"] = "(int button)"
+defs["igResetMouseDragDelta"][1]["args"] = "(ImGuiMouseButton button)"
 defs["igResetMouseDragDelta"][1]["argsT"] = {}
 defs["igResetMouseDragDelta"][1]["argsT"][1] = {}
 defs["igResetMouseDragDelta"][1]["argsT"][1]["name"] = "button"
-defs["igResetMouseDragDelta"][1]["argsT"][1]["type"] = "int"
-defs["igResetMouseDragDelta"][1]["argsoriginal"] = "(int button=0)"
+defs["igResetMouseDragDelta"][1]["argsT"][1]["type"] = "ImGuiMouseButton"
+defs["igResetMouseDragDelta"][1]["argsoriginal"] = "(ImGuiMouseButton button=0)"
 defs["igResetMouseDragDelta"][1]["call_args"] = "(button)"
 defs["igResetMouseDragDelta"][1]["cimguiname"] = "igResetMouseDragDelta"
 defs["igResetMouseDragDelta"][1]["defaults"] = {}
@@ -11335,9 +11455,9 @@ defs["igResetMouseDragDelta"][1]["funcname"] = "ResetMouseDragDelta"
 defs["igResetMouseDragDelta"][1]["namespace"] = "ImGui"
 defs["igResetMouseDragDelta"][1]["ov_cimguiname"] = "igResetMouseDragDelta"
 defs["igResetMouseDragDelta"][1]["ret"] = "void"
-defs["igResetMouseDragDelta"][1]["signature"] = "(int)"
+defs["igResetMouseDragDelta"][1]["signature"] = "(ImGuiMouseButton)"
 defs["igResetMouseDragDelta"][1]["stname"] = ""
-defs["igResetMouseDragDelta"]["(int)"] = defs["igResetMouseDragDelta"][1]
+defs["igResetMouseDragDelta"]["(ImGuiMouseButton)"] = defs["igResetMouseDragDelta"][1]
 defs["igSameLine"] = {}
 defs["igSameLine"][1] = {}
 defs["igSameLine"][1]["args"] = "(float offset_from_start_x,float spacing)"
@@ -11747,13 +11867,13 @@ defs["igSetKeyboardFocusHere"][1]["stname"] = ""
 defs["igSetKeyboardFocusHere"]["(int)"] = defs["igSetKeyboardFocusHere"][1]
 defs["igSetMouseCursor"] = {}
 defs["igSetMouseCursor"][1] = {}
-defs["igSetMouseCursor"][1]["args"] = "(ImGuiMouseCursor type)"
+defs["igSetMouseCursor"][1]["args"] = "(ImGuiMouseCursor cursor_type)"
 defs["igSetMouseCursor"][1]["argsT"] = {}
 defs["igSetMouseCursor"][1]["argsT"][1] = {}
-defs["igSetMouseCursor"][1]["argsT"][1]["name"] = "type"
+defs["igSetMouseCursor"][1]["argsT"][1]["name"] = "cursor_type"
 defs["igSetMouseCursor"][1]["argsT"][1]["type"] = "ImGuiMouseCursor"
-defs["igSetMouseCursor"][1]["argsoriginal"] = "(ImGuiMouseCursor type)"
-defs["igSetMouseCursor"][1]["call_args"] = "(type)"
+defs["igSetMouseCursor"][1]["argsoriginal"] = "(ImGuiMouseCursor cursor_type)"
+defs["igSetMouseCursor"][1]["call_args"] = "(cursor_type)"
 defs["igSetMouseCursor"][1]["cimguiname"] = "igSetMouseCursor"
 defs["igSetMouseCursor"][1]["defaults"] = {}
 defs["igSetMouseCursor"][1]["funcname"] = "SetMouseCursor"
@@ -12764,7 +12884,7 @@ defs["igSliderInt4"][1]["stname"] = ""
 defs["igSliderInt4"]["(const char*,int[4],int,int,const char*)"] = defs["igSliderInt4"][1]
 defs["igSliderScalar"] = {}
 defs["igSliderScalar"][1] = {}
-defs["igSliderScalar"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)"
+defs["igSliderScalar"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format,float power)"
 defs["igSliderScalar"][1]["argsT"] = {}
 defs["igSliderScalar"][1]["argsT"][1] = {}
 defs["igSliderScalar"][1]["argsT"][1]["name"] = "label"
@@ -12773,13 +12893,13 @@ defs["igSliderScalar"][1]["argsT"][2] = {}
 defs["igSliderScalar"][1]["argsT"][2]["name"] = "data_type"
 defs["igSliderScalar"][1]["argsT"][2]["type"] = "ImGuiDataType"
 defs["igSliderScalar"][1]["argsT"][3] = {}
-defs["igSliderScalar"][1]["argsT"][3]["name"] = "v"
+defs["igSliderScalar"][1]["argsT"][3]["name"] = "p_data"
 defs["igSliderScalar"][1]["argsT"][3]["type"] = "void*"
 defs["igSliderScalar"][1]["argsT"][4] = {}
-defs["igSliderScalar"][1]["argsT"][4]["name"] = "v_min"
+defs["igSliderScalar"][1]["argsT"][4]["name"] = "p_min"
 defs["igSliderScalar"][1]["argsT"][4]["type"] = "const void*"
 defs["igSliderScalar"][1]["argsT"][5] = {}
-defs["igSliderScalar"][1]["argsT"][5]["name"] = "v_max"
+defs["igSliderScalar"][1]["argsT"][5]["name"] = "p_max"
 defs["igSliderScalar"][1]["argsT"][5]["type"] = "const void*"
 defs["igSliderScalar"][1]["argsT"][6] = {}
 defs["igSliderScalar"][1]["argsT"][6]["name"] = "format"
@@ -12787,8 +12907,8 @@ defs["igSliderScalar"][1]["argsT"][6]["type"] = "const char*"
 defs["igSliderScalar"][1]["argsT"][7] = {}
 defs["igSliderScalar"][1]["argsT"][7]["name"] = "power"
 defs["igSliderScalar"][1]["argsT"][7]["type"] = "float"
-defs["igSliderScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format=((void*)0),float power=1.0f)"
-defs["igSliderScalar"][1]["call_args"] = "(label,data_type,v,v_min,v_max,format,power)"
+defs["igSliderScalar"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format=((void*)0),float power=1.0f)"
+defs["igSliderScalar"][1]["call_args"] = "(label,data_type,p_data,p_min,p_max,format,power)"
 defs["igSliderScalar"][1]["cimguiname"] = "igSliderScalar"
 defs["igSliderScalar"][1]["defaults"] = {}
 defs["igSliderScalar"][1]["defaults"]["format"] = "((void*)0)"
@@ -12802,7 +12922,7 @@ defs["igSliderScalar"][1]["stname"] = ""
 defs["igSliderScalar"]["(const char*,ImGuiDataType,void*,const void*,const void*,const char*,float)"] = defs["igSliderScalar"][1]
 defs["igSliderScalarN"] = {}
 defs["igSliderScalarN"][1] = {}
-defs["igSliderScalarN"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* v,int components,const void* v_min,const void* v_max,const char* format,float power)"
+defs["igSliderScalarN"][1]["args"] = "(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_min,const void* p_max,const char* format,float power)"
 defs["igSliderScalarN"][1]["argsT"] = {}
 defs["igSliderScalarN"][1]["argsT"][1] = {}
 defs["igSliderScalarN"][1]["argsT"][1]["name"] = "label"
@@ -12811,16 +12931,16 @@ defs["igSliderScalarN"][1]["argsT"][2] = {}
 defs["igSliderScalarN"][1]["argsT"][2]["name"] = "data_type"
 defs["igSliderScalarN"][1]["argsT"][2]["type"] = "ImGuiDataType"
 defs["igSliderScalarN"][1]["argsT"][3] = {}
-defs["igSliderScalarN"][1]["argsT"][3]["name"] = "v"
+defs["igSliderScalarN"][1]["argsT"][3]["name"] = "p_data"
 defs["igSliderScalarN"][1]["argsT"][3]["type"] = "void*"
 defs["igSliderScalarN"][1]["argsT"][4] = {}
 defs["igSliderScalarN"][1]["argsT"][4]["name"] = "components"
 defs["igSliderScalarN"][1]["argsT"][4]["type"] = "int"
 defs["igSliderScalarN"][1]["argsT"][5] = {}
-defs["igSliderScalarN"][1]["argsT"][5]["name"] = "v_min"
+defs["igSliderScalarN"][1]["argsT"][5]["name"] = "p_min"
 defs["igSliderScalarN"][1]["argsT"][5]["type"] = "const void*"
 defs["igSliderScalarN"][1]["argsT"][6] = {}
-defs["igSliderScalarN"][1]["argsT"][6]["name"] = "v_max"
+defs["igSliderScalarN"][1]["argsT"][6]["name"] = "p_max"
 defs["igSliderScalarN"][1]["argsT"][6]["type"] = "const void*"
 defs["igSliderScalarN"][1]["argsT"][7] = {}
 defs["igSliderScalarN"][1]["argsT"][7]["name"] = "format"
@@ -12828,8 +12948,8 @@ defs["igSliderScalarN"][1]["argsT"][7]["type"] = "const char*"
 defs["igSliderScalarN"][1]["argsT"][8] = {}
 defs["igSliderScalarN"][1]["argsT"][8]["name"] = "power"
 defs["igSliderScalarN"][1]["argsT"][8]["type"] = "float"
-defs["igSliderScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* v,int components,const void* v_min,const void* v_max,const char* format=((void*)0),float power=1.0f)"
-defs["igSliderScalarN"][1]["call_args"] = "(label,data_type,v,components,v_min,v_max,format,power)"
+defs["igSliderScalarN"][1]["argsoriginal"] = "(const char* label,ImGuiDataType data_type,void* p_data,int components,const void* p_min,const void* p_max,const char* format=((void*)0),float power=1.0f)"
+defs["igSliderScalarN"][1]["call_args"] = "(label,data_type,p_data,components,p_min,p_max,format,power)"
 defs["igSliderScalarN"][1]["cimguiname"] = "igSliderScalarN"
 defs["igSliderScalarN"][1]["defaults"] = {}
 defs["igSliderScalarN"][1]["defaults"]["format"] = "((void*)0)"
@@ -13517,7 +13637,7 @@ defs["igVSliderInt"][1]["stname"] = ""
 defs["igVSliderInt"]["(const char*,const ImVec2,int*,int,int,const char*)"] = defs["igVSliderInt"][1]
 defs["igVSliderScalar"] = {}
 defs["igVSliderScalar"][1] = {}
-defs["igVSliderScalar"][1]["args"] = "(const char* label,const ImVec2 size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power)"
+defs["igVSliderScalar"][1]["args"] = "(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)"
 defs["igVSliderScalar"][1]["argsT"] = {}
 defs["igVSliderScalar"][1]["argsT"][1] = {}
 defs["igVSliderScalar"][1]["argsT"][1]["name"] = "label"
@@ -13529,13 +13649,13 @@ defs["igVSliderScalar"][1]["argsT"][3] = {}
 defs["igVSliderScalar"][1]["argsT"][3]["name"] = "data_type"
 defs["igVSliderScalar"][1]["argsT"][3]["type"] = "ImGuiDataType"
 defs["igVSliderScalar"][1]["argsT"][4] = {}
-defs["igVSliderScalar"][1]["argsT"][4]["name"] = "v"
+defs["igVSliderScalar"][1]["argsT"][4]["name"] = "p_data"
 defs["igVSliderScalar"][1]["argsT"][4]["type"] = "void*"
 defs["igVSliderScalar"][1]["argsT"][5] = {}
-defs["igVSliderScalar"][1]["argsT"][5]["name"] = "v_min"
+defs["igVSliderScalar"][1]["argsT"][5]["name"] = "p_min"
 defs["igVSliderScalar"][1]["argsT"][5]["type"] = "const void*"
 defs["igVSliderScalar"][1]["argsT"][6] = {}
-defs["igVSliderScalar"][1]["argsT"][6]["name"] = "v_max"
+defs["igVSliderScalar"][1]["argsT"][6]["name"] = "p_max"
 defs["igVSliderScalar"][1]["argsT"][6]["type"] = "const void*"
 defs["igVSliderScalar"][1]["argsT"][7] = {}
 defs["igVSliderScalar"][1]["argsT"][7]["name"] = "format"
@@ -13543,8 +13663,8 @@ defs["igVSliderScalar"][1]["argsT"][7]["type"] = "const char*"
 defs["igVSliderScalar"][1]["argsT"][8] = {}
 defs["igVSliderScalar"][1]["argsT"][8]["name"] = "power"
 defs["igVSliderScalar"][1]["argsT"][8]["type"] = "float"
-defs["igVSliderScalar"][1]["argsoriginal"] = "(const char* label,const ImVec2& size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format=((void*)0),float power=1.0f)"
-defs["igVSliderScalar"][1]["call_args"] = "(label,size,data_type,v,v_min,v_max,format,power)"
+defs["igVSliderScalar"][1]["argsoriginal"] = "(const char* label,const ImVec2& size,ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max,const char* format=((void*)0),float power=1.0f)"
+defs["igVSliderScalar"][1]["call_args"] = "(label,size,data_type,p_data,p_min,p_max,format,power)"
 defs["igVSliderScalar"][1]["cimguiname"] = "igVSliderScalar"
 defs["igVSliderScalar"][1]["defaults"] = {}
 defs["igVSliderScalar"][1]["defaults"]["format"] = "((void*)0)"
--- a/generator/output/overloads.txt
+++ b/generator/output/overloads.txt
@@ -67,6 +67,9 @@ igSetWindowFocus	2
 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)
@@ -76,9 +79,9 @@ igSetWindowCollapsed	2
 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)
-igListBoxHeader	2
-1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
-2	bool	igListBoxHeaderInt (const char*,int,int)
+igPushStyleColor	2
+1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
+2	void	igPushStyleColor (ImGuiCol,const ImVec4)
 igTreeNodeExV	2
 1	bool	igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list)
 2	bool	igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list)
@@ -104,31 +107,28 @@ ImColor_ImColor	5
 3	nil	ImColor_ImColorU32 (ImU32)
 4	nil	ImColor_ImColorFloat (float,float,float,float)
 5	nil	ImColor_ImColorVec4 (const ImVec4)
-ImVector_front	2
-1	T*	ImVector_front ()
-2	const T*	ImVector_front_const ()const
+igSelectable	2
+1	bool	igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2)
+2	bool	igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
 ImVector_begin	2
 1	T*	ImVector_begin ()
 2	const T*	ImVector_begin_const ()const
-igPushStyleColor	2
-1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
-2	void	igPushStyleColor (ImGuiCol,const ImVec4)
+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*,...)
-igSelectable	2
-1	bool	igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2)
-2	bool	igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
-ImVector_find	2
-1	T*	ImVector_find (const T)
-2	const T*	ImVector_find_const (const T)const
 igMenuItem	2
 1	bool	igMenuItemBool (const char*,const char*,bool,bool)
 2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
-igSetWindowSize	2
-1	void	igSetWindowSizeVec2 (const ImVec2,ImGuiCond)
-2	void	igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond)
+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)
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
@@ -1077,6 +1077,28 @@
        "value": 22
      }
    ],
+    "ImGuiMouseButton_": [
+      {
+        "calc_value": 0,
+        "name": "ImGuiMouseButton_Left",
+        "value": "0"
+      },
+      {
+        "calc_value": 1,
+        "name": "ImGuiMouseButton_Right",
+        "value": "1"
+      },
+      {
+        "calc_value": 2,
+        "name": "ImGuiMouseButton_Middle",
+        "value": "2"
+      },
+      {
+        "calc_value": 5,
+        "name": "ImGuiMouseButton_COUNT",
+        "value": "5"
+      }
+    ],
    "ImGuiMouseCursor_": [
      {
        "calc_value": -1,
@@ -1125,8 +1147,13 @@
      },
      {
        "calc_value": 8,
-        "name": "ImGuiMouseCursor_COUNT",
+        "name": "ImGuiMouseCursor_NotAllowed",
        "value": 8
+      },
+      {
+        "calc_value": 9,
+        "name": "ImGuiMouseCursor_COUNT",
+        "value": 9
      }
    ],
    "ImGuiNavInput_": [
@@ -1217,33 +1244,28 @@
      },
      {
        "calc_value": 17,
-        "name": "ImGuiNavInput_KeyTab_",
+        "name": "ImGuiNavInput_KeyLeft_",
        "value": 17
      },
      {
        "calc_value": 18,
-        "name": "ImGuiNavInput_KeyLeft_",
+        "name": "ImGuiNavInput_KeyRight_",
        "value": 18
      },
      {
        "calc_value": 19,
-        "name": "ImGuiNavInput_KeyRight_",
+        "name": "ImGuiNavInput_KeyUp_",
        "value": 19
      },
      {
        "calc_value": 20,
-        "name": "ImGuiNavInput_KeyUp_",
+        "name": "ImGuiNavInput_KeyDown_",
        "value": 20
      },
      {
        "calc_value": 21,
-        "name": "ImGuiNavInput_KeyDown_",
-        "value": 21
-      },
-      {
-        "calc_value": 22,
        "name": "ImGuiNavInput_COUNT",
-        "value": 22
+        "value": 21
      },
      {
        "calc_value": 16,
@@ -1952,6 +1974,10 @@
        "name": "EllipsisChar",
        "type": "ImWchar"
      },
+      {
+        "name": "DirtyLookupTables",
+        "type": "bool"
+      },
      {
        "name": "Scale",
        "type": "float"
@@ -1967,10 +1993,6 @@
      {
        "name": "MetricsTotalSurface",
        "type": "int"
-      },
-      {
-        "name": "DirtyLookupTables",
-        "type": "bool"
      }
    ],
    "ImFontAtlas": [
@@ -2387,7 +2409,7 @@
      },
      {
        "name": "NavInputs[ImGuiNavInput_COUNT]",
-        "size": 22,
+        "size": 21,
        "type": "float"
      },
      {
@@ -2517,12 +2539,12 @@
      },
      {
        "name": "NavInputsDownDuration[ImGuiNavInput_COUNT]",
-        "size": 22,
+        "size": 21,
        "type": "float"
      },
      {
        "name": "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]",
-        "size": 22,
+        "size": 21,
        "type": "float"
      },
      {
@@ -2583,12 +2605,12 @@
    ],
    "ImGuiListClipper": [
      {
-        "name": "StartPosY",
-        "type": "float"
+        "name": "DisplayStart",
+        "type": "int"
      },
      {
-        "name": "ItemsHeight",
-        "type": "float"
+        "name": "DisplayEnd",
+        "type": "int"
      },
      {
        "name": "ItemsCount",
@@ -2599,12 +2621,12 @@
        "type": "int"
      },
      {
-        "name": "DisplayStart",
-        "type": "int"
+        "name": "ItemsHeight",
+        "type": "float"
      },
      {
-        "name": "DisplayEnd",
-        "type": "int"
+        "name": "StartPosY",
+        "type": "float"
      }
    ],
    "ImGuiOnceUponAFrame": [
@@ -2820,6 +2842,10 @@
        "name": "CurveTessellationTol",
        "type": "float"
      },
+      {
+        "name": "CircleSegmentMaxError",
+        "type": "float"
+      },
      {
        "name": "Colors[ImGuiCol_COUNT]",
        "size": 48,
--- a/generator/output/structs_and_enums.lua
+++ b/generator/output/structs_and_enums.lua
@@ -852,6 +852,23 @@ defs["enums"]["ImGuiKey_"][23] = {}
 defs["enums"]["ImGuiKey_"][23]["calc_value"] = 22
 defs["enums"]["ImGuiKey_"][23]["name"] = "ImGuiKey_COUNT"
 defs["enums"]["ImGuiKey_"][23]["value"] = 22
+defs["enums"]["ImGuiMouseButton_"] = {}
+defs["enums"]["ImGuiMouseButton_"][1] = {}
+defs["enums"]["ImGuiMouseButton_"][1]["calc_value"] = 0
+defs["enums"]["ImGuiMouseButton_"][1]["name"] = "ImGuiMouseButton_Left"
+defs["enums"]["ImGuiMouseButton_"][1]["value"] = "0"
+defs["enums"]["ImGuiMouseButton_"][2] = {}
+defs["enums"]["ImGuiMouseButton_"][2]["calc_value"] = 1
+defs["enums"]["ImGuiMouseButton_"][2]["name"] = "ImGuiMouseButton_Right"
+defs["enums"]["ImGuiMouseButton_"][2]["value"] = "1"
+defs["enums"]["ImGuiMouseButton_"][3] = {}
+defs["enums"]["ImGuiMouseButton_"][3]["calc_value"] = 2
+defs["enums"]["ImGuiMouseButton_"][3]["name"] = "ImGuiMouseButton_Middle"
+defs["enums"]["ImGuiMouseButton_"][3]["value"] = "2"
+defs["enums"]["ImGuiMouseButton_"][4] = {}
+defs["enums"]["ImGuiMouseButton_"][4]["calc_value"] = 5
+defs["enums"]["ImGuiMouseButton_"][4]["name"] = "ImGuiMouseButton_COUNT"
+defs["enums"]["ImGuiMouseButton_"][4]["value"] = "5"
 defs["enums"]["ImGuiMouseCursor_"] = {}
 defs["enums"]["ImGuiMouseCursor_"][1] = {}
 defs["enums"]["ImGuiMouseCursor_"][1]["calc_value"] = -1
@@ -891,8 +908,12 @@ defs["enums"]["ImGuiMouseCursor_"][9]["name"] = "ImGuiMouseCursor_Hand"
 defs["enums"]["ImGuiMouseCursor_"][9]["value"] = 7
 defs["enums"]["ImGuiMouseCursor_"][10] = {}
 defs["enums"]["ImGuiMouseCursor_"][10]["calc_value"] = 8
-defs["enums"]["ImGuiMouseCursor_"][10]["name"] = "ImGuiMouseCursor_COUNT"
+defs["enums"]["ImGuiMouseCursor_"][10]["name"] = "ImGuiMouseCursor_NotAllowed"
 defs["enums"]["ImGuiMouseCursor_"][10]["value"] = 8
+defs["enums"]["ImGuiMouseCursor_"][11] = {}
+defs["enums"]["ImGuiMouseCursor_"][11]["calc_value"] = 9
+defs["enums"]["ImGuiMouseCursor_"][11]["name"] = "ImGuiMouseCursor_COUNT"
+defs["enums"]["ImGuiMouseCursor_"][11]["value"] = 9
 defs["enums"]["ImGuiNavInput_"] = {}
 defs["enums"]["ImGuiNavInput_"][1] = {}
 defs["enums"]["ImGuiNavInput_"][1]["calc_value"] = 0
@@ -964,32 +985,28 @@ defs["enums"]["ImGuiNavInput_"][17]["name"] = "ImGuiNavInput_KeyMenu_"
 defs["enums"]["ImGuiNavInput_"][17]["value"] = 16
 defs["enums"]["ImGuiNavInput_"][18] = {}
 defs["enums"]["ImGuiNavInput_"][18]["calc_value"] = 17
-defs["enums"]["ImGuiNavInput_"][18]["name"] = "ImGuiNavInput_KeyTab_"
+defs["enums"]["ImGuiNavInput_"][18]["name"] = "ImGuiNavInput_KeyLeft_"
 defs["enums"]["ImGuiNavInput_"][18]["value"] = 17
 defs["enums"]["ImGuiNavInput_"][19] = {}
 defs["enums"]["ImGuiNavInput_"][19]["calc_value"] = 18
-defs["enums"]["ImGuiNavInput_"][19]["name"] = "ImGuiNavInput_KeyLeft_"
+defs["enums"]["ImGuiNavInput_"][19]["name"] = "ImGuiNavInput_KeyRight_"
 defs["enums"]["ImGuiNavInput_"][19]["value"] = 18
 defs["enums"]["ImGuiNavInput_"][20] = {}
 defs["enums"]["ImGuiNavInput_"][20]["calc_value"] = 19
-defs["enums"]["ImGuiNavInput_"][20]["name"] = "ImGuiNavInput_KeyRight_"
+defs["enums"]["ImGuiNavInput_"][20]["name"] = "ImGuiNavInput_KeyUp_"
 defs["enums"]["ImGuiNavInput_"][20]["value"] = 19
 defs["enums"]["ImGuiNavInput_"][21] = {}
 defs["enums"]["ImGuiNavInput_"][21]["calc_value"] = 20
-defs["enums"]["ImGuiNavInput_"][21]["name"] = "ImGuiNavInput_KeyUp_"
+defs["enums"]["ImGuiNavInput_"][21]["name"] = "ImGuiNavInput_KeyDown_"
 defs["enums"]["ImGuiNavInput_"][21]["value"] = 20
 defs["enums"]["ImGuiNavInput_"][22] = {}
 defs["enums"]["ImGuiNavInput_"][22]["calc_value"] = 21
-defs["enums"]["ImGuiNavInput_"][22]["name"] = "ImGuiNavInput_KeyDown_"
+defs["enums"]["ImGuiNavInput_"][22]["name"] = "ImGuiNavInput_COUNT"
 defs["enums"]["ImGuiNavInput_"][22]["value"] = 21
 defs["enums"]["ImGuiNavInput_"][23] = {}
-defs["enums"]["ImGuiNavInput_"][23]["calc_value"] = 22
-defs["enums"]["ImGuiNavInput_"][23]["name"] = "ImGuiNavInput_COUNT"
-defs["enums"]["ImGuiNavInput_"][23]["value"] = 22
-defs["enums"]["ImGuiNavInput_"][24] = {}
-defs["enums"]["ImGuiNavInput_"][24]["calc_value"] = 16
-defs["enums"]["ImGuiNavInput_"][24]["name"] = "ImGuiNavInput_InternalStart_"
-defs["enums"]["ImGuiNavInput_"][24]["value"] = "ImGuiNavInput_KeyMenu_"
+defs["enums"]["ImGuiNavInput_"][23]["calc_value"] = 16
+defs["enums"]["ImGuiNavInput_"][23]["name"] = "ImGuiNavInput_InternalStart_"
+defs["enums"]["ImGuiNavInput_"][23]["value"] = "ImGuiNavInput_KeyMenu_"
 defs["enums"]["ImGuiSelectableFlags_"] = {}
 defs["enums"]["ImGuiSelectableFlags_"][1] = {}
 defs["enums"]["ImGuiSelectableFlags_"][1]["calc_value"] = 0
@@ -1536,20 +1553,20 @@ defs["structs"]["ImFont"][12] = {}
 defs["structs"]["ImFont"][12]["name"] = "EllipsisChar"
 defs["structs"]["ImFont"][12]["type"] = "ImWchar"
 defs["structs"]["ImFont"][13] = {}
-defs["structs"]["ImFont"][13]["name"] = "Scale"
-defs["structs"]["ImFont"][13]["type"] = "float"
+defs["structs"]["ImFont"][13]["name"] = "DirtyLookupTables"
+defs["structs"]["ImFont"][13]["type"] = "bool"
 defs["structs"]["ImFont"][14] = {}
-defs["structs"]["ImFont"][14]["name"] = "Ascent"
+defs["structs"]["ImFont"][14]["name"] = "Scale"
 defs["structs"]["ImFont"][14]["type"] = "float"
 defs["structs"]["ImFont"][15] = {}
-defs["structs"]["ImFont"][15]["name"] = "Descent"
+defs["structs"]["ImFont"][15]["name"] = "Ascent"
 defs["structs"]["ImFont"][15]["type"] = "float"
 defs["structs"]["ImFont"][16] = {}
-defs["structs"]["ImFont"][16]["name"] = "MetricsTotalSurface"
-defs["structs"]["ImFont"][16]["type"] = "int"
+defs["structs"]["ImFont"][16]["name"] = "Descent"
+defs["structs"]["ImFont"][16]["type"] = "float"
 defs["structs"]["ImFont"][17] = {}
-defs["structs"]["ImFont"][17]["name"] = "DirtyLookupTables"
-defs["structs"]["ImFont"][17]["type"] = "bool"
+defs["structs"]["ImFont"][17]["name"] = "MetricsTotalSurface"
+defs["structs"]["ImFont"][17]["type"] = "int"
 defs["structs"]["ImFontAtlas"] = {}
 defs["structs"]["ImFontAtlas"][1] = {}
 defs["structs"]["ImFontAtlas"][1]["name"] = "Locked"
@@ -1861,7 +1878,7 @@ defs["structs"]["ImGuiIO"][45]["size"] = 512
 defs["structs"]["ImGuiIO"][45]["type"] = "bool"
 defs["structs"]["ImGuiIO"][46] = {}
 defs["structs"]["ImGuiIO"][46]["name"] = "NavInputs[ImGuiNavInput_COUNT]"
-defs["structs"]["ImGuiIO"][46]["size"] = 22
+defs["structs"]["ImGuiIO"][46]["size"] = 21
 defs["structs"]["ImGuiIO"][46]["type"] = "float"
 defs["structs"]["ImGuiIO"][47] = {}
 defs["structs"]["ImGuiIO"][47]["name"] = "WantCaptureMouse"
@@ -1962,11 +1979,11 @@ defs["structs"]["ImGuiIO"][74]["size"] = 512
 defs["structs"]["ImGuiIO"][74]["type"] = "float"
 defs["structs"]["ImGuiIO"][75] = {}
 defs["structs"]["ImGuiIO"][75]["name"] = "NavInputsDownDuration[ImGuiNavInput_COUNT]"
-defs["structs"]["ImGuiIO"][75]["size"] = 22
+defs["structs"]["ImGuiIO"][75]["size"] = 21
 defs["structs"]["ImGuiIO"][75]["type"] = "float"
 defs["structs"]["ImGuiIO"][76] = {}
 defs["structs"]["ImGuiIO"][76]["name"] = "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]"
-defs["structs"]["ImGuiIO"][76]["size"] = 22
+defs["structs"]["ImGuiIO"][76]["size"] = 21
 defs["structs"]["ImGuiIO"][76]["type"] = "float"
 defs["structs"]["ImGuiIO"][77] = {}
 defs["structs"]["ImGuiIO"][77]["name"] = "InputQueueCharacters"
@@ -2011,11 +2028,11 @@ defs["structs"]["ImGuiInputTextCallbackData"][12]["name"] = "SelectionEnd"
 defs["structs"]["ImGuiInputTextCallbackData"][12]["type"] = "int"
 defs["structs"]["ImGuiListClipper"] = {}
 defs["structs"]["ImGuiListClipper"][1] = {}
-defs["structs"]["ImGuiListClipper"][1]["name"] = "StartPosY"
-defs["structs"]["ImGuiListClipper"][1]["type"] = "float"
+defs["structs"]["ImGuiListClipper"][1]["name"] = "DisplayStart"
+defs["structs"]["ImGuiListClipper"][1]["type"] = "int"
 defs["structs"]["ImGuiListClipper"][2] = {}
-defs["structs"]["ImGuiListClipper"][2]["name"] = "ItemsHeight"
-defs["structs"]["ImGuiListClipper"][2]["type"] = "float"
+defs["structs"]["ImGuiListClipper"][2]["name"] = "DisplayEnd"
+defs["structs"]["ImGuiListClipper"][2]["type"] = "int"
 defs["structs"]["ImGuiListClipper"][3] = {}
 defs["structs"]["ImGuiListClipper"][3]["name"] = "ItemsCount"
 defs["structs"]["ImGuiListClipper"][3]["type"] = "int"
@@ -2023,11 +2040,11 @@ defs["structs"]["ImGuiListClipper"][4] = {}
 defs["structs"]["ImGuiListClipper"][4]["name"] = "StepNo"
 defs["structs"]["ImGuiListClipper"][4]["type"] = "int"
 defs["structs"]["ImGuiListClipper"][5] = {}
-defs["structs"]["ImGuiListClipper"][5]["name"] = "DisplayStart"
-defs["structs"]["ImGuiListClipper"][5]["type"] = "int"
+defs["structs"]["ImGuiListClipper"][5]["name"] = "ItemsHeight"
+defs["structs"]["ImGuiListClipper"][5]["type"] = "float"
 defs["structs"]["ImGuiListClipper"][6] = {}
-defs["structs"]["ImGuiListClipper"][6]["name"] = "DisplayEnd"
-defs["structs"]["ImGuiListClipper"][6]["type"] = "int"
+defs["structs"]["ImGuiListClipper"][6]["name"] = "StartPosY"
+defs["structs"]["ImGuiListClipper"][6]["type"] = "float"
 defs["structs"]["ImGuiOnceUponAFrame"] = {}
 defs["structs"]["ImGuiOnceUponAFrame"][1] = {}
 defs["structs"]["ImGuiOnceUponAFrame"][1]["name"] = "RefFrame"
@@ -2187,9 +2204,12 @@ defs["structs"]["ImGuiStyle"][34] = {}
 defs["structs"]["ImGuiStyle"][34]["name"] = "CurveTessellationTol"
 defs["structs"]["ImGuiStyle"][34]["type"] = "float"
 defs["structs"]["ImGuiStyle"][35] = {}
-defs["structs"]["ImGuiStyle"][35]["name"] = "Colors[ImGuiCol_COUNT]"
-defs["structs"]["ImGuiStyle"][35]["size"] = 48
-defs["structs"]["ImGuiStyle"][35]["type"] = "ImVec4"
+defs["structs"]["ImGuiStyle"][35]["name"] = "CircleSegmentMaxError"
+defs["structs"]["ImGuiStyle"][35]["type"] = "float"
+defs["structs"]["ImGuiStyle"][36] = {}
+defs["structs"]["ImGuiStyle"][36]["name"] = "Colors[ImGuiCol_COUNT]"
+defs["structs"]["ImGuiStyle"][36]["size"] = 48
+defs["structs"]["ImGuiStyle"][36]["type"] = "ImVec4"
 defs["structs"]["ImGuiTextBuffer"] = {}
 defs["structs"]["ImGuiTextBuffer"][1] = {}
 defs["structs"]["ImGuiTextBuffer"][1]["name"] = "Buf"
--- a/generator/output/typedefs_dict.json
+++ b/generator/output/typedefs_dict.json
@@ -37,6 +37,7 @@
  "ImGuiInputTextFlags": "int",
  "ImGuiKey": "int",
  "ImGuiListClipper": "struct ImGuiListClipper",
+  "ImGuiMouseButton": "int",
  "ImGuiMouseCursor": "int",
  "ImGuiNavInput": "int",
  "ImGuiOnceUponAFrame": "struct ImGuiOnceUponAFrame",
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -37,6 +37,7 @@ defs["ImGuiInputTextCallbackData"] = "struct ImGuiInputTextCallbackData"
 defs["ImGuiInputTextFlags"] = "int"
 defs["ImGuiKey"] = "int"
 defs["ImGuiListClipper"] = "struct ImGuiListClipper"
+defs["ImGuiMouseButton"] = "int"
 defs["ImGuiMouseCursor"] = "int"
 defs["ImGuiNavInput"] = "int"
 defs["ImGuiOnceUponAFrame"] = "struct ImGuiOnceUponAFrame"
--- a/2
+++ b/2
Author	SHA1	Message	Date
Victor Bombi	c5eea0b2db	update README.md	2020-02-10 16:30:19 +01:00
Victor Bombi	4e00f55cc8	pull imgui 1.75 and generate	2020-02-10 16:28:40 +01:00
sonoro1234	6740445cbc	add config_generator.lua for setting additional includes needed by any implementation.	2020-01-24 16:40:16 +01:00
sonoro1234	677678af07	cpp2ffi: add COMPILER argument to location iterator	2020-01-23 12:15:14 +01:00
Victor Bombi	fa9538889b	Merge pull request #114 from Dominaezzz/patch-1 Fix Typo	2020-01-05 12:43:14 +01:00
Dominic Fischer	3bd9469a30	Fix Typo	2020-01-01 11:39:02 +00:00
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