From 73f13dd60f51ff05e31a64fba89fe31ab3ab185d Mon Sep 17 00:00:00 2001
From: 杨宇千 <crupest@outlook.com>
Date: Sun, 15 Sep 2019 00:03:11 +0800
Subject: ...

---
 include/cru/platform/native/cursor.hpp          |  2 +
 include/cru/platform/native/ui_applicaition.hpp | 58 -------------------------
 include/cru/platform/native/ui_application.hpp  | 58 +++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 58 deletions(-)
 delete mode 100644 include/cru/platform/native/ui_applicaition.hpp
 create mode 100644 include/cru/platform/native/ui_application.hpp

(limited to 'include/cru/platform/native')

diff --git a/include/cru/platform/native/cursor.hpp b/include/cru/platform/native/cursor.hpp
index b0ff4494..b8604ecb 100644
--- a/include/cru/platform/native/cursor.hpp
+++ b/include/cru/platform/native/cursor.hpp
@@ -34,4 +34,6 @@ class CursorManager : public NativeResource {
 
   //TODO: Add method to create cursor.
 };
+
+std::shared_ptr<Cursor> GetSystemCursor(SystemCursor type);
 }  // namespace cru::platform::native
diff --git a/include/cru/platform/native/ui_applicaition.hpp b/include/cru/platform/native/ui_applicaition.hpp
deleted file mode 100644
index 923fbaf7..00000000
--- a/include/cru/platform/native/ui_applicaition.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-#include "../native_resource.hpp"
-
-#include "cursor.hpp"
-
-#include <chrono>
-#include <functional>
-#include <vector>
-
-namespace cru::platform::native {
-class NativeWindow;
-
-// The entry point of a ui application.
-// It will call IGraphFactory::CreateInstance during its creation
-// and set graph factory to be auto deleted. If you want to keep
-// the graph factory then you should manually set it to false after
-// creating the ui application.
-class UiApplication : public NativeResource {
- public:
-  // Create a platform-specific instance and save it as the global instance.
-  // Do not create the instance twice. Implements should assert for that.
-  // After creating, get the instance by GetInstance.
-  static UiApplication* CreateInstance();
-
-  // Get the global instance. If it is not created, then return nullptr.
-  static UiApplication* GetInstance();
-
- protected:
-  UiApplication() = default;
-
- public:
-  UiApplication(const UiApplication& other) = delete;
-  UiApplication& operator=(const UiApplication& other) = delete;
-
-  UiApplication(UiApplication&& other) = delete;
-  UiApplication& operator=(UiApplication&& other) = delete;
-
-  ~UiApplication() override = default;
-
- public:
-  virtual int Run() = 0;
-  virtual void Quit(int quite_code) = 0;
-
-  virtual void AddOnQuitHandler(const std::function<void()>& handler) = 0;
-
-  virtual void InvokeLater(const std::function<void()>& action) = 0;
-  virtual unsigned long SetTimeout(std::chrono::milliseconds milliseconds,
-                                   const std::function<void()>& action) = 0;
-  virtual unsigned long SetInterval(std::chrono::milliseconds milliseconds,
-                                    const std::function<void()>& action) = 0;
-  virtual void CancelTimer(unsigned long id) = 0;
-
-  virtual std::vector<NativeWindow*> GetAllWindow() = 0;
-  virtual NativeWindow* CreateWindow(NativeWindow* parent) = 0;
-
-  virtual CursorManager* GetCursorManager() = 0;
-};
-}  // namespace cru::platform::native
diff --git a/include/cru/platform/native/ui_application.hpp b/include/cru/platform/native/ui_application.hpp
new file mode 100644
index 00000000..923fbaf7
--- /dev/null
+++ b/include/cru/platform/native/ui_application.hpp
@@ -0,0 +1,58 @@
+#pragma once
+#include "../native_resource.hpp"
+
+#include "cursor.hpp"
+
+#include <chrono>
+#include <functional>
+#include <vector>
+
+namespace cru::platform::native {
+class NativeWindow;
+
+// The entry point of a ui application.
+// It will call IGraphFactory::CreateInstance during its creation
+// and set graph factory to be auto deleted. If you want to keep
+// the graph factory then you should manually set it to false after
+// creating the ui application.
+class UiApplication : public NativeResource {
+ public:
+  // Create a platform-specific instance and save it as the global instance.
+  // Do not create the instance twice. Implements should assert for that.
+  // After creating, get the instance by GetInstance.
+  static UiApplication* CreateInstance();
+
+  // Get the global instance. If it is not created, then return nullptr.
+  static UiApplication* GetInstance();
+
+ protected:
+  UiApplication() = default;
+
+ public:
+  UiApplication(const UiApplication& other) = delete;
+  UiApplication& operator=(const UiApplication& other) = delete;
+
+  UiApplication(UiApplication&& other) = delete;
+  UiApplication& operator=(UiApplication&& other) = delete;
+
+  ~UiApplication() override = default;
+
+ public:
+  virtual int Run() = 0;
+  virtual void Quit(int quite_code) = 0;
+
+  virtual void AddOnQuitHandler(const std::function<void()>& handler) = 0;
+
+  virtual void InvokeLater(const std::function<void()>& action) = 0;
+  virtual unsigned long SetTimeout(std::chrono::milliseconds milliseconds,
+                                   const std::function<void()>& action) = 0;
+  virtual unsigned long SetInterval(std::chrono::milliseconds milliseconds,
+                                    const std::function<void()>& action) = 0;
+  virtual void CancelTimer(unsigned long id) = 0;
+
+  virtual std::vector<NativeWindow*> GetAllWindow() = 0;
+  virtual NativeWindow* CreateWindow(NativeWindow* parent) = 0;
+
+  virtual CursorManager* GetCursorManager() = 0;
+};
+}  // namespace cru::platform::native
-- 
cgit v1.2.3