kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-08-16 14:28:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct definitions in 1.60

Browse Source
This commit is contained in:
sonoro1234
2018-02-26 21:09:52 +01:00
parent 9b0b571506
commit 527fc6a7be
2 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cimgui/cimgui.cpp
View File

@@ -36,10 +36,6 @@ CIMGUI_API void igEndFrame()
ImGui::EndFrame();
}
CIMGUI_API void igShutdown()
{
ImGui::Shutdown();
}
CIMGUI_API void igShowUserGuide()
{
@@ -183,7 +179,7 @@ CIMGUI_API void igSetNextWindowSize(CONST ImVec2 size, ImGuiCond cond)
ImGui::SetNextWindowSize(size, cond);
}
CIMGUI_API void igSetNextWindowSizeConstraints(CONST struct ImVec2 size_min, CONST struct ImVec2 size_max, ImGuiSizeConstraintCallback custom_callback, void *custom_callback_data)
CIMGUI_API void igSetNextWindowSizeConstraints(CONST struct ImVec2 size_min, CONST struct ImVec2 size_max, ImGuiSizeCallback custom_callback, void *custom_callback_data)
{
ImGui::SetNextWindowSizeConstraints(size_min, size_max, custom_callback, custom_callback_data);
}
@@ -1310,9 +1306,9 @@ CIMGUI_API void igLogText(CONST char *fmt, ...)
ImGui::LogText("%s", buffer);
}
CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags, int mouse_button)
CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags)
{
return ImGui::BeginDragDropSource(flags, mouse_button);
return ImGui::BeginDragDropSource(flags);
}
CIMGUI_API bool igSetDragDropPayload(CONST char *type, CONST void *data, size_t size, ImGuiCond cond)
@@ -1651,9 +1647,9 @@ CIMGUI_API CONST char *igGetVersion()
return ImGui::GetVersion();
}
CIMGUI_API ImGuiContext *igCreateContext(void *(*malloc_fn)(size_t), void (*free_fn)(void *))
CIMGUI_API ImGuiContext *igCreateContext(struct ImFontAtlas* shared_font_atlas)
{
return ImGui::CreateContext(malloc_fn, free_fn);
return ImGui::CreateContext(shared_font_atlas);
}
CIMGUI_API void igDestroyContext(ImGuiContext *ctx)