1 files changed, 5 insertions, 3 deletions
diff --git a/src/win/native/ui_application.cpp b/src/win/native/ui_application.cpp
index 75fce6ce..9ab61551 100644
--- a/src/win/native/ui_application.cpp
+++ b/src/win/native/ui_application.cpp
@@ -103,13 +103,15 @@ std::vector<INativeWindow*> WinUiApplication::GetAllWindow() {
   return result;
 }
 
-INativeWindow* WinUiApplication::CreateWindow(INativeWindow* parent) {
+std::shared_ptr<INativeWindowResolver> WinUiApplication::CreateWindow(
+    INativeWindow* parent) {
   WinNativeWindow* p = nullptr;
   if (parent != nullptr) {
     p = CheckPlatform<WinNativeWindow>(parent, GetPlatformId());
   }
-  return new WinNativeWindow(this, window_manager_->GetGeneralWindowClass(),
-                             WS_OVERLAPPEDWINDOW, p);
+  return (new WinNativeWindow(this, window_manager_->GetGeneralWindowClass(),
+                              WS_OVERLAPPEDWINDOW, p))
+      ->GetResolver();
 }
 
 cru::platform::graph::IGraphFactory* WinUiApplication::GetGraphFactory() {