mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks to "Memory override" pull request

This commit is contained in:
ocornut 2014-08-31 12:02:22 +01:00
parent 22a9555a99
commit c07ab1b56a
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
imconfig.h
View File

@ -5,16 +5,9 @@
#pragma once #pragma once
//---- Define your own malloc/free/realloc functions if you want to override internal memory allocations for ImGui //---- Define your own malloc/free/realloc functions if you want to override internal memory allocations for ImGui
/* //#define IM_MALLOC(_SIZE) MyMalloc(_SIZE) // void* MyMalloc(size_t size);
#define IM_MALLOC(_SIZE) MyMalloc(_SIZE) //#define IM_FREE(_PTR) MyFree(_PTR) // void MyFree(void *ptr);
#define IM_FREE(_PTR) MyFree(_PTR) //#define IM_REALLOC(_PTR, _SIZE) MyRealloc(_PTR, _SIZE) // void* MyRealloc(void *ptr, size_t size);
#define IM_REALLOC(_PTR, _SIZE) MyRealloc(_PTR, _SIZE)
#include <stdlib.h> // size_t
void* MyMalloc(size_t size);
void MyFree(void *ptr);
void* MyRealloc(void *ptr, size_t size);
*/
//---- Define your own ImVector<> type if you don't want to use the provided implementation defined in imgui.h //---- Define your own ImVector<> type if you don't want to use the provided implementation defined in imgui.h
//#include <vector> //#include <vector>

3
imgui.cpp
View File

@ -194,7 +194,6 @@
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen #pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
#endif #endif
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// Forward Declarations // Forward Declarations
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@ -666,7 +665,7 @@ struct ImGuiState
// Logging // Logging
bool LogEnabled; bool LogEnabled;
FILE* LogFile; FILE* LogFile;
ImGuiTextBuffer* LogClipboard; ImGuiTextBuffer* LogClipboard; // pointer so our GImGui static constructor doesn't call heap allocators.
int LogAutoExpandMaxDepth; int LogAutoExpandMaxDepth;
ImGuiState() ImGuiState()

3
imgui.h
View File

@ -17,7 +17,7 @@ struct ImGuiWindow;
#include "imconfig.h" #include "imconfig.h"
#include <float.h> // FLT_MAX #include <float.h> // FLT_MAX
#include <stdarg.h> // va_list #include <stdarg.h> // va_list
#include <stdlib.h> // NULL #include <stdlib.h> // NULL, malloc
#ifndef IM_MALLOC #ifndef IM_MALLOC
#define IM_MALLOC(_SIZE) malloc((_SIZE)) #define IM_MALLOC(_SIZE) malloc((_SIZE))
@ -70,7 +70,6 @@ struct ImVec4
// std::vector<> like class to avoid dragging dependencies (also: windows implementation of STL with debug enabled is absurdly slow, so let's bypass it so our code runs fast in debug). // std::vector<> like class to avoid dragging dependencies (also: windows implementation of STL with debug enabled is absurdly slow, so let's bypass it so our code runs fast in debug).
// this implementation does NOT call c++ constructors! we don't need them! also only provide the minimum functionalities we need. // this implementation does NOT call c++ constructors! we don't need them! also only provide the minimum functionalities we need.
#ifndef ImVector #ifndef ImVector
template<typename T> template<typename T>
class ImVector class ImVector
{ {