Merge branch 'master' into issue4-dev

1 files changed, 20 insertions, 0 deletions

diff --git a/src/ui/controls/text_block.cpp b/src/ui/controls/text_block.cpp
new file mode 100644
index 00000000..30ffbef9
--- /dev/null
+++ b/src/ui/controls/text_block.cpp
@@ -0,0 +1,20 @@
+#include "text_block.h"
+
+#include "ui/window.h"
+#include "graph/graph.h"
+#include "exception.h"
+
+namespace cru
+{
+    namespace ui
+    {
+        namespace controls
+        {
+            TextBlock::TextBlock(const Microsoft::WRL::ComPtr<IDWriteTextFormat>& init_text_format,
+                const Microsoft::WRL::ComPtr<ID2D1Brush>& init_brush) : TextControl(init_text_format, init_brush)
+            {
+
+            }
+        }
+    }
+}