From 06f16479ae1b727252404b763b60c924e3fe7903 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Mon, 3 Nov 2025 20:04:52 +0800 Subject: Remove Object2. --- include/cru/platform/gui/win/GodWindow.h | 4 ---- include/cru/platform/gui/win/InputMethod.h | 2 +- include/cru/platform/gui/win/Resource.h | 3 --- include/cru/platform/gui/win/WindowClass.h | 4 ---- include/cru/platform/gui/win/WindowNativeMessageEventArgs.h | 5 +---- 5 files changed, 2 insertions(+), 16 deletions(-) (limited to 'include/cru/platform/gui') diff --git a/include/cru/platform/gui/win/GodWindow.h b/include/cru/platform/gui/win/GodWindow.h index ceb6fe2d..439c0125 100644 --- a/include/cru/platform/gui/win/GodWindow.h +++ b/include/cru/platform/gui/win/GodWindow.h @@ -12,10 +12,6 @@ class CRU_WIN_GUI_API GodWindow : public Object { public: explicit GodWindow(WinUiApplication* application); - - CRU_DELETE_COPY(GodWindow) - CRU_DELETE_MOVE(GodWindow) - ~GodWindow() override; HWND GetHandle() const { return hwnd_; } diff --git a/include/cru/platform/gui/win/InputMethod.h b/include/cru/platform/gui/win/InputMethod.h index a69490c7..ab11aafa 100644 --- a/include/cru/platform/gui/win/InputMethod.h +++ b/include/cru/platform/gui/win/InputMethod.h @@ -11,7 +11,7 @@ #include namespace cru::platform::gui::win { -class CRU_WIN_GUI_API AutoHIMC : public Object { +class CRU_WIN_GUI_API AutoHIMC { CRU_DEFINE_CLASS_LOG_TAG("AutoHIMC") public: diff --git a/include/cru/platform/gui/win/Resource.h b/include/cru/platform/gui/win/Resource.h index 2e2a225c..98853ed7 100644 --- a/include/cru/platform/gui/win/Resource.h +++ b/include/cru/platform/gui/win/Resource.h @@ -13,9 +13,6 @@ class CRU_WIN_GUI_API WinNativeResource : public Object, WinNativeResource() = default; public: - CRU_DELETE_COPY(WinNativeResource) - CRU_DELETE_MOVE(WinNativeResource) - ~WinNativeResource() override = default; public: diff --git a/include/cru/platform/gui/win/WindowClass.h b/include/cru/platform/gui/win/WindowClass.h index 50729887..900595e6 100644 --- a/include/cru/platform/gui/win/WindowClass.h +++ b/include/cru/platform/gui/win/WindowClass.h @@ -7,10 +7,6 @@ namespace cru::platform::gui::win { class CRU_WIN_GUI_API WindowClass : public Object { public: WindowClass(std::wstring name, WNDPROC window_proc, HINSTANCE h_instance); - - CRU_DELETE_COPY(WindowClass) - CRU_DELETE_MOVE(WindowClass) - ~WindowClass() override = default; const wchar_t* GetName() const { return name_.c_str(); } diff --git a/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h index 1b5a233c..3a89b786 100644 --- a/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h +++ b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h @@ -11,13 +11,10 @@ struct CRU_WIN_GUI_API WindowNativeMessage { LPARAM l_param; }; -class CRU_WIN_GUI_API WindowNativeMessageEventArgs : public Object { +class CRU_WIN_GUI_API WindowNativeMessageEventArgs { public: WindowNativeMessageEventArgs(const WindowNativeMessage& message) : message_(message) {} - CRU_DEFAULT_COPY(WindowNativeMessageEventArgs) - CRU_DEFAULT_MOVE(WindowNativeMessageEventArgs) - ~WindowNativeMessageEventArgs() override = default; const WindowNativeMessage& GetWindowMessage() const { return message_; } -- cgit v1.2.3