6 files changed, 12 insertions, 12 deletions
diff --git a/src/platform/gui/UiApplication.cpp b/src/platform/gui/UiApplication.cpp
index 7bc27847..ac93a57d 100644
--- a/src/platform/gui/UiApplication.cpp
+++ b/src/platform/gui/UiApplication.cpp
@@ -24,11 +24,11 @@ IMenu* IUiApplication::GetApplicationMenu() { return nullptr; }
 
 std::optional<String> IUiApplication::ShowSaveDialog(
     SaveDialogOptions options) {
-  throw Exception(u"Not implemented.");
+  throw Exception("Not implemented.");
 }
 
 std::optional<std::vector<String>> IUiApplication::ShowOpenDialog(
     OpenDialogOptions options) {
-  throw Exception(u"Not implemented.");
+  throw Exception("Not implemented.");
 }
 }  // namespace cru::platform::gui
diff --git a/src/platform/gui/osx/Cursor.mm b/src/platform/gui/osx/Cursor.mm
index ec364fa7..9c25fdbd 100644
--- a/src/platform/gui/osx/Cursor.mm
+++ b/src/platform/gui/osx/Cursor.mm
@@ -24,7 +24,7 @@ OsxCursorPrivate::OsxCursorPrivate(OsxCursor* cursor, SystemCursorType cursor_ty
       ns_cursor_ = [NSCursor IBeamCursor];
       break;
     default:
-      throw Exception(u"Unknown system cursor type.");
+      throw Exception("Unknown system cursor type.");
   }
 }
 
@@ -87,7 +87,7 @@ std::shared_ptr<ICursor> OsxCursorManager::GetSystemCursor(SystemCursorType type
     case SystemCursorType::IBeam:
       return p_->ibeam_cursor_;
     default:
-      throw Exception(u"Unknown system cursor type.");
+      throw Exception("Unknown system cursor type.");
   }
 }
 }  // namespace cru::platform::gui::osx
diff --git a/src/platform/gui/osx/Keyboard.mm b/src/platform/gui/osx/Keyboard.mm
index 8a419009..da4c85f0 100644
--- a/src/platform/gui/osx/Keyboard.mm
+++ b/src/platform/gui/osx/Keyboard.mm
@@ -260,7 +260,7 @@ NSString* ConvertKeyCodeToKeyEquivalent(KeyCode key_code) {
     CRU_DEFINE_KEYCODE_MAP(KeyCode::Backspace, @"\x08")
     CRU_DEFINE_KEYCODE_MAP(KeyCode::Delete, @"\x7F")
     default:
-      throw Exception(u"Failed to convert key code to key equivalent string.");
+      throw Exception("Failed to convert key code to key equivalent string.");
   }
 #undef CRU_DEFINE_KEYCODE_MAP
 }
diff --git a/src/platform/gui/osx/Window.mm b/src/platform/gui/osx/Window.mm
index 6559cf70..7381ca55 100644
--- a/src/platform/gui/osx/Window.mm
+++ b/src/platform/gui/osx/Window.mm
@@ -64,7 +64,7 @@ void OsxWindowPrivate::OnWindowWillClose() {
     bool quit = true;
 
     for (auto window : all_window) {
-      auto w = CheckPlatform<OsxWindow>(window, osx_window_->GetPlatformId());
+      auto w = CheckPlatform<OsxWindow>(window, osx_window_->GetPlatformIdUtf8());
       if (w->p_->window_) {
         quit = false;
         break;
@@ -179,7 +179,7 @@ void OsxWindowPrivate::CreateWindow() {
   [window_ setDelegate:window_delegate_];
 
   if (parent_) {
-    auto parent = CheckPlatform<OsxWindow>(parent_, this->osx_window_->GetPlatformId());
+    auto parent = CheckPlatform<OsxWindow>(parent_, this->osx_window_->GetPlatformIdUtf8());
     [window_ setParentWindow:parent->p_->window_];
   }
 
@@ -231,7 +231,7 @@ void OsxWindow::Close() {
 INativeWindow* OsxWindow::GetParent() { return p_->parent_; }
 
 void OsxWindow::SetParent(INativeWindow* parent) {
-  auto p = CheckPlatform<OsxWindow>(parent, GetPlatformId());
+  auto p = CheckPlatform<OsxWindow>(parent, GetPlatformIdUtf8());
 
   p_->parent_ = parent;
 
@@ -366,7 +366,7 @@ bool OsxWindow::CaptureMouse() { return true; }
 bool OsxWindow::ReleaseMouse() { return true; }
 
 void OsxWindow::SetCursor(std::shared_ptr<ICursor> cursor) {
-  p_->cursor_ = CheckPlatform<OsxCursor>(cursor, GetPlatformId());
+  p_->cursor_ = CheckPlatform<OsxCursor>(cursor, GetPlatformIdUtf8());
   p_->UpdateCursor();
 }
 
diff --git a/src/platform/gui/win/Window.cpp b/src/platform/gui/win/Window.cpp
index eeb2cde4..5739d0f3 100644
--- a/src/platform/gui/win/Window.cpp
+++ b/src/platform/gui/win/Window.cpp
@@ -79,7 +79,7 @@ void WinNativeWindow::Close() {
 }
 
 void WinNativeWindow::SetParent(INativeWindow* parent) {
-  auto p = CheckPlatform<WinNativeWindow>(parent, GetPlatformId());
+  auto p = CheckPlatform<WinNativeWindow>(parent, GetPlatformIdUtf8());
   parent_window_ = p;
 
   if (hwnd_) {
@@ -228,7 +228,7 @@ void WinNativeWindow::SetCursor(std::shared_ptr<ICursor> cursor) {
     throw std::runtime_error("Can't use a nullptr as cursor.");
   }
 
-  cursor_ = CheckPlatform<WinCursor>(cursor, GetPlatformId());
+  cursor_ = CheckPlatform<WinCursor>(cursor, GetPlatformIdUtf8());
 
   if (hwnd_) return;
 
diff --git a/src/platform/gui/xcb/Window.cpp b/src/platform/gui/xcb/Window.cpp
index 6a5857fc..6458046b 100644
--- a/src/platform/gui/xcb/Window.cpp
+++ b/src/platform/gui/xcb/Window.cpp
@@ -271,7 +271,7 @@ bool XcbWindow::ReleaseMouse() {
 
 void XcbWindow::SetCursor(std::shared_ptr<ICursor> cursor) {
   if (!xcb_window_) return;
-  auto xcb_cursor = CheckPlatform<XcbCursor>(cursor, GetPlatformId());
+  auto xcb_cursor = CheckPlatform<XcbCursor>(cursor, GetPlatformIdUtf8());
   cursor_ = xcb_cursor;
   DoSetCursor(*xcb_window_, xcb_cursor.get());
 }