From e69911a8b161b81ce3f7b209175766da2b7b3d4b Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 12 Dec 2019 19:53:17 +0800 Subject: ... --- include/cru/win/native/native_window.hpp | 2 +- include/cru/win/native/platform_id.hpp | 19 ------------------- include/cru/win/native/ui_application.hpp | 4 ++-- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 include/cru/win/native/platform_id.hpp (limited to 'include/cru/win/native') diff --git a/include/cru/win/native/native_window.hpp b/include/cru/win/native/native_window.hpp index cba5cc3e..16b14dbf 100644 --- a/include/cru/win/native/native_window.hpp +++ b/include/cru/win/native/native_window.hpp @@ -13,7 +13,7 @@ class WindowClass; class WindowManager; class WindowRenderTarget; -class WinNativeWindow : public NativeWindow { +class WinNativeWindow : public INativeWindow { public: WinNativeWindow(WinUiApplication* application, std::shared_ptr window_class, DWORD window_style, diff --git a/include/cru/win/native/platform_id.hpp b/include/cru/win/native/platform_id.hpp deleted file mode 100644 index e1899ad4..00000000 --- a/include/cru/win/native/platform_id.hpp +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once -#include - -#include -#include - -namespace cru::platform::native::win { -constexpr std::wstring_view win_platform_id = L"Windows"; - -inline bool IsWindowsResource(NativeResource* resource) { - return resource->GetPlatformId() == win_platform_id; -} - -} // namespace cru::platform::native::win - -#define CRU_PLATFORMID_IMPLEMENT_WIN \ - std::wstring_view GetPlatformId() const override { \ - return ::cru::platform::native::win::win_platform_id; \ - } diff --git a/include/cru/win/native/ui_application.hpp b/include/cru/win/native/ui_application.hpp index addf2c93..94c4b1eb 100644 --- a/include/cru/win/native/ui_application.hpp +++ b/include/cru/win/native/ui_application.hpp @@ -44,8 +44,8 @@ class WinUiApplication : public UiApplication { const std::function& action) override; void CancelTimer(unsigned long id) override; - std::vector GetAllWindow() override; - NativeWindow* CreateWindow(NativeWindow* parent) override; + std::vector GetAllWindow() override; + INativeWindow* CreateWindow(INativeWindow* parent) override; WinCursorManager* GetCursorManager() override; -- cgit v1.2.3