From 962dc18ee4827b464764ec3708be3d00a9143971 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 21 Mar 2019 22:22:02 +0800 Subject: ... --- src/ui/controls/flex_layout.hpp | 4 ++-- src/ui/controls/text_block.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ui/controls') diff --git a/src/ui/controls/flex_layout.hpp b/src/ui/controls/flex_layout.hpp index 682ed8dc..2ab3e259 100644 --- a/src/ui/controls/flex_layout.hpp +++ b/src/ui/controls/flex_layout.hpp @@ -1,7 +1,7 @@ #pragma once #include "pre.hpp" -#include "ui/control.hpp" +#include "ui/layout_control.hpp" namespace cru::ui::render { class FlexLayoutRenderObject; @@ -9,7 +9,7 @@ class FlexLayoutRenderObject; namespace cru::ui::controls { -class FlexLayout : public Layout { +class FlexLayout : public LayoutControl { public: static constexpr auto control_type = L"FlexLayout"; diff --git a/src/ui/controls/text_block.hpp b/src/ui/controls/text_block.hpp index c345c5ab..4c443020 100644 --- a/src/ui/controls/text_block.hpp +++ b/src/ui/controls/text_block.hpp @@ -1,7 +1,7 @@ #pragma once #include "pre.hpp" -#include "ui/control.hpp" +#include "ui/no_child_control.hpp" namespace cru::ui::render { class TextRenderObject; -- cgit v1.2.3