update README.md

pull imgui 1.75 and generate
add config_generator.lua for setting additional includes needed by any implementation.
2025-08-11 20:28:30 +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
17 changed files with 673 additions and 342 deletions
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)

 Notes:
-* currently this wrapper is based on version [1.74 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,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.74" 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"
@@ -1048,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);
 }
@@ -1068,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);
 }
@@ -1208,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);
 }
@@ -1348,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)
 {
@@ -1380,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();
@@ -1388,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);
 }
@@ -1400,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)
 {
@@ -1864,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);
@@ -1880,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)
 {
@@ -1924,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)
 {
@@ -1968,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);
@@ -2434,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);
--- 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.74" 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;
@@ -503,6 +504,12 @@ typedef enum {
    ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar,
    ImGuiColorEditFlags__InputMask = ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV
 }ImGuiColorEditFlags_;
+typedef enum {
+    ImGuiMouseButton_Left = 0,
+    ImGuiMouseButton_Right = 1,
+    ImGuiMouseButton_Middle = 2,
+    ImGuiMouseButton_COUNT = 5
+}ImGuiMouseButton_;
 typedef enum {
    ImGuiMouseCursor_None = -1,
    ImGuiMouseCursor_Arrow = 0,
@@ -513,6 +520,7 @@ typedef enum {
    ImGuiMouseCursor_ResizeNESW,
    ImGuiMouseCursor_ResizeNWSE,
    ImGuiMouseCursor_Hand,
+    ImGuiMouseCursor_NotAllowed,
    ImGuiMouseCursor_COUNT
 }ImGuiMouseCursor_;
 typedef enum {
@@ -557,6 +565,7 @@ struct ImGuiStyle
    bool AntiAliasedLines;
    bool AntiAliasedFill;
    float CurveTessellationTol;
+    float CircleSegmentMaxError;
    ImVec4 Colors[ImGuiCol_COUNT];
 };
 struct ImGuiIO
@@ -692,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
 {
@@ -852,10 +863,10 @@ struct ImFont
    short ConfigDataCount;
    ImWchar FallbackChar;
    ImWchar EllipsisChar;
+    bool DirtyLookupTables;
    float Scale;
    float Ascent, Descent;
    int MetricsTotalSurface;
-    bool DirtyLookupTables;
 };
    struct ImGuiTextRange
    {
@@ -1167,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);
@@ -1207,7 +1218,7 @@ 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);
@@ -1242,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);
@@ -1371,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);
@@ -1386,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);
@@ -1397,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);
@@ -1505,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);
--- 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
@@ -1290,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*$"
@@ -1300,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$')
@@ -1325,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
@@ -424,12 +439,7 @@ 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)
@@ -553,7 +563,15 @@ local function parseImGuiHeader(header,names)
 	local iterator = (HAVE_COMPILER and cpp2ffi.location) or filelines
 	
 	local tableo = {}
-	for line,loca,loca2 in iterator(pipe,names,{}) do
+	--[[
+	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)
@@ -702,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
@@ -719,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,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.74" 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"
@@ -1048,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);
 }
@@ -1068,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);
 }
@@ -1208,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);
 }
@@ -1348,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)
 {
@@ -1380,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();
@@ -1388,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);
 }
@@ -1400,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)
 {
@@ -1864,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);
@@ -1880,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)
 {
@@ -1924,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)
 {
@@ -1968,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);
@@ -2434,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);
--- 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.74" 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;
@@ -503,6 +504,12 @@ typedef enum {
    ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar,
    ImGuiColorEditFlags__InputMask = ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV
 }ImGuiColorEditFlags_;
+typedef enum {
+    ImGuiMouseButton_Left = 0,
+    ImGuiMouseButton_Right = 1,
+    ImGuiMouseButton_Middle = 2,
+    ImGuiMouseButton_COUNT = 5
+}ImGuiMouseButton_;
 typedef enum {
    ImGuiMouseCursor_None = -1,
    ImGuiMouseCursor_Arrow = 0,
@@ -513,6 +520,7 @@ typedef enum {
    ImGuiMouseCursor_ResizeNESW,
    ImGuiMouseCursor_ResizeNWSE,
    ImGuiMouseCursor_Hand,
+    ImGuiMouseCursor_NotAllowed,
    ImGuiMouseCursor_COUNT
 }ImGuiMouseCursor_;
 typedef enum {
@@ -557,6 +565,7 @@ struct ImGuiStyle
    bool AntiAliasedLines;
    bool AntiAliasedFill;
    float CurveTessellationTol;
+    float CircleSegmentMaxError;
    ImVec4 Colors[ImGuiCol_COUNT];
 };
 struct ImGuiIO
@@ -692,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
 {
@@ -852,10 +863,10 @@ struct ImFont
    short ConfigDataCount;
    ImWchar FallbackChar;
    ImWchar EllipsisChar;
+    bool DirtyLookupTables;
    float Scale;
    float Ascent, Descent;
    int MetricsTotalSurface;
-    bool DirtyLookupTables;
 };
    struct ImGuiTextRange
    {
@@ -1167,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);
@@ -1207,7 +1218,7 @@ 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);
@@ -1242,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);
@@ -1371,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);
@@ -1386,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);
@@ -1397,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);
@@ -1505,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);
--- a/generator/output/definitions.json
+++ b/generator/output/definitions.json
@@ -576,26 +576,26 @@
  ],
  "ImDrawList_AddBezierCurve": [
    {
-      "args": "(ImDrawList* self,const ImVec2 pos0,const ImVec2 cp0,const ImVec2 cp1,const ImVec2 pos1,ImU32 col,float thickness,int num_segments)",
+      "args": "(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int num_segments)",
      "argsT": [
        {
          "name": "self",
          "type": "ImDrawList*"
        },
        {
-          "name": "pos0",
+          "name": "p1",
          "type": "const ImVec2"
        },
        {
-          "name": "cp0",
+          "name": "p2",
          "type": "const ImVec2"
        },
        {
-          "name": "cp1",
+          "name": "p3",
          "type": "const ImVec2"
        },
        {
-          "name": "pos1",
+          "name": "p4",
          "type": "const ImVec2"
        },
        {
@@ -611,8 +611,8 @@
          "type": "int"
        }
      ],
-      "argsoriginal": "(const ImVec2& pos0,const ImVec2& cp0,const ImVec2& cp1,const ImVec2& pos1,ImU32 col,float thickness,int num_segments=0)",
-      "call_args": "(pos0,cp0,cp1,pos1,col,thickness,num_segments)",
+      "argsoriginal": "(const ImVec2& p1,const ImVec2& p2,const ImVec2& p3,const ImVec2& p4,ImU32 col,float thickness,int num_segments=0)",
+      "call_args": "(p1,p2,p3,p4,col,thickness,num_segments)",
      "cimguiname": "ImDrawList_AddBezierCurve",
      "defaults": {
        "num_segments": "0"
@@ -991,6 +991,84 @@
      "stname": "ImDrawList"
    }
  ],
+  "ImDrawList_AddNgon": [
+    {
+      "args": "(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness)",
+      "argsT": [
+        {
+          "name": "self",
+          "type": "ImDrawList*"
+        },
+        {
+          "name": "center",
+          "type": "const ImVec2"
+        },
+        {
+          "name": "radius",
+          "type": "float"
+        },
+        {
+          "name": "col",
+          "type": "ImU32"
+        },
+        {
+          "name": "num_segments",
+          "type": "int"
+        },
+        {
+          "name": "thickness",
+          "type": "float"
+        }
+      ],
+      "argsoriginal": "(const ImVec2& center,float radius,ImU32 col,int num_segments,float thickness=1.0f)",
+      "call_args": "(center,radius,col,num_segments,thickness)",
+      "cimguiname": "ImDrawList_AddNgon",
+      "defaults": {
+        "thickness": "1.0f"
+      },
+      "funcname": "AddNgon",
+      "ov_cimguiname": "ImDrawList_AddNgon",
+      "ret": "void",
+      "signature": "(const ImVec2,float,ImU32,int,float)",
+      "stname": "ImDrawList"
+    }
+  ],
+  "ImDrawList_AddNgonFilled": [
+    {
+      "args": "(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments)",
+      "argsT": [
+        {
+          "name": "self",
+          "type": "ImDrawList*"
+        },
+        {
+          "name": "center",
+          "type": "const ImVec2"
+        },
+        {
+          "name": "radius",
+          "type": "float"
+        },
+        {
+          "name": "col",
+          "type": "ImU32"
+        },
+        {
+          "name": "num_segments",
+          "type": "int"
+        }
+      ],
+      "argsoriginal": "(const ImVec2& center,float radius,ImU32 col,int num_segments)",
+      "call_args": "(center,radius,col,num_segments)",
+      "cimguiname": "ImDrawList_AddNgonFilled",
+      "defaults": [],
+      "funcname": "AddNgonFilled",
+      "ov_cimguiname": "ImDrawList_AddNgonFilled",
+      "ret": "void",
+      "signature": "(const ImVec2,float,ImU32,int)",
+      "stname": "ImDrawList"
+    }
+  ],
  "ImDrawList_AddPolyline": [
    {
      "args": "(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)",
@@ -1776,16 +1854,12 @@
  ],
  "ImDrawList_PathBezierCurveTo": [
    {
-      "args": "(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,int num_segments)",
+      "args": "(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments)",
      "argsT": [
        {
          "name": "self",
          "type": "ImDrawList*"
        },
-        {
-          "name": "p1",
-          "type": "const ImVec2"
-        },
        {
          "name": "p2",
          "type": "const ImVec2"
@@ -1794,13 +1868,17 @@
          "name": "p3",
          "type": "const ImVec2"
        },
+        {
+          "name": "p4",
+          "type": "const ImVec2"
+        },
        {
          "name": "num_segments",
          "type": "int"
        }
      ],
-      "argsoriginal": "(const ImVec2& p1,const ImVec2& p2,const ImVec2& p3,int num_segments=0)",
-      "call_args": "(p1,p2,p3,num_segments)",
+      "argsoriginal": "(const ImVec2& p2,const ImVec2& p3,const ImVec2& p4,int num_segments=0)",
+      "call_args": "(p2,p3,p4,num_segments)",
      "cimguiname": "ImDrawList_PathBezierCurveTo",
      "defaults": {
        "num_segments": "0"
@@ -2173,6 +2251,34 @@
      "stname": "ImDrawList"
    }
  ],
+  "ImDrawList_PrimUnreserve": [
+    {
+      "args": "(ImDrawList* self,int idx_count,int vtx_count)",
+      "argsT": [
+        {
+          "name": "self",
+          "type": "ImDrawList*"
+        },
+        {
+          "name": "idx_count",
+          "type": "int"
+        },
+        {
+          "name": "vtx_count",
+          "type": "int"
+        }
+      ],
+      "argsoriginal": "(int idx_count,int vtx_count)",
+      "call_args": "(idx_count,vtx_count)",
+      "cimguiname": "ImDrawList_PrimUnreserve",
+      "defaults": [],
+      "funcname": "PrimUnreserve",
+      "ov_cimguiname": "ImDrawList_PrimUnreserve",
+      "ret": "void",
+      "signature": "(int,int)",
+      "stname": "ImDrawList"
+    }
+  ],
  "ImDrawList_PrimVtx": [
    {
      "args": "(ImDrawList* self,const ImVec2 pos,const ImVec2 uv,ImU32 col)",
@@ -6970,7 +7076,7 @@
  ],
  "igBeginPopupContextItem": [
    {
-      "args": "(const char* str_id,int mouse_button)",
+      "args": "(const char* str_id,ImGuiMouseButton mouse_button)",
      "argsT": [
        {
          "name": "str_id",
@@ -6978,10 +7084,10 @@
        },
        {
          "name": "mouse_button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        }
      ],
-      "argsoriginal": "(const char* str_id=((void*)0),int mouse_button=1)",
+      "argsoriginal": "(const char* str_id=((void*)0),ImGuiMouseButton mouse_button=1)",
      "call_args": "(str_id,mouse_button)",
      "cimguiname": "igBeginPopupContextItem",
      "defaults": {
@@ -6992,13 +7098,13 @@
      "namespace": "ImGui",
      "ov_cimguiname": "igBeginPopupContextItem",
      "ret": "bool",
-      "signature": "(const char*,int)",
+      "signature": "(const char*,ImGuiMouseButton)",
      "stname": ""
    }
  ],
  "igBeginPopupContextVoid": [
    {
-      "args": "(const char* str_id,int mouse_button)",
+      "args": "(const char* str_id,ImGuiMouseButton mouse_button)",
      "argsT": [
        {
          "name": "str_id",
@@ -7006,10 +7112,10 @@
        },
        {
          "name": "mouse_button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        }
      ],
-      "argsoriginal": "(const char* str_id=((void*)0),int mouse_button=1)",
+      "argsoriginal": "(const char* str_id=((void*)0),ImGuiMouseButton mouse_button=1)",
      "call_args": "(str_id,mouse_button)",
      "cimguiname": "igBeginPopupContextVoid",
      "defaults": {
@@ -7020,13 +7126,13 @@
      "namespace": "ImGui",
      "ov_cimguiname": "igBeginPopupContextVoid",
      "ret": "bool",
-      "signature": "(const char*,int)",
+      "signature": "(const char*,ImGuiMouseButton)",
      "stname": ""
    }
  ],
  "igBeginPopupContextWindow": [
    {
-      "args": "(const char* str_id,int mouse_button,bool also_over_items)",
+      "args": "(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items)",
      "argsT": [
        {
          "name": "str_id",
@@ -7034,14 +7140,14 @@
        },
        {
          "name": "mouse_button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        },
        {
          "name": "also_over_items",
          "type": "bool"
        }
      ],
-      "argsoriginal": "(const char* str_id=((void*)0),int mouse_button=1,bool also_over_items=true)",
+      "argsoriginal": "(const char* str_id=((void*)0),ImGuiMouseButton mouse_button=1,bool also_over_items=true)",
      "call_args": "(str_id,mouse_button,also_over_items)",
      "cimguiname": "igBeginPopupContextWindow",
      "defaults": {
@@ -7053,7 +7159,7 @@
      "namespace": "ImGui",
      "ov_cimguiname": "igBeginPopupContextWindow",
      "ret": "bool",
-      "signature": "(const char*,int,bool)",
+      "signature": "(const char*,ImGuiMouseButton,bool)",
      "stname": ""
    }
  ],
@@ -10027,18 +10133,18 @@
  ],
  "igGetMouseDragDelta": [
    {
-      "args": "(int button,float lock_threshold)",
+      "args": "(ImGuiMouseButton button,float lock_threshold)",
      "argsT": [
        {
          "name": "button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        },
        {
          "name": "lock_threshold",
          "type": "float"
        }
      ],
-      "argsoriginal": "(int button=0,float lock_threshold=-1.0f)",
+      "argsoriginal": "(ImGuiMouseButton button=0,float lock_threshold=-1.0f)",
      "call_args": "(button,lock_threshold)",
      "cimguiname": "igGetMouseDragDelta",
      "defaults": {
@@ -10049,11 +10155,11 @@
      "namespace": "ImGui",
      "ov_cimguiname": "igGetMouseDragDelta",
      "ret": "ImVec2",
-      "signature": "(int,float)",
+      "signature": "(ImGuiMouseButton,float)",
      "stname": ""
    },
    {
-      "args": "(ImVec2 *pOut,int button,float lock_threshold)",
+      "args": "(ImVec2 *pOut,ImGuiMouseButton button,float lock_threshold)",
      "argsT": [
        {
          "name": "pOut",
@@ -10061,14 +10167,14 @@
        },
        {
          "name": "button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        },
        {
          "name": "lock_threshold",
          "type": "float"
        }
      ],
-      "argsoriginal": "(int button=0,float lock_threshold=-1.0f)",
+      "argsoriginal": "(ImGuiMouseButton button=0,float lock_threshold=-1.0f)",
      "call_args": "(button,lock_threshold)",
      "cimguiname": "igGetMouseDragDelta",
      "defaults": {
@@ -10080,22 +10186,22 @@
      "nonUDT": 1,
      "ov_cimguiname": "igGetMouseDragDelta_nonUDT",
      "ret": "void",
-      "signature": "(int,float)",
+      "signature": "(ImGuiMouseButton,float)",
      "stname": ""
    },
    {
-      "args": "(int button,float lock_threshold)",
+      "args": "(ImGuiMouseButton button,float lock_threshold)",
      "argsT": [
        {
          "name": "button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        },
        {
          "name": "lock_threshold",
          "type": "float"
        }
      ],
-      "argsoriginal": "(int button=0,float lock_threshold=-1.0f)",
+      "argsoriginal": "(ImGuiMouseButton button=0,float lock_threshold=-1.0f)",
      "call_args": "(button,lock_threshold)",
      "cimguiname": "igGetMouseDragDelta",
      "defaults": {
@@ -10108,7 +10214,7 @@
      "ov_cimguiname": "igGetMouseDragDelta_nonUDT2",
      "ret": "ImVec2_Simple",
      "retorig": "ImVec2",
-      "signature": "(int,float)",
+      "signature": "(ImGuiMouseButton,float)",
      "stname": ""
    }
  ],
@@ -11533,14 +11639,14 @@
  ],
  "igIsItemClicked": [
    {
-      "args": "(int mouse_button)",
+      "args": "(ImGuiMouseButton mouse_button)",
      "argsT": [
        {
          "name": "mouse_button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        }
      ],
-      "argsoriginal": "(int mouse_button=0)",
+      "argsoriginal": "(ImGuiMouseButton mouse_button=0)",
      "call_args": "(mouse_button)",
      "cimguiname": "igIsItemClicked",
      "defaults": {
@@ -11550,7 +11656,7 @@
      "namespace": "ImGui",
      "ov_cimguiname": "igIsItemClicked",
      "ret": "bool",
-      "signature": "(int)",
+      "signature": "(ImGuiMouseButton)",
      "stname": ""
    }
  ],
@@ -11744,18 +11850,18 @@
  ],
  "igIsMouseClicked": [
    {
-      "args": "(int button,bool repeat)",
+      "args": "(ImGuiMouseButton button,bool repeat)",
      "argsT": [
        {
          "name": "button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        },
        {
          "name": "repeat",
          "type": "bool"
        }
      ],
-      "argsoriginal": "(int button,bool repeat=false)",
+      "argsoriginal": "(ImGuiMouseButton button,bool repeat=false)",
      "call_args": "(button,repeat)",
      "cimguiname": "igIsMouseClicked",
      "defaults": {
@@ -11765,20 +11871,20 @@
      "namespace": "ImGui",
      "ov_cimguiname": "igIsMouseClicked",
      "ret": "bool",
-      "signature": "(int,bool)",
+      "signature": "(ImGuiMouseButton,bool)",
      "stname": ""
    }
  ],
  "igIsMouseDoubleClicked": [
    {
-      "args": "(int button)",
+      "args": "(ImGuiMouseButton button)",
      "argsT": [
        {
          "name": "button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        }
      ],
-      "argsoriginal": "(int button)",
+      "argsoriginal": "(ImGuiMouseButton button)",
      "call_args": "(button)",
      "cimguiname": "igIsMouseDoubleClicked",
      "defaults": [],
@@ -11786,20 +11892,20 @@
      "namespace": "ImGui",
      "ov_cimguiname": "igIsMouseDoubleClicked",
      "ret": "bool",
-      "signature": "(int)",
+      "signature": "(ImGuiMouseButton)",
      "stname": ""
    }
  ],
  "igIsMouseDown": [
    {
-      "args": "(int button)",
+      "args": "(ImGuiMouseButton button)",
      "argsT": [
        {
          "name": "button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        }
      ],
-      "argsoriginal": "(int button)",
+      "argsoriginal": "(ImGuiMouseButton button)",
      "call_args": "(button)",
      "cimguiname": "igIsMouseDown",
      "defaults": [],
@@ -11807,35 +11913,34 @@
      "namespace": "ImGui",
      "ov_cimguiname": "igIsMouseDown",
      "ret": "bool",
-      "signature": "(int)",
+      "signature": "(ImGuiMouseButton)",
      "stname": ""
    }
  ],
  "igIsMouseDragging": [
    {
-      "args": "(int button,float lock_threshold)",
+      "args": "(ImGuiMouseButton button,float lock_threshold)",
      "argsT": [
        {
          "name": "button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        },
        {
          "name": "lock_threshold",
          "type": "float"
        }
      ],
-      "argsoriginal": "(int button=0,float lock_threshold=-1.0f)",
+      "argsoriginal": "(ImGuiMouseButton button,float lock_threshold=-1.0f)",
      "call_args": "(button,lock_threshold)",
      "cimguiname": "igIsMouseDragging",
      "defaults": {
-        "button": "0",
        "lock_threshold": "-1.0f"
      },
      "funcname": "IsMouseDragging",
      "namespace": "ImGui",
      "ov_cimguiname": "igIsMouseDragging",
      "ret": "bool",
-      "signature": "(int,float)",
+      "signature": "(ImGuiMouseButton,float)",
      "stname": ""
    }
  ],
@@ -11895,14 +12000,14 @@
  ],
  "igIsMouseReleased": [
    {
-      "args": "(int button)",
+      "args": "(ImGuiMouseButton button)",
      "argsT": [
        {
          "name": "button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        }
      ],
-      "argsoriginal": "(int button)",
+      "argsoriginal": "(ImGuiMouseButton button)",
      "call_args": "(button)",
      "cimguiname": "igIsMouseReleased",
      "defaults": [],
@@ -11910,7 +12015,7 @@
      "namespace": "ImGui",
      "ov_cimguiname": "igIsMouseReleased",
      "ret": "bool",
-      "signature": "(int)",
+      "signature": "(ImGuiMouseButton)",
      "stname": ""
    }
  ],
@@ -12634,7 +12739,7 @@
  ],
  "igOpenPopupOnItemClick": [
    {
-      "args": "(const char* str_id,int mouse_button)",
+      "args": "(const char* str_id,ImGuiMouseButton mouse_button)",
      "argsT": [
        {
          "name": "str_id",
@@ -12642,10 +12747,10 @@
        },
        {
          "name": "mouse_button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        }
      ],
-      "argsoriginal": "(const char* str_id=((void*)0),int mouse_button=1)",
+      "argsoriginal": "(const char* str_id=((void*)0),ImGuiMouseButton mouse_button=1)",
      "call_args": "(str_id,mouse_button)",
      "cimguiname": "igOpenPopupOnItemClick",
      "defaults": {
@@ -12656,7 +12761,7 @@
      "namespace": "ImGui",
      "ov_cimguiname": "igOpenPopupOnItemClick",
      "ret": "bool",
-      "signature": "(const char*,int)",
+      "signature": "(const char*,ImGuiMouseButton)",
      "stname": ""
    }
  ],
@@ -12701,7 +12806,7 @@
          "type": "int"
        }
      ],
-      "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))",
+      "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))",
      "call_args": "(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride)",
      "cimguiname": "igPlotHistogram",
      "defaults": {
@@ -12761,7 +12866,7 @@
          "type": "ImVec2"
        }
      ],
-      "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))",
+      "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))",
      "call_args": "(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size)",
      "cimguiname": "igPlotHistogram",
      "defaults": {
@@ -12820,7 +12925,7 @@
          "type": "int"
        }
      ],
-      "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))",
+      "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))",
      "call_args": "(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride)",
      "cimguiname": "igPlotLines",
      "defaults": {
@@ -12880,7 +12985,7 @@
          "type": "ImVec2"
        }
      ],
-      "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))",
+      "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))",
      "call_args": "(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size)",
      "cimguiname": "igPlotLines",
      "defaults": {
@@ -13472,14 +13577,14 @@
  ],
  "igResetMouseDragDelta": [
    {
-      "args": "(int button)",
+      "args": "(ImGuiMouseButton button)",
      "argsT": [
        {
          "name": "button",
-          "type": "int"
+          "type": "ImGuiMouseButton"
        }
      ],
-      "argsoriginal": "(int button=0)",
+      "argsoriginal": "(ImGuiMouseButton button=0)",
      "call_args": "(button)",
      "cimguiname": "igResetMouseDragDelta",
      "defaults": {
@@ -13489,7 +13594,7 @@
      "namespace": "ImGui",
      "ov_cimguiname": "igResetMouseDragDelta",
      "ret": "void",
-      "signature": "(int)",
+      "signature": "(ImGuiMouseButton)",
      "stname": ""
    }
  ],
@@ -13976,15 +14081,15 @@
  ],
  "igSetMouseCursor": [
    {
-      "args": "(ImGuiMouseCursor type)",
+      "args": "(ImGuiMouseCursor cursor_type)",
      "argsT": [
        {
-          "name": "type",
+          "name": "cursor_type",
          "type": "ImGuiMouseCursor"
        }
      ],
-      "argsoriginal": "(ImGuiMouseCursor type)",
-      "call_args": "(type)",
+      "argsoriginal": "(ImGuiMouseCursor cursor_type)",
+      "call_args": "(cursor_type)",
      "cimguiname": "igSetMouseCursor",
      "defaults": [],
      "funcname": "SetMouseCursor",
--- 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)"
@@ -5779,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"] = {}
@@ -5797,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"] = {}
@@ -5820,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"] = {}
@@ -5847,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)"
@@ -8405,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"] = {}
@@ -8423,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"]
@@ -8446,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"]
@@ -8467,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"] = "()"
@@ -9706,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"] = {}
@@ -9720,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"] = "()"
@@ -9892,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"] = {}
@@ -9909,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"] = {}
@@ -9927,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"] = {}
@@ -9945,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)"
@@ -10017,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"] = {}
@@ -10030,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)"
@@ -10645,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"] = {}
@@ -10663,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)"
@@ -10697,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"] = {}
@@ -10745,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"] = {}
@@ -10793,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"] = {}
@@ -10841,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"] = {}
@@ -11357,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"] = {}
@@ -11371,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)"
@@ -11783,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"
--- a/generator/output/overloads.txt
+++ b/generator/output/overloads.txt
@@ -107,6 +107,9 @@ ImColor_ImColor	5
 3	nil	ImColor_ImColorU32 (ImU32)
 4	nil	ImColor_ImColorFloat (float,float,float,float)
 5	nil	ImColor_ImColorVec4 (const ImVec4)
+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
@@ -120,9 +123,6 @@ 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)
 igMenuItem	2
 1	bool	igMenuItemBool (const char*,const char*,bool,bool)
 2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
--- 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_": [
@@ -1947,6 +1974,10 @@
        "name": "EllipsisChar",
        "type": "ImWchar"
      },
+      {
+        "name": "DirtyLookupTables",
+        "type": "bool"
+      },
      {
        "name": "Scale",
        "type": "float"
@@ -1962,10 +1993,6 @@
      {
        "name": "MetricsTotalSurface",
        "type": "int"
-      },
-      {
-        "name": "DirtyLookupTables",
-        "type": "bool"
      }
    ],
    "ImFontAtlas": [
@@ -2578,12 +2605,12 @@
    ],
    "ImGuiListClipper": [
      {
-        "name": "StartPosY",
-        "type": "float"
+        "name": "DisplayStart",
+        "type": "int"
      },
      {
-        "name": "ItemsHeight",
-        "type": "float"
+        "name": "DisplayEnd",
+        "type": "int"
      },
      {
        "name": "ItemsCount",
@@ -2594,12 +2621,12 @@
        "type": "int"
      },
      {
-        "name": "DisplayStart",
-        "type": "int"
+        "name": "ItemsHeight",
+        "type": "float"
      },
      {
-        "name": "DisplayEnd",
-        "type": "int"
+        "name": "StartPosY",
+        "type": "float"
      }
    ],
    "ImGuiOnceUponAFrame": [
@@ -2815,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
@@ -1532,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"
@@ -2007,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"
@@ -2019,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"
@@ -2183,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