Merge branch 'master' into 2016-07-navigation

2017-01-11 21:03:25 +01:00
parent bb4d19ff7c 6257b5814a
commit c76be71acf
5 changed files with 28 additions and 21 deletions
@@ -799,6 +799,7 @@ namespace ImGui

    IMGUI_API void          SetActiveID(ImGuiID id, ImGuiWindow* window);
    IMGUI_API void          SetActiveIDNoNav(ImGuiID id, ImGuiWindow* window);
+	IMGUI_API void          ClearActiveID();
    IMGUI_API void          SetHoveredID(ImGuiID id);
    IMGUI_API void          KeepAliveID(ImGuiID id);