From aef6b98bdb506bd8c2c6222474d24971a978cf46 Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Sun, 4 Jun 2017 14:34:22 -0700 Subject: [PATCH] Fix some imported functions and delete nonexistent ones. * igCollapsingHeader (3-params) renamed to igCollapsingHeaderEx. * igColor and igColor2 removed -- they no longer exist in cimgui. * igBeginMenu (1-param) removed. igBegin is already imported, and it has two parameters, not one. * Fixed two typos in DrawList function names. --- src/ImGui.NET/ImGuiNative.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/ImGui.NET/ImGuiNative.cs b/src/ImGui.NET/ImGuiNative.cs index 55fe1f2..fdaed4d 100644 --- a/src/ImGui.NET/ImGuiNative.cs +++ b/src/ImGui.NET/ImGuiNative.cs @@ -480,7 +480,7 @@ namespace ImGuiNET public static extern bool igCollapsingHeader(string label, TreeNodeFlags flags = 0); [DllImport(cimguiLib)] [return: MarshalAs(UnmanagedType.I1)] - public static extern bool igCollapsingHeader(string label, ref bool p_open, TreeNodeFlags flags = 0); + public static extern bool igCollapsingHeaderEx(string label, ref bool p_open, TreeNodeFlags flags = 0); // Widgets: Selectable / Lists [DllImport(cimguiLib)] @@ -515,10 +515,6 @@ namespace ImGuiNET public static extern void igValueUInt(string prefix, uint v); [DllImport(cimguiLib)] public static extern void igValueFloat(string prefix, float v, string float_format); - [DllImport(cimguiLib)] - public static extern void igColor(string prefix, Vector4 v); - [DllImport(cimguiLib)] - public static extern void igColor2(string prefix, uint v); // Tooltip [DllImport(cimguiLib)] @@ -541,9 +537,6 @@ namespace ImGuiNET public static extern void igEndMenuBar(); [DllImport(cimguiLib)] [return: MarshalAs(UnmanagedType.I1)] - public static extern bool igBeginMenu(string label); - [DllImport(cimguiLib)] - [return: MarshalAs(UnmanagedType.I1)] public static extern bool igBeginMenu(string label, bool enabled); [DllImport(cimguiLib)] public static extern void igEndMenu(); @@ -829,9 +822,9 @@ namespace ImGuiNET [DllImport(cimguiLib)] public static extern void ImDrawList_AddRectFilledMultiColor(NativeDrawList* list, Vector2 a, Vector2 b, uint col_upr_left, uint col_upr_right, uint col_bot_right, uint col_bot_left); [DllImport(cimguiLib)] - public static extern void ImDrawLust_AddQuad(NativeDrawList* list, Vector2 a, Vector2 b, Vector2 c, Vector2 d, uint col, float thickness); + public static extern void ImDrawList_AddQuad(NativeDrawList* list, Vector2 a, Vector2 b, Vector2 c, Vector2 d, uint col, float thickness); [DllImport(cimguiLib)] - public static extern void ImDrawLust_AddQuadFilled(NativeDrawList* list, Vector2 a, Vector2 b, Vector2 c, Vector2 d, uint col); + public static extern void ImDrawList_AddQuadFilled(NativeDrawList* list, Vector2 a, Vector2 b, Vector2 c, Vector2 d, uint col); [DllImport(cimguiLib)] public static extern void ImDrawList_AddTriangle(NativeDrawList* list, Vector2 a, Vector2 b, Vector2 c, uint col, float thickness); [DllImport(cimguiLib)]