diff options
author | 杨宇千 <crupest@outlook.com> | 2018-11-13 17:18:18 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-13 17:18:18 +0800 |
commit | 91dda866a0919f9e6cfb5e7857ac0466572d96d8 (patch) | |
tree | c3b5fc6afeb4dad0de65212d1dae38940706a58a /src/ui/controls/text_box.cpp | |
parent | 92bec65a76b62bbbee56b44c3020171606bb8bbb (diff) | |
parent | 97c35edea2ca67a06ba66f124b94ea62f0519def (diff) | |
download | cru-91dda866a0919f9e6cfb5e7857ac0466572d96d8.tar.gz cru-91dda866a0919f9e6cfb5e7857ac0466572d96d8.tar.bz2 cru-91dda866a0919f9e6cfb5e7857ac0466572d96d8.zip |
Merge pull request #17 from crupest/cppmerge-init
Add c++ source merge tools.
Diffstat (limited to 'src/ui/controls/text_box.cpp')
-rw-r--r-- | src/ui/controls/text_box.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/ui/controls/text_box.cpp b/src/ui/controls/text_box.cpp index fd357fdb..6eeb7abb 100644 --- a/src/ui/controls/text_box.cpp +++ b/src/ui/controls/text_box.cpp @@ -5,16 +5,10 @@ #include "graph/graph.hpp" #include "exception.hpp" -#include "application.hpp" #include "ui/ui_manager.hpp" namespace cru::ui::controls { - inline Microsoft::WRL::ComPtr<IDWriteFactory> GetDWriteFactory() - { - return graph::GraphManager::GetInstance()->GetDWriteFactory(); - } - TextBox::TextBox() : TextControl( UiManager::GetInstance()->GetPredefineResources()->text_box_text_format, UiManager::GetInstance()->GetPredefineResources()->text_box_text_brush |