Merge branch 'master' into drag_and_drop

This commit is contained in:
omar
2017-11-19 16:23:37 +01:00
5 changed files with 130 additions and 98 deletions

View File

@ -815,7 +815,6 @@ namespace ImGui
IMGUI_API void BringWindowToBack(ImGuiWindow* window);
IMGUI_API void Initialize();
IMGUI_API void EndFrame(); // Ends the ImGui frame. Automatically called by Render()! you most likely don't need to ever call that yourself directly. If you don't need to render you can call EndFrame() but you'll have wasted CPU already. If you don't need to render, don't create any windows instead!
IMGUI_API void SetActiveID(ImGuiID id, ImGuiWindow* window);
IMGUI_API void ClearActiveID();