@ -1063,11 +1063,11 @@ ImGuiContext* GImGui = NULL;
// If you use DLL hotreloading you might need to call SetAllocatorFunctions() after reloading code from this file.
// Otherwise, you probably don't want to modify them mid-program, and if you use global/static e.g. ImVector<> instances you may need to keep them accessible during program destruction.
# ifndef IMGUI_DISABLE_DEFAULT_ALLOCATORS
static void * MallocWrapper ( size_t size , void * user_data ) { ( void ) user_data ; return malloc ( size ) ; }
static void FreeWrapper ( void * ptr , void * user_data ) { ( void ) user_data ; free ( ptr ) ; }
static void * MallocWrapper ( size_t size , void * user_data ) { IM_UNUSED ( user_data ) ; return malloc ( size ) ; }
static void FreeWrapper ( void * ptr , void * user_data ) { IM_UNUSED ( user_data ) ; free ( ptr ) ; }
# else
static void * MallocWrapper ( size_t size , void * user_data ) { ( void ) user_data ; ( void ) size ; IM_ASSERT ( 0 ) ; return NULL ; }
static void FreeWrapper ( void * ptr , void * user_data ) { ( void ) user_data ; ( void ) ptr ; IM_ASSERT ( 0 ) ; }
static void * MallocWrapper ( size_t size , void * user_data ) { IM_UNUSED ( user_data ) ; IM_UNUSED ( size ) ; IM_ASSERT ( 0 ) ; return NULL ; }
static void FreeWrapper ( void * ptr , void * user_data ) { IM_UNUSED ( user_data ) ; IM_UNUSED ( ptr ) ; IM_ASSERT ( 0 ) ; }
# endif
static void * ( * GImAllocatorAllocFunc ) ( size_t size , void * user_data ) = MallocWrapper ;
@ -2706,9 +2706,9 @@ void ImGui::MarkItemEdited(ImGuiID id)
{
// This marking is solely to be able to provide info for IsItemDeactivatedAfterEdit().
// ActiveId might have been released by the time we call this (as in the typical press/release button behavior) but still need need to fill the data.
( void ) id ; // Avoid unused variable warnings when asserts are compiled out.
ImGuiContext & g = * GImGui ;
IM_ASSERT ( g . ActiveId = = id | | g . ActiveId = = 0 | | g . DragDropActive ) ;
IM_UNUSED ( id ) ; // Avoid unused variable warnings when asserts are compiled out.
//IM_ASSERT(g.CurrentWindow->DC.LastItemId == id);
g . ActiveIdHasBeenEdited = true ;
g . CurrentWindow - > DC . LastItemStatusFlags | = ImGuiItemStatusFlags_Edited ;
@ -6918,7 +6918,7 @@ bool ImGui::BeginPopupModal(const char* name, bool* p_open, ImGuiWindowFlags fla
void ImGui : : EndPopup ( )
{
ImGuiContext & g = * GImGui ; ( void ) g ;
ImGuiContext & g = * GImGui ;
IM_ASSERT ( g . CurrentWindow - > Flags & ImGuiWindowFlags_Popup ) ; // Mismatched BeginPopup()/EndPopup() calls
IM_ASSERT ( g . BeginPopupStack . Size > 0 ) ;