From e5bea65582bf8adf6fc05dfb22aa1aed5e43999d Mon Sep 17 00:00:00 2001 From: ocornut Date: Wed, 8 Jul 2015 12:59:26 -0600 Subject: [PATCH 1/4] Version number 1.42 --- imgui.cpp | 2 +- imgui.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 9e93dfdf..8b10090d 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -1,4 +1,4 @@ -// ImGui library v1.42 wip +// ImGui library v1.42 // See ImGui::ShowTestWindow() for sample code. // Read 'Programmer guide' below for notes on how to setup ImGui in your codebase. // Get latest version at https://github.com/ocornut/imgui diff --git a/imgui.h b/imgui.h index 5a516c0d..7f08743a 100644 --- a/imgui.h +++ b/imgui.h @@ -1,4 +1,4 @@ -// ImGui library v1.42 wip +// ImGui library v1.42 // See .cpp file for documentation. // See ImGui::ShowTestWindow() for sample code. // Read 'Programmer guide' in .cpp for notes on how to setup ImGui in your codebase. @@ -15,7 +15,7 @@ #include // NULL, malloc, free, qsort, atoi #include // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp -#define IMGUI_VERSION "1.42 wip" +#define IMGUI_VERSION "1.42" // Define assertion handler. #ifndef IM_ASSERT From d81ba432ecc86f40bd4f0c972bbc002258f04fb1 Mon Sep 17 00:00:00 2001 From: omar Date: Wed, 8 Jul 2015 13:22:34 -0600 Subject: [PATCH 2/4] New demo binaries --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f211b31..ad2d21ff 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Demo ---- You should be able to build the examples from sources (tested on Windows/Mac/Linux). If you don't, let me know! If you want to have a quick look at the features of ImGui, you can download binaries of the demo app here. -- [imgui-demo-binaries-20150531.zip](http://www.miracleworld.net/imgui/binaries/imgui-demo-binaries-20150531.zip) (Windows binaries, ImGui 1.40 WIP 2015/05/31, 4 executables, 432 KB) +- [imgui-demo-binaries-20150708.zip](http://www.miracleworld.net/imgui/binaries/imgui-demo-binaries-20150708.zip) (Windows binaries, ImGui 1.42 2015/07/08, 4 executables, 456 KB) Gallery From f4aae6b9ec2fee40c402057cc12004471fd8a19a Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Thu, 9 Jul 2015 00:00:28 +0200 Subject: [PATCH 3/4] fix minor clang-x64 warnings fixes #265 --- imgui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 8b10090d..44fd0818 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -10864,7 +10864,7 @@ void ImGui::ShowTestWindow(bool* opened) { ImFont* font = ImGui::GetIO().Fonts->Fonts[i]; ImGui::BulletText("Font %d: %.2f pixels, %d glyphs", i, font->FontSize, font->Glyphs.Size); - ImGui::TreePush((void*)i); + ImGui::TreePush((void*)(size_t)i); ImGui::PushFont(font); ImGui::Text("The quick brown fox jumps over the lazy dog"); ImGui::PopFont(); @@ -10905,7 +10905,7 @@ void ImGui::ShowTestWindow(bool* opened) { for (int i = 0; i < 5; i++) { - if (ImGui::TreeNode((void*)i, "Child %d", i)) + if (ImGui::TreeNode((void*)(size_t)i, "Child %d", i)) { ImGui::Text("blah blah"); ImGui::SameLine(); From fec09e37ab85fe99f190bad7f54bfd4dbc697f0e Mon Sep 17 00:00:00 2001 From: ocornut Date: Wed, 8 Jul 2015 17:05:24 -0600 Subject: [PATCH 4/4] Disable warnings, undo f4aae6b9ec2fee40c402057cc12004471fd8a19a (#265 #266) --- imgui.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 44fd0818..85b5ee32 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -454,9 +454,11 @@ #pragma clang diagnostic ignored "-Wsign-conversion" // warning : implicit conversion changes signedness // #pragma clang diagnostic ignored "-Wmissing-noreturn" // warning : function xx could be declared with attribute 'noreturn' warning // GetDefaultFontData() asserts which some implementation makes it never return. #pragma clang diagnostic ignored "-Wdeprecated-declarations"// warning : 'xx' is deprecated: The POSIX name for this item.. // for strdup used in demo code (so user can copy & paste the code) +#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning : cast to 'void *' from smaller integer type 'int' #endif #ifdef __GNUC__ #pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used +#pragma GCC diagnostic ignored "-Wint-to-pointer-cast" // warning: cast to pointer from integer of different size #endif //------------------------------------------------------------------------- @@ -10864,7 +10866,7 @@ void ImGui::ShowTestWindow(bool* opened) { ImFont* font = ImGui::GetIO().Fonts->Fonts[i]; ImGui::BulletText("Font %d: %.2f pixels, %d glyphs", i, font->FontSize, font->Glyphs.Size); - ImGui::TreePush((void*)(size_t)i); + ImGui::TreePush((void*)i); ImGui::PushFont(font); ImGui::Text("The quick brown fox jumps over the lazy dog"); ImGui::PopFont(); @@ -10905,7 +10907,7 @@ void ImGui::ShowTestWindow(bool* opened) { for (int i = 0; i < 5; i++) { - if (ImGui::TreeNode((void*)(size_t)i, "Child %d", i)) + if (ImGui::TreeNode((void*)i, "Child %d", i)) { ImGui::Text("blah blah"); ImGui::SameLine();