diff options
Diffstat (limited to 'include/cru/platform')
| -rw-r--r-- | include/cru/platform/graphics/NullPainter.h | 4 | ||||
| -rw-r--r-- | include/cru/platform/graphics/cairo/Base.h | 4 | ||||
| -rw-r--r-- | include/cru/platform/graphics/direct2d/Resource.h | 3 | ||||
| -rw-r--r-- | include/cru/platform/graphics/direct2d/WindowRenderTarget.h | 4 | ||||
| -rw-r--r-- | include/cru/platform/graphics/web_canvas/WebCanvasResource.h | 4 | ||||
| -rw-r--r-- | include/cru/platform/gui/win/GodWindow.h | 4 | ||||
| -rw-r--r-- | include/cru/platform/gui/win/InputMethod.h | 2 | ||||
| -rw-r--r-- | include/cru/platform/gui/win/Resource.h | 3 | ||||
| -rw-r--r-- | include/cru/platform/gui/win/WindowClass.h | 4 | ||||
| -rw-r--r-- | include/cru/platform/gui/win/WindowNativeMessageEventArgs.h | 5 |
10 files changed, 2 insertions, 35 deletions
diff --git a/include/cru/platform/graphics/NullPainter.h b/include/cru/platform/graphics/NullPainter.h index 29ed8a3e..f335e16d 100644 --- a/include/cru/platform/graphics/NullPainter.h +++ b/include/cru/platform/graphics/NullPainter.h @@ -7,10 +7,6 @@ namespace cru::platform::graphics { class NullPainter : public Object, public virtual IPainter { public: NullPainter() = default; - - CRU_DELETE_COPY(NullPainter) - CRU_DELETE_MOVE(NullPainter) - ~NullPainter() override = default; public: diff --git a/include/cru/platform/graphics/cairo/Base.h b/include/cru/platform/graphics/cairo/Base.h index 4338d7f7..350c9ea4 100644 --- a/include/cru/platform/graphics/cairo/Base.h +++ b/include/cru/platform/graphics/cairo/Base.h @@ -26,10 +26,6 @@ class CRU_PLATFORM_GRAPHICS_CAIRO_API CairoResource public virtual IGraphicsResource { public: explicit CairoResource(CairoGraphicsFactory* factory); - - CRU_DELETE_COPY(CairoResource) - CRU_DELETE_MOVE(CairoResource) - ~CairoResource() override; std::string GetPlatformId() const override; diff --git a/include/cru/platform/graphics/direct2d/Resource.h b/include/cru/platform/graphics/direct2d/Resource.h index ca67a463..b8dd42ab 100644 --- a/include/cru/platform/graphics/direct2d/Resource.h +++ b/include/cru/platform/graphics/direct2d/Resource.h @@ -18,9 +18,6 @@ class CRU_WIN_GRAPHICS_DIRECT_API DirectResource DirectResource() = default; public: - CRU_DELETE_COPY(DirectResource) - CRU_DELETE_MOVE(DirectResource) - ~DirectResource() override = default; public: diff --git a/include/cru/platform/graphics/direct2d/WindowRenderTarget.h b/include/cru/platform/graphics/direct2d/WindowRenderTarget.h index f77ce471..19b32df9 100644 --- a/include/cru/platform/graphics/direct2d/WindowRenderTarget.h +++ b/include/cru/platform/graphics/direct2d/WindowRenderTarget.h @@ -6,10 +6,6 @@ namespace cru::platform::graphics::direct2d { class CRU_WIN_GRAPHICS_DIRECT_API D2DWindowRenderTarget : public Object { public: D2DWindowRenderTarget(DirectGraphicsFactory* factory, HWND hwnd); - - CRU_DELETE_COPY(D2DWindowRenderTarget) - CRU_DELETE_MOVE(D2DWindowRenderTarget) - ~D2DWindowRenderTarget() override = default; public: diff --git a/include/cru/platform/graphics/web_canvas/WebCanvasResource.h b/include/cru/platform/graphics/web_canvas/WebCanvasResource.h index e3866f38..dbe83225 100644 --- a/include/cru/platform/graphics/web_canvas/WebCanvasResource.h +++ b/include/cru/platform/graphics/web_canvas/WebCanvasResource.h @@ -11,10 +11,6 @@ class WebCanvasResource : public Object, public virtual IPlatformResource { static const std::string kPlatformId; explicit WebCanvasResource(WebCanvasGraphicsFactory* factory); - - CRU_DELETE_COPY(WebCanvasResource) - CRU_DELETE_MOVE(WebCanvasResource) - ~WebCanvasResource() override; public: 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 <imm.h> 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_; } |
