From 8d5a08e8d054e9504ca31e0bfbfff7a1018c23c0 Mon Sep 17 00:00:00 2001 From: crupest Date: Sat, 10 Nov 2018 15:53:32 +0800 Subject: Refactor predefine resources. Add check for dead recursion in singletons in debug mode. --- src/ui/controls/text_block.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/ui/controls/text_block.cpp') diff --git a/src/ui/controls/text_block.cpp b/src/ui/controls/text_block.cpp index 290ddd58..8276ce4e 100644 --- a/src/ui/controls/text_block.cpp +++ b/src/ui/controls/text_block.cpp @@ -1,13 +1,12 @@ #include "text_block.hpp" -#include "ui/window.hpp" -#include "ui/predefine.hpp" +#include "ui/ui_manager.hpp" namespace cru::ui::controls { TextBlock::TextBlock() : TextControl( - predefine::GetPredefineResourceComPtr(predefine::key_text_block_text_format), - predefine::GetPredefineResourceComPtr(predefine::key_text_block_text_brush) + UiManager::GetInstance()->GetPredefineResources()->text_block_text_format, + UiManager::GetInstance()->GetPredefineResources()->text_block_text_brush ) { -- cgit v1.2.3