change indent to spaces

.gitignore

@@ -31,3 +31,5 @@ cimgui/cimgui.opensdf
 cimgui/cimgui.sdf
 cimgui/cimgui.v12.suo
 cimgui/Release/
+.idea
+CMakeLists.txt

README.md

@@ -1,16 +1,19 @@
 # cimgui [![Build Status](https://travis-ci.org/Extrawurst/cimgui.svg)](https://travis-ci.org/Extrawurst/cimgui)
 
 ![sample](https://raw.github.com/extrawurst/cimgui/master/Screen Shot 2015-04-09.png)
+![new menus api](https://raw.github.com/extrawurst/cimgui/master/menus-api.gif)
 
 This is a thin c-api wrapper for the excellent C++ intermediate gui [imgui](https://github.com/ocornut/imgui).
 Most of the functions have wrapper counterparts now, missing stuff is added on a as-needed basis (PR welcome).
 This library is intended as a intermediate layer to be able to use imgui from other languages that can interface with C (like D - see [D-binding](https://github.com/Extrawurst/DerelictImgui))
 
-Note: currently this wrapper is based on a WIP version of imgui 1.38
+Notes:
+* currently this wrapper is based on version [1.41 of imgui](https://github.com/ocornut/imgui/releases/tag/v1.41)
+* does not compile with pure C compiler yet (for writing bindings in languages that are able to use C-ABI it is enough though, see D-bindings)
 
 # usage
 
 * clone
 * make using makefile on linux/osx (linux makefile not tested)
-* use whatever method is in ImGui c++ namespace in the original [imgui.h](https://github.com/ocornut/imgui/blob/master/imgui.h) by prepending `ig_` (most of the time)
+* use whatever method is in ImGui c++ namespace in the original [imgui.h](https://github.com/ocornut/imgui/blob/master/imgui.h) by prepending `ig_`
 * methods have the same parameter list and return values (where possible)

cimgui/cimgui.h

@@ -50,9 +50,10 @@ CIMGUI_API void             ig_SetWindowFontScale(float scale);
 CIMGUI_API void             ig_GetWindowPos(struct ImVec2* out);
 CIMGUI_API void             ig_GetWindowSize(struct ImVec2* out);
 CIMGUI_API float            ig_GetWindowWidth();
-CIMGUI_API bool             ig_GetWindowCollapsed();
+CIMGUI_API bool             ig_IsWindowCollapsed();
 
 CIMGUI_API void             ig_SetNextWindowPos(CONST struct ImVec2 pos, ImGuiSetCond cond);
+CIMGUI_API void             ig_SetNextWindowPosCenter(ImGuiSetCond cond);
 CIMGUI_API void             ig_SetNextWindowSize(CONST struct ImVec2 size, ImGuiSetCond cond);
 CIMGUI_API void             ig_SetNextWindowCollapsed(bool collapsed, ImGuiSetCond cond);
 CIMGUI_API void             ig_SetNextWindowFocus();
@@ -65,9 +66,11 @@ CIMGUI_API void             ig_SetWindowSize2(CONST char* name, CONST struct ImV
 CIMGUI_API void             ig_SetWindowCollapsed2(CONST char* name, bool collapsed, ImGuiSetCond cond);
 CIMGUI_API void             ig_SetWindowFocus2(CONST char* name);
 
-CIMGUI_API float            ig_GetScrollPosY();
+CIMGUI_API float            ig_GetScrollY();
 CIMGUI_API float            ig_GetScrollMaxY();
-CIMGUI_API void             ig_SetScrollPosHere();
+CIMGUI_API void             ig_SetScrollY(float scroll_y);
+CIMGUI_API void             ig_SetScrollHere(float center_y_ratio = 0.5f);
+CIMGUI_API void             ig_SetScrollFromPosY(float pos_y, float center_y_ratio = 0.5f);
 CIMGUI_API void             ig_SetKeyboardFocusHere(int offset);
 CIMGUI_API void             ig_SetStateStorage(ImGuiStorage* tree);
 CIMGUI_API ImGuiStorage*    ig_GetStateStorage();
@@ -89,16 +92,8 @@ CIMGUI_API void             ig_PushAllowKeyboardFocus(bool v);
 CIMGUI_API void             ig_PopAllowKeyboardFocus();
 CIMGUI_API void             ig_PushTextWrapPos(float wrap_pos_x);
 CIMGUI_API void             ig_PopTextWrapPos();
-
-// Tooltip
-CIMGUI_API void             ig_SetTooltip(CONST char* fmt, ...);
-CIMGUI_API void             ig_SetTooltipV(CONST char* fmt, va_list args);
-CIMGUI_API void             ig_BeginTooltip();
-CIMGUI_API void             ig_EndTooltip();
-
-// Popup
-CIMGUI_API void             ig_BeginPopup(bool* p_opened);
-CIMGUI_API void             ig_EndPopup();
+CIMGUI_API void             ig_PushButtonRepeat(bool repeat);
+CIMGUI_API void             ig_PopButtonRepeat();
 
 // Layout
 CIMGUI_API void             ig_BeginGroup();
@@ -106,6 +101,7 @@ CIMGUI_API void             ig_EndGroup();
 CIMGUI_API void             ig_Separator();
 CIMGUI_API void             ig_SameLine(int column_x, int spacing_w);
 CIMGUI_API void             ig_Spacing();
+CIMGUI_API void             ig_Dummy(CONST ImVec2* size);
 CIMGUI_API void             ig_Indent();
 CIMGUI_API void             ig_Unindent();
 CIMGUI_API void             ig_Columns(int count, CONST char* id, bool border);
@@ -121,11 +117,13 @@ CIMGUI_API float            ig_GetCursorPosY();
 CIMGUI_API void             ig_SetCursorPos(CONST struct ImVec2 pos);
 CIMGUI_API void             ig_SetCursorPosX(float x);
 CIMGUI_API void             ig_SetCursorPosY(float y);
+CIMGUI_API void             ig_GetCursorStartPos(struct ImVec2* pOut);
 CIMGUI_API void             ig_GetCursorScreenPos(struct ImVec2* pOut);
 CIMGUI_API void             ig_SetCursorScreenPos(CONST struct ImVec2 pos);
 CIMGUI_API void             ig_AlignFirstTextHeightToWidgets();
 CIMGUI_API float            ig_GetTextLineHeight();
 CIMGUI_API float            ig_GetTextLineHeightWithSpacing();
+CIMGUI_API float            ig_GetItemsLineHeightWithSpacing();
 
 // ID scopes
 // If you are creating widgets in a loop you most likely want to push a unique identifier so ImGui can differentiate them
@@ -144,6 +142,8 @@ CIMGUI_API void             ig_Text(CONST char* fmt, ...);
 CIMGUI_API void             ig_TextV(CONST char* fmt, va_list args);
 CIMGUI_API void             ig_TextColored(CONST struct ImVec4 col, CONST char* fmt, ...);
 CIMGUI_API void             ig_TextColoredV(CONST struct ImVec4 col, CONST char* fmt, va_list args);
+CIMGUI_API void             ig_TextDisabled(CONST char* fmt, ...);
+CIMGUI_API void             ig_TextDisabledV(CONST char* fmt, va_list args);
 CIMGUI_API void             ig_TextWrapped(CONST char* fmt, ...);
 CIMGUI_API void             ig_TextWrappedV(CONST char* fmt, va_list args);
 CIMGUI_API void             ig_TextUnformatted(CONST char* text, CONST char* text_end);
@@ -152,7 +152,7 @@ CIMGUI_API void             ig_LabelTextV(CONST char* label, CONST char* fmt, va
 CIMGUI_API void             ig_Bullet();
 CIMGUI_API void             ig_BulletText(CONST char* fmt, ...);
 CIMGUI_API void             ig_BulletTextV(CONST char* fmt, va_list args);
-CIMGUI_API bool             ig_Button(CONST char* label, CONST struct ImVec2 size, bool repeat_when_held);
+CIMGUI_API bool             ig_Button(CONST char* label, CONST struct ImVec2 size);
 CIMGUI_API bool             ig_SmallButton(CONST char* label);
 CIMGUI_API bool             ig_InvisibleButton(CONST char* str_id, CONST struct ImVec2 size);
 CIMGUI_API void             ig_Image(ImTextureID user_texture_id, CONST struct ImVec2 size, CONST struct ImVec2 uv0, CONST struct ImVec2 uv1, CONST struct ImVec4 tint_col, CONST struct ImVec4 border_col);
@@ -169,9 +169,9 @@ CIMGUI_API bool             ig_ColorButton(CONST struct ImVec4 col, bool small_h
 CIMGUI_API bool             ig_ColorEdit3(CONST char* label, float col[3]);
 CIMGUI_API bool             ig_ColorEdit4(CONST char* label, float col[4], bool show_alpha);
 CIMGUI_API void             ig_ColorEditMode(ImGuiColorEditMode mode);
-CIMGUI_API void             ig_PlotLines(CONST char* label, CONST float* values, int values_count, int values_offset, CONST char* overlay_text, float scale_min, float scale_max, struct ImVec2 graph_size, size_t stride);
+CIMGUI_API void             ig_PlotLines(CONST char* label, CONST float* values, int values_count, int values_offset, CONST char* overlay_text, float scale_min, float scale_max, struct ImVec2 graph_size, int stride);
 CIMGUI_API void             ig_PlotLines2(CONST char* label, float(*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, CONST char* overlay_text, float scale_min, float scale_max, struct ImVec2 graph_size);
-CIMGUI_API void             ig_PlotHistogram(CONST char* label, CONST float* values, int values_count, int values_offset, CONST char* overlay_text, float scale_min, float scale_max, struct ImVec2 graph_size, size_t stride);
+CIMGUI_API void             ig_PlotHistogram(CONST char* label, CONST float* values, int values_count, int values_offset, CONST char* overlay_text, float scale_min, float scale_max, struct ImVec2 graph_size, int stride);
 CIMGUI_API void             ig_PlotHistogram2(CONST char* label, float(*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, CONST char* overlay_text, float scale_min, float scale_max, struct ImVec2 graph_size);
 
 // Widgets: Sliders (tip: ctrl+click on a slider to input text)
@@ -192,22 +192,25 @@ CIMGUI_API bool             ig_DragFloat(CONST char* label, float* v, float v_sp
 CIMGUI_API bool             ig_DragFloat2(CONST char* label, float v[2], float v_speed, float v_min, float v_max, CONST char* display_format, float power);
 CIMGUI_API bool             ig_DragFloat3(CONST char* label, float v[3], float v_speed, float v_min, float v_max, CONST char* display_format, float power);
 CIMGUI_API bool             ig_DragFloat4(CONST char* label, float v[4], float v_speed, float v_min, float v_max, CONST char* display_format, float power);
+CIMGUI_API bool             ig_DragFloatRange2(const char* label, float* v_current_min, float* v_current_max, float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* display_format = "%.3f", const char* display_format_max = NULL, float power = 1.0f);
 CIMGUI_API bool             ig_DragInt(CONST char* label, int* v, float v_speed, int v_min, int v_max, CONST char* display_format);                                       // If v_max >= v_max we have no bound
 CIMGUI_API bool             ig_DragInt2(CONST char* label, int v[2], float v_speed, int v_min, int v_max, CONST char* display_format);
 CIMGUI_API bool             ig_DragInt3(CONST char* label, int v[3], float v_speed, int v_min, int v_max, CONST char* display_format);
 CIMGUI_API bool             ig_DragInt4(CONST char* label, int v[4], float v_speed, int v_min, int v_max, CONST char* display_format);
+CIMGUI_API bool             ig_DragIntRange2(const char* label, int* v_current_min, int* v_current_max, float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* display_format = "%.0f", const char* display_format_max = NULL);
 
 
 // Widgets: Input
 CIMGUI_API bool             ig_InputText(CONST char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiTextEditCallback callback, void* user_data);
+CIMGUI_API bool             ig_InputTextMultiline(CONST char* label, char* buf, size_t buf_size, CONST ImVec2 size, ImGuiInputTextFlags flags, ImGuiTextEditCallback callback, void* user_data);
 CIMGUI_API bool             ig_InputFloat(CONST char* label, float* v, float step, float step_fast, int decimal_precision, ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool             ig_InputFloat2(CONST char* label, float v[2], int decimal_precision);
-CIMGUI_API bool             ig_InputFloat3(CONST char* label, float v[3], int decimal_precision);
-CIMGUI_API bool             ig_InputFloat4(CONST char* label, float v[4], int decimal_precision);
+CIMGUI_API bool             ig_InputFloat2(CONST char* label, float v[2], int decimal_precision, ImGuiInputTextFlags extra_flags);
+CIMGUI_API bool             ig_InputFloat3(CONST char* label, float v[3], int decimal_precision, ImGuiInputTextFlags extra_flags);
+CIMGUI_API bool             ig_InputFloat4(CONST char* label, float v[4], int decimal_precision, ImGuiInputTextFlags extra_flags);
 CIMGUI_API bool             ig_InputInt(CONST char* label, int* v, int step, int step_fast, ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool             ig_InputInt2(CONST char* label, int v[2]);
-CIMGUI_API bool             ig_InputInt3(CONST char* label, int v[3]);
-CIMGUI_API bool             ig_InputInt4(CONST char* label, int v[4]);
+CIMGUI_API bool             ig_InputInt2(CONST char* label, int v[2], ImGuiInputTextFlags extra_flags);
+CIMGUI_API bool             ig_InputInt3(CONST char* label, int v[3], ImGuiInputTextFlags extra_flags);
+CIMGUI_API bool             ig_InputInt4(CONST char* label, int v[4], ImGuiInputTextFlags extra_flags);
 
 // Widgets: Trees
 CIMGUI_API bool             ig_TreeNode(CONST char* str_label_id);
@@ -221,8 +224,8 @@ CIMGUI_API void             ig_TreePop();
 CIMGUI_API void             ig_SetNextTreeNodeOpened(bool opened, ImGuiSetCond cond);
 
 // Widgets: Selectable / Lists
-CIMGUI_API bool             ig_Selectable(CONST char* label, bool selected, CONST struct ImVec2 size);
-CIMGUI_API bool             ig_SelectableEx(CONST char* label, bool* p_selected, CONST struct ImVec2 size);
+CIMGUI_API bool             ig_Selectable(CONST char* label, bool selected, ImGuiSelectableFlags flags, CONST ImVec2 size);
+CIMGUI_API bool             ig_SelectableEx(CONST char* label, bool* p_selected, ImGuiSelectableFlags flags, CONST ImVec2 size);
 CIMGUI_API bool             ig_ListBox(CONST char* label, int* current_item, CONST char** items, int items_count, int height_in_items);
 CIMGUI_API bool             ig_ListBox2(CONST char* label, int* current_item, bool(*items_getter)(void* data, int idx, CONST char** out_text), void* data, int items_count, int height_in_items);
 CIMGUI_API bool             ig_ListBoxHeader(CONST char* label, CONST struct ImVec2 size);
@@ -237,6 +240,32 @@ CIMGUI_API void             ig_ValueFloat(CONST char* prefix, float v, CONST cha
 CIMGUI_API void             ig_Color(CONST char* prefix, CONST struct ImVec4 v);
 CIMGUI_API void             ig_Color2(CONST char* prefix, unsigned int v);
 
+// Tooltip
+CIMGUI_API void             ig_SetTooltip(CONST char* fmt, ...);
+CIMGUI_API void             ig_SetTooltipV(CONST char* fmt, va_list args);
+CIMGUI_API void             ig_BeginTooltip();
+CIMGUI_API void             ig_EndTooltip();
+
+// Widgets: Menus
+CIMGUI_API bool             ig_BeginMainMenuBar();
+CIMGUI_API void             ig_EndMainMenuBar();
+CIMGUI_API bool             ig_BeginMenuBar();
+CIMGUI_API void             ig_EndMenuBar();
+CIMGUI_API bool             ig_BeginMenu(CONST char* label, bool enabled);
+CIMGUI_API void             ig_EndMenu();
+CIMGUI_API bool             ig_MenuItem(CONST char* label, CONST char* shortcut, bool selected, bool enabled);
+CIMGUI_API bool             ig_MenuItemPtr(CONST char* label, CONST char* shortcut, bool* p_selected, bool enabled);
+
+// Popup
+CIMGUI_API void             ig_OpenPopup(CONST char* str_id);
+CIMGUI_API bool             ig_BeginPopup(CONST char* str_id);
+CIMGUI_API bool             ig_BeginPopupModal(CONST char* name, bool* p_opened, ImGuiWindowFlags extra_flags);
+CIMGUI_API bool             ig_BeginPopupContextItem(CONST char* str_id, int mouse_button);
+CIMGUI_API bool             ig_BeginPopupContextWindow(bool also_over_items, CONST char* str_id, int mouse_button);
+CIMGUI_API bool             ig_BeginPopupContextVoid(CONST char* str_id, int mouse_button);
+CIMGUI_API void             ig_EndPopup();
+CIMGUI_API void             ig_CloseCurrentPopup();
+
 // Logging: all text output from interface is redirected to tty/file/clipboard. Tree nodes are automatically opened.
 CIMGUI_API void             ig_LogToTTY(int max_depth);
 CIMGUI_API void             ig_LogToFile(int max_depth, CONST char* filename);
@@ -249,28 +278,18 @@ CIMGUI_API void             ig_LogText(CONST char* fmt, ...);
 CIMGUI_API bool             ig_IsItemHovered();
 CIMGUI_API bool             ig_IsItemHoveredRect();
 CIMGUI_API bool             ig_IsItemActive();
-CIMGUI_API bool             ig_IsAnyItemActive();
 CIMGUI_API bool             ig_IsItemVisible();
+CIMGUI_API bool             ig_IsAnyItemHovered();
+CIMGUI_API bool             ig_IsAnyItemActive();
 CIMGUI_API void             ig_GetItemRectMin(struct ImVec2* pOut);
 CIMGUI_API void             ig_GetItemRectMax(struct ImVec2* pOut);
 CIMGUI_API void             ig_GetItemRectSize(struct ImVec2* pOut);
+CIMGUI_API bool             ig_IsWindowHovered();
 CIMGUI_API bool             ig_IsWindowFocused();
 CIMGUI_API bool             ig_IsRootWindowFocused();
 CIMGUI_API bool             ig_IsRootWindowOrAnyChildFocused();
-CIMGUI_API bool             ig_IsRectClipped(CONST struct ImVec2 item_size);
-CIMGUI_API bool             ig_IsKeyPressed(int key_index, bool repeat);
-CIMGUI_API bool             ig_IsMouseClicked(int button, bool repeat);
-CIMGUI_API bool             ig_IsMouseDoubleClicked(int button);
-CIMGUI_API bool             ig_IsMouseHoveringWindow();
-CIMGUI_API bool             ig_IsMouseHoveringAnyWindow();
-CIMGUI_API bool             ig_IsMouseHoveringRect(CONST struct ImVec2 rect_min, CONST struct ImVec2 rect_max);
-CIMGUI_API bool             ig_IsMouseDragging(int button, float lock_threshold);
+CIMGUI_API bool             ig_IsRectVisible(CONST struct ImVec2 item_size);
 CIMGUI_API bool             ig_IsPosHoveringAnyWindow(CONST struct ImVec2 pos);
-CIMGUI_API void             ig_GetMousePos(struct ImVec2* pOut);
-CIMGUI_API void             ig_GetMouseDragDelta(struct ImVec2* pOut, int button, float lock_threshold);
-CIMGUI_API void             ig_ResetMouseDragDelta(int button);
-CIMGUI_API ImGuiMouseCursor ig_GetMouseCursor();
-CIMGUI_API void             ig_SetMouseCursor(ImGuiMouseCursor type);
 CIMGUI_API float            ig_GetTime();
 CIMGUI_API int              ig_GetFrameCount();
 CIMGUI_API CONST char*      ig_GetStyleColName(ImGuiCol idx);
@@ -278,13 +297,30 @@ CIMGUI_API void             ig_CalcItemRectClosestPoint(struct ImVec2* pOut, CON
 CIMGUI_API void             ig_CalcTextSize(struct ImVec2* pOut, CONST char* text, CONST char* text_end, bool hide_text_after_double_hash, float wrap_width);
 CIMGUI_API void             ig_CalcListClipping(int items_count, float items_height, int* out_items_display_start, int* out_items_display_end);
 
-CIMGUI_API void             ig_BeginChildFrame(ImGuiID id, CONST struct ImVec2 size);
+CIMGUI_API bool             ig_BeginChildFrame(ImGuiID id, CONST struct ImVec2 size);
 CIMGUI_API void             ig_EndChildFrame();
 
 CIMGUI_API ImU32            ig_ColorConvertFloat4ToU32(CONST struct ImVec4 in);
 CIMGUI_API void             ig_ColorConvertRGBtoHSV(float r, float g, float b, float* out_h, float* out_s, float* out_v);
 CIMGUI_API void             ig_ColorConvertHSVtoRGB(float h, float s, float v, float* out_r, float* out_g, float* out_b);
 
+CIMGUI_API bool             ig_IsKeyDown(int key_index);
+CIMGUI_API bool             ig_IsKeyPressed(int key_index, bool repeat);
+CIMGUI_API bool             ig_IsKeyReleased(int key_index);
+CIMGUI_API bool             ig_IsMouseDown(int button);
+CIMGUI_API bool             ig_IsMouseClicked(int button, bool repeat);
+CIMGUI_API bool             ig_IsMouseDoubleClicked(int button);
+CIMGUI_API bool             ig_IsMouseReleased(int button);
+CIMGUI_API bool             ig_IsMouseHoveringWindow();
+CIMGUI_API bool             ig_IsMouseHoveringAnyWindow();
+CIMGUI_API bool             ig_IsMouseHoveringRect(CONST struct ImVec2 rect_min, CONST struct ImVec2 rect_max);
+CIMGUI_API bool             ig_IsMouseDragging(int button, float lock_threshold);
+CIMGUI_API void             ig_GetMousePos(struct ImVec2* pOut);
+CIMGUI_API void             ig_GetMouseDragDelta(struct ImVec2* pOut, int button, float lock_threshold);
+CIMGUI_API void             ig_ResetMouseDragDelta(int button);
+CIMGUI_API ImGuiMouseCursor ig_GetMouseCursor();
+CIMGUI_API void             ig_SetMouseCursor(ImGuiMouseCursor type);
+
 // Internal state access - if you want to share ImGui state between modules (e.g. DLL) or allocate it yourself
 CIMGUI_API CONST char*      ig_GetVersion();
 CIMGUI_API void*            ig_GetInternalState();
@@ -296,7 +332,7 @@ CIMGUI_API void             ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* atlas, u
 CIMGUI_API void             ImFontAtlas_SetTexID(ImFontAtlas* atlas, void* tex);
 CIMGUI_API ImFont*          ImFontAtlas_AddFontDefault(ImFontAtlas* atlas);
 CIMGUI_API ImFont*          ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas, CONST char* filename, float size_pixels, CONST ImWchar* glyph_ranges, int font_no);
-CIMGUI_API ImFont*          ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* in_ttf_data, unsigned int in_ttf_data_size, float size_pixels, CONST ImWchar* glyph_ranges, int font_no);
-CIMGUI_API ImFont*          ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, CONST void* in_compressed_ttf_data, unsigned int in_compressed_ttf_data_size, float size_pixels, CONST ImWchar* glyph_ranges = NULL, int font_no = 0);
+CIMGUI_API ImFont*          ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* ttf_data, int ttf_size, float size_pixels, CONST ImWchar* glyph_ranges, int font_no);
+CIMGUI_API ImFont*          ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, CONST void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, CONST ImWchar* glyph_ranges, int font_no);
 CIMGUI_API void             ImFontAtlas_ClearTexData(ImFontAtlas* atlas);
 CIMGUI_API void             ImFontAtlas_Clear(ImFontAtlas* atlas);

cimgui/fontAtlas.cpp

@@ -22,19 +22,19 @@ CIMGUI_API ImFont* ImFontAtlas_AddFontDefault(ImFontAtlas* atlas)
 	return atlas->AddFontDefault();
 }
 
-CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas,const char* filename, float size_pixels, const ImWchar* glyph_ranges, int font_no)
+CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas,CONST char* filename, float size_pixels, CONST ImWchar* glyph_ranges, int font_no)
 {
 	return atlas->AddFontFromFileTTF(filename, size_pixels, glyph_ranges, font_no);
 }
 
-CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* in_ttf_data, unsigned int in_ttf_data_size, float size_pixels, const ImWchar* glyph_ranges, int font_no)
+CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* ttf_data, int ttf_size, float size_pixels, CONST ImWchar* glyph_ranges, int font_no)
 {
-	return atlas->AddFontFromMemoryTTF(in_ttf_data, in_ttf_data_size, size_pixels, glyph_ranges, font_no);
+	return atlas->AddFontFromMemoryTTF(ttf_data, ttf_size, size_pixels, glyph_ranges, font_no);
 }
 
-CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, const void* in_compressed_ttf_data, unsigned int in_compressed_ttf_data_size, float size_pixels, const ImWchar* glyph_ranges, int font_no)
+CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, CONST void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, CONST ImWchar* glyph_ranges, int font_no)
 {
-	return atlas->AddFontFromMemoryCompressedTTF(in_compressed_ttf_data, in_compressed_ttf_data_size, size_pixels, glyph_ranges, font_no);	
+	return atlas->AddFontFromMemoryCompressedTTF(compressed_ttf_data, compressed_ttf_size, size_pixels, glyph_ranges, font_no);	
 }
 
 CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* atlas)