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

Conflicts:
	imgui.cpp
This commit is contained in:
ocornut
2015-02-04 09:30:03 +01:00
2 changed files with 141 additions and 118 deletions

View File

@ -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();