2 files changed, 12 insertions, 9 deletions
diff --git a/include/cru/win/native/win_application.hpp b/include/cru/win/native/win_application.hpp
index 5bdb753e..d3e705e1 100644
--- a/include/cru/win/native/win_application.hpp
+++ b/include/cru/win/native/win_application.hpp
@@ -11,14 +11,12 @@ class TimerManager;
 class WindowManager;
 
 class WinApplication : public Object,
-                       public virtual platform::native::UiApplication {
+                       public virtual platform::native::IUiApplication {
+  friend IUiApplication* IUiApplication::CreateInstance();
  public:
   static WinApplication* GetInstance();
 
  private:
-  static WinApplication* instance;
-
- private:
   explicit WinApplication(HINSTANCE h_instance);
 
  public:
@@ -41,9 +39,12 @@ class WinApplication : public Object,
                             const std::function<void()>& action) override;
   void CancelTimer(unsigned long id) override;
 
-  std::vector<platform::native::NativeWindow*> GetAllWindow() override;
-  platform::native::NativeWindow* CreateWindow(
-      platform::native::NativeWindow* parent) override;
+  std::vector<platform::native::INativeWindow*> GetAllWindow() override;
+  platform::native::INativeWindow* CreateWindow(
+      platform::native::INativeWindow* parent) override;
+
+  bool IsAutoDelete() const override { return auto_delete_; }
+  void SetAutoDelete(bool value) override { auto_delete_ = value; }
 
   HINSTANCE GetInstanceHandle() const { return h_instance_; }
 
@@ -52,6 +53,8 @@ class WinApplication : public Object,
   WindowManager* GetWindowManager() const { return window_manager_.get(); }
 
  private:
+  bool auto_delete_ = false;
+
   HINSTANCE h_instance_;
 
   std::shared_ptr<GodWindow> god_window_;
diff --git a/include/cru/win/native/win_native_window.hpp b/include/cru/win/native/win_native_window.hpp
index 272ca14b..0fafc7fd 100644
--- a/include/cru/win/native/win_native_window.hpp
+++ b/include/cru/win/native/win_native_window.hpp
@@ -13,7 +13,7 @@ class WindowManager;
 class WindowRenderTarget;
 
 class WinNativeWindow : public Object,
-                        public virtual platform::native::NativeWindow {
+                        public virtual platform::native::INativeWindow {
  public:
   WinNativeWindow(WinApplication* application,
                   std::shared_ptr<WindowClass> window_class, DWORD window_style,
@@ -29,7 +29,7 @@ class WinNativeWindow : public Object,
 
   void Close() override;
 
-  NativeWindow* GetParent() override { return parent_window_; }
+  INativeWindow* GetParent() override { return parent_window_; }
 
   bool IsVisible() override;
   void SetVisible(bool is_visible) override;