6 files changed, 14 insertions, 14 deletions
diff --git a/include/cru/ui/controls/Button.hpp b/include/cru/ui/controls/Button.hpp
index 8a11409c..a4f727d6 100644
--- a/include/cru/ui/controls/Button.hpp
+++ b/include/cru/ui/controls/Button.hpp
@@ -7,7 +7,7 @@
 namespace cru::ui::controls {
 class Button : public ContentControl {
  public:
-  static constexpr std::string_view control_type = "Button";
+  static constexpr std::u16string_view control_type = u"Button";
 
   static Button* Create() { return new Button(); }
 
@@ -21,7 +21,7 @@ class Button : public ContentControl {
   Button& operator=(Button&& other) = delete;
   ~Button() override;
 
-  std::string_view GetControlType() const final { return control_type; }
+  std::u16string_view GetControlType() const final { return control_type; }
 
   render::RenderObject* GetRenderObject() const override;
 
diff --git a/include/cru/ui/controls/Container.hpp b/include/cru/ui/controls/Container.hpp
index e3d78365..304d402c 100644
--- a/include/cru/ui/controls/Container.hpp
+++ b/include/cru/ui/controls/Container.hpp
@@ -3,7 +3,7 @@
 
 namespace cru::ui::controls {
 class Container : public ContentControl {
-  static constexpr std::string_view control_type = "Container";
+  static constexpr std::u16string_view control_type = u"Container";
 
  protected:
   Container();
@@ -15,7 +15,7 @@ class Container : public ContentControl {
   ~Container() override;
 
  public:
-  std::string_view GetControlType() const final { return control_type; }
+  std::u16string_view GetControlType() const final { return control_type; }
 
   render::RenderObject* GetRenderObject() const override;
 
diff --git a/include/cru/ui/controls/FlexLayout.hpp b/include/cru/ui/controls/FlexLayout.hpp
index 3d6087c2..87162569 100644
--- a/include/cru/ui/controls/FlexLayout.hpp
+++ b/include/cru/ui/controls/FlexLayout.hpp
@@ -4,7 +4,7 @@
 namespace cru::ui::controls {
 class FlexLayout : public LayoutControl {
  public:
-  static constexpr std::string_view control_type = "FlexLayout";
+  static constexpr std::u16string_view control_type = u"FlexLayout";
 
   static FlexLayout* Create() { return new FlexLayout(); }
 
@@ -18,7 +18,7 @@ class FlexLayout : public LayoutControl {
   FlexLayout& operator=(FlexLayout&& other) = delete;
   ~FlexLayout() override;
 
-  std::string_view GetControlType() const final { return control_type; }
+  std::u16string_view GetControlType() const final { return control_type; }
 
   render::RenderObject* GetRenderObject() const override;
 
diff --git a/include/cru/ui/controls/StackLayout.hpp b/include/cru/ui/controls/StackLayout.hpp
index d5998cc4..c0b95044 100644
--- a/include/cru/ui/controls/StackLayout.hpp
+++ b/include/cru/ui/controls/StackLayout.hpp
@@ -4,7 +4,7 @@
 namespace cru::ui::controls {
 class StackLayout : public LayoutControl {
  public:
-  static constexpr std::string_view control_type = "StackLayout";
+  static constexpr std::u16string_view control_type = u"StackLayout";
 
   static StackLayout* Create() { return new StackLayout(); }
 
@@ -17,7 +17,7 @@ class StackLayout : public LayoutControl {
 
   ~StackLayout() override;
 
-  std::string_view GetControlType() const final { return control_type; }
+  std::u16string_view GetControlType() const final { return control_type; }
 
   render::RenderObject* GetRenderObject() const override;
 
diff --git a/include/cru/ui/controls/TextBlock.hpp b/include/cru/ui/controls/TextBlock.hpp
index 1b1b4a5c..8a9a3bff 100644
--- a/include/cru/ui/controls/TextBlock.hpp
+++ b/include/cru/ui/controls/TextBlock.hpp
@@ -7,7 +7,7 @@ class TextControlService;
 
 class TextBlock : public NoChildControl {
  public:
-  static constexpr std::string_view control_type = "TextBlock";
+  static constexpr std::u16string_view control_type = u"TextBlock";
 
   static TextBlock* Create() { return new TextBlock(); }
 
@@ -21,12 +21,12 @@ class TextBlock : public NoChildControl {
   TextBlock& operator=(TextBlock&& other) = delete;
   ~TextBlock() override;
 
-  std::string_view GetControlType() const final { return control_type; }
+  std::u16string_view GetControlType() const final { return control_type; }
 
   render::RenderObject* GetRenderObject() const override;
 
-  std::string GetText() const;
-  void SetText(std::string text);
+  std::u16string GetText() const;
+  void SetText(std::u16string text);
 
   gsl::not_null<render::TextRenderObject*> GetTextRenderObject();
   render::ScrollRenderObject* GetScrollRenderObject() { return nullptr; }
diff --git a/include/cru/ui/controls/TextBox.hpp b/include/cru/ui/controls/TextBox.hpp
index 3d4de7c0..5976f6da 100644
--- a/include/cru/ui/controls/TextBox.hpp
+++ b/include/cru/ui/controls/TextBox.hpp
@@ -10,7 +10,7 @@ class TextControlService;
 
 class TextBox : public NoChildControl {
  public:
-  static constexpr std::string_view control_type = "TextBox";
+  static constexpr std::u16string_view control_type = u"TextBox";
 
   static TextBox* Create() { return new TextBox(); }
 
@@ -23,7 +23,7 @@ class TextBox : public NoChildControl {
 
   ~TextBox() override;
 
-  std::string_view GetControlType() const final { return control_type; }
+  std::u16string_view GetControlType() const final { return control_type; }
 
   render::RenderObject* GetRenderObject() const override;