Some changes to match the ImGui upstream changes
Some changes to match the ImGui upstream changes

Flix01/imgui,Flix01/imgui,tom-seddon/imgui,wflohry/imgui-addons,tom-seddon/imgui,Flix01/imgui,wflohry/imgui-addons