Merge pull request #16 from not-fl3/master

update cimgui to 1.47
This commit is contained in:
Joonas Javanainen 2016-01-18 20:57:19 +02:00
commit aa23b36556
3 changed files with 3 additions and 2 deletions

View File

@ -212,7 +212,7 @@ bitflags!(
const ImGuiInputTextFlags_NoHorizontalScroll = 1 << 12,
const ImGuiInputTextFlags_AlwaysInsertMode = 1 << 13,
const ImGuiInputTextFlags_ReadOnly = 1 << 14,
const ImGuiInputTextFlags_Password = 1 << 15,
const ImGuiInputTextFlags_Multiline = 1 << 20,
}
);

@ -1 +1 @@
Subproject commit b936bb33693664e2056a441668d118976060f8ae
Subproject commit d358ce52f230a1afd628b992b5f3423bf9d41cde

View File

@ -25,6 +25,7 @@ pub use imgui_sys::{
ImGuiInputTextFlags_AllowTabInput, ImGuiInputTextFlags_CtrlEnterForNewLine,
ImGuiInputTextFlags_NoHorizontalScroll, ImGuiInputTextFlags_AlwaysInsertMode,
ImGuiInputTextFlags_ReadOnly,
ImGuiInputTextFlags_Password,
ImGuiSetCond,
ImGuiSetCond_Always, ImGuiSetCond_Once,
ImGuiSetCond_FirstUseEver, ImGuiSetCond_Appearing,