Widget Example added
This commit is contained in:
parent
b2f5c0193a
commit
f3bc272eae
5 changed files with 12 additions and 5 deletions
|
|
@ -32,7 +32,7 @@ tp::MemHead* tp::HeapAllocGlobal::mEntry = nullptr;
|
||||||
tp::ualni tp::HeapAllocGlobal::mNumAllocations = 0;
|
tp::ualni tp::HeapAllocGlobal::mNumAllocations = 0;
|
||||||
std::mutex tp::HeapAllocGlobal::mMutex;
|
std::mutex tp::HeapAllocGlobal::mMutex;
|
||||||
bool tp::HeapAllocGlobal::mIgnore = true;
|
bool tp::HeapAllocGlobal::mIgnore = true;
|
||||||
bool tp::HeapAllocGlobal::mEnableCallstack = false;
|
bool tp::HeapAllocGlobal::mEnableCallstack = true;
|
||||||
|
|
||||||
#ifdef MEM_STACK_TRACE
|
#ifdef MEM_STACK_TRACE
|
||||||
tp::CallStackCapture tp::HeapAllocGlobal::mCallstack;
|
tp::CallStackCapture tp::HeapAllocGlobal::mCallstack;
|
||||||
|
|
@ -57,6 +57,8 @@ namespace tp {
|
||||||
uhalni mIgnored;
|
uhalni mIgnored;
|
||||||
#ifdef MEM_STACK_TRACE
|
#ifdef MEM_STACK_TRACE
|
||||||
const CallStackCapture::CallStack* mCallStack;
|
const CallStackCapture::CallStack* mCallStack;
|
||||||
|
#else
|
||||||
|
void* p;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ set(CMAKE_CXX_STANDARD 20)
|
||||||
|
|
||||||
# set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/./tmp/install)
|
# set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/./tmp/install)
|
||||||
# set(CMAKE_CXX_FLAGS "-fuse-ld=lld-15 ${CMAKE_CXX_FLAGS} -gdwarf-4 ")
|
# set(CMAKE_CXX_FLAGS "-fuse-ld=lld-15 ${CMAKE_CXX_FLAGS} -gdwarf-4 ")
|
||||||
add_compile_definitions(MEM_DEBUG)
|
|
||||||
|
|
||||||
project(ModulesRoot)
|
project(ModulesRoot)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
option(MODULES_MEMORY_DEBUG "Debug memory" ON)
|
option(MODULES_MEMORY_DEBUG "Debug memory" OFF)
|
||||||
option(MODULES_MEMORY_DEBUG_STACK_TRACE "Record stack info on memory debug" ON)
|
option(MODULES_MEMORY_DEBUG_STACK_TRACE "Record stack info on memory debug" OFF)
|
||||||
|
|
||||||
set(WINDOWS_LIBRARIES "../../ModulesWindowsLibraries" CACHE STRING "Svn repository with windows libraries https://svn.riouxsvn.com/moduleswindowsl")
|
set(WINDOWS_LIBRARIES "../../ModulesWindowsLibraries" CACHE STRING "Svn repository with windows libraries https://svn.riouxsvn.com/moduleswindowsl")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,11 @@
|
||||||
|
|
||||||
#include "WidgetBase.hpp"
|
#include "WidgetBase.hpp"
|
||||||
|
|
||||||
|
#include "Graphics.hpp"
|
||||||
|
|
||||||
namespace tp {
|
namespace tp {
|
||||||
GlobalGUIConfig* gGlobalGUIConfig = nullptr;
|
GlobalGUIConfig* gGlobalGUIConfig = nullptr;
|
||||||
|
|
||||||
ModuleManifest* deps[] = { &gModuleStrings, nullptr };
|
ModuleManifest* deps[] = { &gModuleGraphics, &gModuleStrings, nullptr };
|
||||||
ModuleManifest gModuleWidgets = ModuleManifest("Widgets", nullptr, nullptr, deps);
|
ModuleManifest gModuleWidgets = ModuleManifest("Widgets", nullptr, nullptr, deps);
|
||||||
}
|
}
|
||||||
|
|
@ -66,6 +66,10 @@ namespace tp {
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, WidgetConfig> configs;
|
Map<String, WidgetConfig> configs;
|
||||||
|
|
||||||
|
~GlobalGUIConfig() {
|
||||||
|
configs.removeAll();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
extern GlobalGUIConfig* gGlobalGUIConfig;
|
extern GlobalGUIConfig* gGlobalGUIConfig;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue