mirror of
				https://github.com/ocornut/imgui.git
				synced 2025-11-04 01:34:32 +00:00 
			
		
		
		
	Removed obsolete GetDefaultFontData() function that would assert anyway (obsoleted 2015/01/11)
This commit is contained in:
		
							
								
								
									
										13
									
								
								imgui.cpp
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								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
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								imgui.h
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								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+
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user