From 40bbf3c14a782673bbd36c8a98adb0934b06add5 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Mon, 3 Nov 2025 20:48:22 +0800 Subject: Osx remove Resource.h. --- src/platform/gui/osx/Base.cpp | 6 ++++++ src/platform/gui/osx/CMakeLists.txt | 6 ++++-- src/platform/gui/osx/Clipboard.mm | 2 +- src/platform/gui/osx/Cursor.mm | 4 ---- src/platform/gui/osx/InputMethod.mm | 3 ++- src/platform/gui/osx/Menu.mm | 2 +- src/platform/gui/osx/Resource.cpp | 6 ------ src/platform/gui/osx/UiApplication.mm | 6 +----- src/platform/gui/osx/Window.mm | 4 +--- src/platform/gui/osx/WindowPrivate.h | 1 - 10 files changed, 16 insertions(+), 24 deletions(-) create mode 100644 src/platform/gui/osx/Base.cpp delete mode 100644 src/platform/gui/osx/Resource.cpp (limited to 'src/platform/gui/osx') diff --git a/src/platform/gui/osx/Base.cpp b/src/platform/gui/osx/Base.cpp new file mode 100644 index 00000000..0cd7eab1 --- /dev/null +++ b/src/platform/gui/osx/Base.cpp @@ -0,0 +1,6 @@ +#include "cru/platform/gui/osx/Base.h" + +namespace cru::platform::gui::osx { +OsxGuiResource::OsxGuiResource(IUiApplication* ui_application) + : ui_application_(ui_application) {} +} // namespace cru::platform::gui::osx diff --git a/src/platform/gui/osx/CMakeLists.txt b/src/platform/gui/osx/CMakeLists.txt index 87245cdb..df790392 100644 --- a/src/platform/gui/osx/CMakeLists.txt +++ b/src/platform/gui/osx/CMakeLists.txt @@ -1,15 +1,17 @@ add_library(CruPlatformGuiOsx + Base.cpp Clipboard.mm Cursor.mm InputMethod.mm Keyboard.mm Menu.mm - Resource.cpp UiApplication.mm Window.mm ) +find_library(FOUNDATION Foundation REQUIRED) +find_library(CORE_FOUNDATION CoreFoundation REQUIRED) find_library(APPKIT AppKit REQUIRED) find_library(UNIFORMTYPEIDENTIFIERS UniformTypeIdentifiers REQUIRED) -target_link_libraries(CruPlatformGuiOsx PUBLIC CruPlatformGui CruPlatformGraphicsQuartz ${APPKIT} ${UNIFORMTYPEIDENTIFIERS}) +target_link_libraries(CruPlatformGuiOsx PUBLIC CruPlatformGui CruPlatformGraphicsQuartz ${FOUNDATION} ${CORE_FOUNDATION} ${APPKIT} ${UNIFORMTYPEIDENTIFIERS}) diff --git a/src/platform/gui/osx/Clipboard.mm b/src/platform/gui/osx/Clipboard.mm index a09bca1c..61652589 100644 --- a/src/platform/gui/osx/Clipboard.mm +++ b/src/platform/gui/osx/Clipboard.mm @@ -1,5 +1,5 @@ #include "cru/platform/gui/osx/Clipboard.h" -#include "cru/base/Osx.h" +#include "cru/base/platform/osx/Base.h" #include "cru/base/log/Logger.h" #include "ClipboardPrivate.h" diff --git a/src/platform/gui/osx/Cursor.mm b/src/platform/gui/osx/Cursor.mm index 9c25fdbd..e9d8f484 100644 --- a/src/platform/gui/osx/Cursor.mm +++ b/src/platform/gui/osx/Cursor.mm @@ -2,10 +2,6 @@ #include "CursorPrivate.h" #include "cru/base/Exception.h" -#include "cru/platform/gui/Cursor.h" -#include "cru/platform/gui/UiApplication.h" -#include "cru/platform/gui/osx/Resource.h" - #include namespace cru::platform::gui::osx { diff --git a/src/platform/gui/osx/InputMethod.mm b/src/platform/gui/osx/InputMethod.mm index c17dab3d..10003a5d 100644 --- a/src/platform/gui/osx/InputMethod.mm +++ b/src/platform/gui/osx/InputMethod.mm @@ -1,11 +1,12 @@ #include "cru/platform/gui/osx/InputMethod.h" -#import #include "InputMethodPrivate.h" #include "WindowPrivate.h" #include "cru/base/log/Logger.h" #include "cru/platform/gui/osx/Window.h" +#import + namespace cru::platform::gui::osx { namespace details { OsxInputMethodContextPrivate::OsxInputMethodContextPrivate( diff --git a/src/platform/gui/osx/Menu.mm b/src/platform/gui/osx/Menu.mm index 0eea19ec..62e9fe64 100644 --- a/src/platform/gui/osx/Menu.mm +++ b/src/platform/gui/osx/Menu.mm @@ -2,7 +2,7 @@ #include "KeyboardPrivate.h" #import "MenuPrivate.h" -#include "cru/base/Osx.h" +#include "cru/base/platform/osx/Base.h" #import diff --git a/src/platform/gui/osx/Resource.cpp b/src/platform/gui/osx/Resource.cpp deleted file mode 100644 index d33133c7..00000000 --- a/src/platform/gui/osx/Resource.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "cru/platform/gui/osx/Resource.h" - -namespace cru::platform::gui::osx { -OsxGuiResource::OsxGuiResource(IUiApplication* ui_application) - : ui_application_(ui_application) {} -} // namespace cru::platform::gui::osx diff --git a/src/platform/gui/osx/UiApplication.mm b/src/platform/gui/osx/UiApplication.mm index fca21075..19fcdc87 100644 --- a/src/platform/gui/osx/UiApplication.mm +++ b/src/platform/gui/osx/UiApplication.mm @@ -1,13 +1,9 @@ #include "cru/platform/gui/osx/UiApplication.h" #include "ClipboardPrivate.h" -#include "cru/base/Osx.h" +#include "cru/base/platform/osx/Base.h" #include "cru/base/log/Logger.h" -#include "cru/platform/graphics/Factory.h" #include "cru/platform/graphics/quartz/Factory.h" -#include "cru/platform/gui/Base.h" -#include "cru/platform/gui/UiApplication.h" -#include "cru/platform/gui/Window.h" #include "cru/platform/gui/osx/Clipboard.h" #include "cru/platform/gui/osx/Cursor.h" #include "cru/platform/gui/osx/Menu.h" diff --git a/src/platform/gui/osx/Window.mm b/src/platform/gui/osx/Window.mm index ca2de573..600f4902 100644 --- a/src/platform/gui/osx/Window.mm +++ b/src/platform/gui/osx/Window.mm @@ -3,18 +3,16 @@ #include "CursorPrivate.h" #include "InputMethodPrivate.h" -#include "cru/base/Osx.h" +#include "cru/base/platform/osx/Base.h" #include "cru/base/Range.h" #include "cru/base/log/Logger.h" #include "cru/platform/graphics/NullPainter.h" -#include "cru/platform/graphics/quartz/Convert.h" #include "cru/platform/graphics/quartz/Painter.h" #include "cru/platform/gui/Input.h" #include "cru/platform/gui/TimerHelper.h" #include "cru/platform/gui/osx/Cursor.h" #include "cru/platform/gui/osx/InputMethod.h" #include "cru/platform/gui/osx/Keyboard.h" -#include "cru/platform/gui/osx/Resource.h" #include "cru/platform/gui/osx/UiApplication.h" #include diff --git a/src/platform/gui/osx/WindowPrivate.h b/src/platform/gui/osx/WindowPrivate.h index 9e1b2a6c..913f2b2b 100644 --- a/src/platform/gui/osx/WindowPrivate.h +++ b/src/platform/gui/osx/WindowPrivate.h @@ -3,7 +3,6 @@ #include "cru/base/Event.h" #include "cru/platform/gui/TimerHelper.h" -#include "cru/platform/gui/Window.h" #include "cru/platform/gui/osx/Cursor.h" #import -- cgit v1.2.3