Merge branch 'master' of https://github.com/jtilander/imgui into jtilander-master

Conflicts: imgui.cpp
2015-02-04 09:30:03 +01:00
parent 4e33787c2f 087ded0c71
commit e36fad65dd
2 changed files with 141 additions and 118 deletions
@@ -146,6 +146,9 @@ public:
 namespace ImGui
 {
    // Main
+    IMGUI_API void*         GetInternalState();
+    IMGUI_API unsigned      GetInternalStateSize();
+    IMGUI_API void          SetInternalState(void* state, bool construct = false);
    IMGUI_API ImGuiIO&      GetIO();
    IMGUI_API ImGuiStyle&   GetStyle();
    IMGUI_API void          NewFrame();