From fb80cc0cfe910288bb13e8cadf7e7a91e6683dd1 Mon Sep 17 00:00:00 2001
From: unknown <stephan.dilly@stephan-dilly.office.innogames.net>
Date: Wed, 12 Aug 2015 21:12:57 +0200
Subject: [PATCH] update to imgui cleanup release 1.44

---
 cimgui/cimgui.cpp             | 5 +++++
 cimgui/cimgui.h               | 2 ++
 cimgui/cimgui.vcxproj         | 3 +++
 cimgui/cimgui.vcxproj.filters | 9 +++++++++
 cimgui/fontAtlas.cpp          | 5 +++++
 imgui                         | 2 +-
 6 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/cimgui/cimgui.cpp b/cimgui/cimgui.cpp
index 6d6e12a..0cf0baa 100644
--- a/cimgui/cimgui.cpp
+++ b/cimgui/cimgui.cpp
@@ -84,6 +84,11 @@ CIMGUI_API void igGetContentRegionMax(ImVec2* out)
     *out = ImGui::GetContentRegionMax();
 }
 
+CIMGUI_API void	igGetContentRegionAvail(struct ImVec2* out)
+{
+	*out = ImGui::GetContentRegionAvail();
+}
+
 CIMGUI_API void igGetWindowContentRegionMin(ImVec2* out)
 {
     *out = ImGui::GetWindowContentRegionMin();
diff --git a/cimgui/cimgui.h b/cimgui/cimgui.h
index f57969a..4e8b5f7 100644
--- a/cimgui/cimgui.h
+++ b/cimgui/cimgui.h
@@ -41,6 +41,7 @@ CIMGUI_API bool             igBeginChild(CONST char* str_id, CONST struct ImVec2
 CIMGUI_API bool             igBeginChildEx(ImGuiID id, CONST struct ImVec2 size, bool border, ImGuiWindowFlags extra_flags);
 CIMGUI_API void             igEndChild();
 CIMGUI_API void             igGetContentRegionMax(struct ImVec2* out);
+CIMGUI_API void             igGetContentRegionAvail(struct ImVec2* out);
 CIMGUI_API void             igGetWindowContentRegionMin(struct ImVec2* out);
 CIMGUI_API void             igGetWindowContentRegionMax(struct ImVec2* out);
 CIMGUI_API ImDrawList*      igGetWindowDrawList();
@@ -335,6 +336,7 @@ CIMGUI_API ImFont*          ImFontAtlas_AddFontDefault(ImFontAtlas* atlas, CONST
 CIMGUI_API ImFont*          ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* atlas, CONST char* filename, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges);
 CIMGUI_API ImFont*          ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* atlas, void* ttf_data, int ttf_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges);
 CIMGUI_API ImFont*          ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas, CONST void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges);
+CIMGUI_API ImFont*          ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(ImFontAtlas* atlas, CONST char* compressed_ttf_data_base85, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges);
 CIMGUI_API void             ImFontAtlas_ClearTexData(ImFontAtlas* atlas);
 CIMGUI_API void             ImFontAtlas_Clear(ImFontAtlas* atlas);
 
diff --git a/cimgui/cimgui.vcxproj b/cimgui/cimgui.vcxproj
index dcd3fbc..f8a8364 100644
--- a/cimgui/cimgui.vcxproj
+++ b/cimgui/cimgui.vcxproj
@@ -77,11 +77,14 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\imgui\imgui.cpp" />
+    <ClCompile Include="..\imgui\imgui_demo.cpp" />
+    <ClCompile Include="..\imgui\imgui_draw.cpp" />
     <ClCompile Include="cimgui.cpp" />
     <ClCompile Include="drawList.cpp" />
     <ClCompile Include="fontAtlas.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\imgui\imgui_internal.h" />
     <ClInclude Include="cimgui.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/cimgui/cimgui.vcxproj.filters b/cimgui/cimgui.vcxproj.filters
index ea0acef..8c2106f 100644
--- a/cimgui/cimgui.vcxproj.filters
+++ b/cimgui/cimgui.vcxproj.filters
@@ -27,10 +27,19 @@
     <ClCompile Include="drawList.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\imgui\imgui_draw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\imgui\imgui_demo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="cimgui.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\imgui\imgui_internal.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/cimgui/fontAtlas.cpp b/cimgui/fontAtlas.cpp
index fce9ee7..b7dd9b5 100644
--- a/cimgui/fontAtlas.cpp
+++ b/cimgui/fontAtlas.cpp
@@ -42,6 +42,11 @@ CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* atlas
 	return atlas->AddFontFromMemoryCompressedTTF(compressed_ttf_data, compressed_ttf_size, size_pixels, font_cfg, glyph_ranges);
 }
 
+CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(ImFontAtlas* atlas, CONST char* compressed_ttf_data_base85, float size_pixels, CONST ImFontConfig* font_cfg, CONST ImWchar* glyph_ranges)
+{
+	return atlas->AddFontFromMemoryCompressedBase85TTF(compressed_ttf_data_base85, size_pixels, font_cfg, glyph_ranges);
+}
+
 CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* atlas)
 {
 	return atlas->ClearTexData();
diff --git a/imgui b/imgui
index e8cb874..a99ba42 160000
--- a/imgui
+++ b/imgui
@@ -1 +1 @@
-Subproject commit e8cb874afeface49c20fdb39c6972f91df1c6d37
+Subproject commit a99ba42a39d5caf03098224308e1875a849c7934