From 562aecdaa5b15dac8fa2cdee2569a5ee5a453004 Mon Sep 17 00:00:00 2001 From: ocornut Date: Sun, 5 Jul 2015 20:56:01 -0600 Subject: [PATCH] Removed obsolete GetDefaultFontData() function that would assert anyway (obsoleted 2015/01/11) --- imgui.cpp | 13 ------------- imgui.h | 1 - 2 files changed, 14 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 6373b4ada..380f4dc87 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -9414,19 +9414,6 @@ void ImFontAtlas::Clear() ClearFonts(); } -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS -void ImGui::GetDefaultFontData(const void** fnt_data, unsigned int* fnt_size, const void** png_data, unsigned int* png_size) -{ - printf("GetDefaultFontData() is obsoleted in ImGui 1.30.\n"); - printf("Please use ImGui::GetIO().Fonts->GetTexDataAsRGBA32() or GetTexDataAsAlpha8() functions to retrieve uncompressed texture data.\n"); - if (fnt_data) *fnt_data = NULL; - if (fnt_size) *fnt_size = 0; - if (png_data) *png_data = NULL; - if (png_size) *png_size = 0; - IM_ASSERT(false); -} -#endif - void ImFontAtlas::GetTexDataAsAlpha8(unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel) { // Lazily build diff --git a/imgui.h b/imgui.h index 46fc13b5c..a278ea718 100644 --- a/imgui.h +++ b/imgui.h @@ -407,7 +407,6 @@ namespace ImGui // Obsolete (will be removed) #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - IMGUI_API void GetDefaultFontData(const void** fnt_data, unsigned int* fnt_size, const void** png_data, unsigned int* png_size); // OBSOLETE 1.30+ static inline void OpenNextNode(bool open) { ImGui::SetNextTreeNodeOpened(open, 0); } // OBSOLETE 1.34+ static inline bool GetWindowIsFocused() { return ImGui::IsWindowFocused(); } // OBSOLETE 1.36+ static inline bool GetWindowCollapsed() { return ImGui::IsWindowCollapsed(); } // OBSOLETE 1.39+