Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_t…

…extedit.h, and stb_rect_pack.h to imstb_rectpack.h. (#1718, #2036) If you were conveniently using the imgui copy of those STB headers in your project, you will have to update your include paths. The reason for this change is to avoid conflicts for projects that may also be importing their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified.
ocornut · Sep 6, 2018 · 5a679a4 · 5a679a4
1 parent e58bc3d
commit 5a679a4
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 6 deletions.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -34,7 +34,12 @@ HOW TO UPDATE?
 
 Breaking Changes:
 
-- Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427)
+- Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and
+  stb_rect_pack.h to imstb_rectpack.h. If you were conveniently using the imgui copy of those
+  STB headers in your project, you will have to update your include paths. (#1718, #2036)
+  The reason for this change is to avoid conflicts for projects that may also be importing
+  their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified.
+- Renamed io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427)
 
 Other Changes:
 

diff --git a/imgui.cpp b/imgui.cpp
@@ -342,6 +342,8 @@ CODE
  When you are not sure about a old symbol or function name, try using the Search/Find function of your IDE to look for comments or references in all imgui files.
  You can read releases logs https://github.com/ocornut/imgui/releases for more details.
 
+ - 2018/09/06 (1.65) - renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h. 
+                       If you were conveniently using the imgui copy of those STB headers in your project you will have to update your include paths.
  - 2018/09/05 (1.65) - renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427)
  - 2018/08/31 (1.64) - added imgui_widgets.cpp file, extracted and moved widgets code out of imgui.cpp into imgui_widgets.cpp. Re-ordered some of the code remaining in imgui.cpp.
                        NONE OF THE FUNCTIONS HAVE CHANGED. THE CODE IS SEMANTICALLY 100% IDENTICAL, BUT _EVERY_ FUNCTION HAS BEEN MOVED.

diff --git a/imgui_draw.cpp b/imgui_draw.cpp
@@ -119,7 +119,7 @@ namespace IMGUI_STB_NAMESPACE
 #ifdef IMGUI_STB_RECT_PACK_FILENAME
 #include IMGUI_STB_RECT_PACK_FILENAME
 #else
-#include "stb_rect_pack.h"
+#include "imstb_rectpack.h"
 #endif
 #endif
 
@@ -142,7 +142,7 @@ namespace IMGUI_STB_NAMESPACE
 #ifdef IMGUI_STB_TRUETYPE_FILENAME
 #include IMGUI_STB_TRUETYPE_FILENAME
 #else
-#include "stb_truetype.h"
+#include "imstb_truetype.h"
 #endif
 #endif
 

diff --git a/imgui_internal.h b/imgui_internal.h
@@ -76,7 +76,7 @@ namespace ImGuiStb
 #define STB_TEXTEDIT_STRING             ImGuiInputTextState
 #define STB_TEXTEDIT_CHARTYPE           ImWchar
 #define STB_TEXTEDIT_GETWIDTH_NEWLINE   -1.0f
-#include "stb_textedit.h"
+#include "imstb_textedit.h"
 
 } // namespace ImGuiStb
 

diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
@@ -2960,7 +2960,7 @@ static bool STB_TEXTEDIT_INSERTCHARS(STB_TEXTEDIT_STRING* obj, int pos, const Im
 #define STB_TEXTEDIT_K_SHIFT        0x20000
 
 #define STB_TEXTEDIT_IMPLEMENTATION
-#include "stb_textedit.h"
+#include "imstb_textedit.h"
 
 }
 

diff --git a/stb_rect_pack.h → imstb_rectpack.h b/stb_rect_pack.h → imstb_rectpack.h
diff --git a/stb_textedit.h → imstb_textedit.h b/stb_textedit.h → imstb_textedit.h
diff --git a/stb_truetype.h → imstb_truetype.h b/stb_truetype.h → imstb_truetype.h
diff --git a/misc/freetype/imgui_freetype.cpp b/misc/freetype/imgui_freetype.cpp
@@ -244,7 +244,7 @@ namespace
 #define STBRP_ASSERT(x)    IM_ASSERT(x)
 #define STBRP_STATIC
 #define STB_RECT_PACK_IMPLEMENTATION
-#include "stb_rect_pack.h"
+#include "imstb_rectpack.h"
 
 bool ImGuiFreeType::BuildFontAtlas(ImFontAtlas* atlas, unsigned int extra_flags)
 {