mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +00:00
Merge branch 'master' of https://github.com/jtilander/imgui into jtilander-master
Conflicts: imgui.cpp
This commit is contained in:
commit
e36fad65dd
2 changed files with 141 additions and 118 deletions
3
imgui.h
3
imgui.h
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue