From bba463aac2baffc6a8eefce439e9ab94662801cc Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 22 Oct 2025 22:02:49 +0200 Subject: [PATCH] Use native macOS API in wxBase in all GUI builds under Mac Use the same wxBase library, using native API, regardless of whether native API (Cocoa) or wxGTK is used by wxCore when building under macOS. Add new and more clear and simpler to use preprocessor constants for testing for various builds on Apple hardware. Also fix compilation with older macOS versions and gcc (not clang). Closes #25919. --- Makefile.in | 517 +++++------------- build/bakefiles/files.bkl | 68 +-- build/cmake/files.cmake | 38 +- build/cmake/functions.cmake | 4 + build/cmake/init.cmake | 2 +- build/cmake/lib/base/CMakeLists.txt | 25 +- build/cmake/toolkit.cmake | 2 + build/files | 43 +- configure | 2 +- configure.ac | 2 +- docs/doxygen/mainpages/const_cpp.h | 3 + include/wx/defs.h | 50 +- include/wx/gtk/mimetype.h | 10 +- include/wx/osx/core/private.h | 22 +- include/wx/osx/private.h | 12 +- .../wx/osx/private/webrequest_urlsession.h | 4 +- include/wx/platform.h | 11 +- include/wx/stdpaths.h | 2 +- samples/widgets/native.cpp | 2 +- src/common/arrstr.cpp | 2 +- src/common/intl.cpp | 8 +- src/common/utilscmn.cpp | 10 +- src/gtk/mimetype.cpp | 2 +- src/osx/carbon/utilscocoa.mm | 47 -- src/osx/cocoa/utils_base.mm | 82 ++- src/osx/core/mimetype.cpp | 12 +- src/osx/core/uilocale.mm | 40 +- src/osx/volume.mm | 22 +- src/osx/webrequest_urlsession.mm | 14 +- src/unix/appunix.cpp | 12 + src/unix/utilsunx.cpp | 4 +- 31 files changed, 436 insertions(+), 638 deletions(-) diff --git a/Makefile.in b/Makefile.in index 08f7bf058e..51f04cb1ed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -926,6 +926,9 @@ ALL_PORTS_BASE_HEADERS = \ wx/localedefs.h \ wx/uilocale.h \ wx/fs_data.h \ + wx/unix/fswatcher_inotify.h \ + wx/unix/stdpaths.h \ + wx/unix/mimetype.h \ wx/unix/app.h \ wx/unix/apptbase.h \ wx/unix/apptrait.h \ @@ -935,9 +938,6 @@ ALL_PORTS_BASE_HEADERS = \ wx/unix/pipe.h \ wx/unix/stackwalk.h \ wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/unix/fswatcher_inotify.h \ - wx/unix/stdpaths.h \ wx/msw/apptrait.h \ wx/msw/apptbase.h \ wx/msw/chkconf.h \ @@ -960,7 +960,32 @@ ALL_PORTS_BASE_HEADERS = \ wx/msw/wrapcdlg.h \ wx/msw/wrapwin.h \ wx/msw/fswatcher.h \ - $(BASE_OSX_HDR) \ + wx/osx/core/cfdataref.h \ + wx/osx/core/cfref.h \ + wx/osx/core/cfstring.h \ + wx/osx/core/hid.h \ + wx/osx/core/evtloop.h \ + wx/osx/core/objcid.h \ + wx/osx/core/private.h \ + wx/osx/core/colour.h \ + wx/osx/carbon/region.h \ + wx/osx/core/cfdictionary.h \ + wx/osx/core/cfarray.h \ + wx/osx/core/cftype.h \ + wx/osx/core/joystick.h \ + wx/osx/core/mimetype.h \ + wx/osx/core/dataview.h \ + wx/osx/core/stdpaths.h \ + wx/unix/app.h \ + wx/unix/apptbase.h \ + wx/unix/apptrait.h \ + wx/unix/chkconf.h \ + wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ + wx/unix/pipe.h \ + wx/unix/stackwalk.h \ + wx/unix/fswatcher_kqueue.h \ + wx/osx/fswatcher_fsevents.h \ wx/fs_inet.h \ wx/protocol/file.h \ wx/protocol/ftp.h \ @@ -1062,6 +1087,9 @@ ALL_BASE_SOURCES = \ src/common/lzmastream.cpp \ src/common/uilocale.cpp \ src/common/fs_data.cpp \ + src/unix/fswatcher_inotify.cpp \ + src/unix/stdpaths.cpp \ + src/unix/secretstore.cpp \ src/common/fdiodispatcher.cpp \ src/common/selectdispatcher.cpp \ src/unix/appunix.cpp \ @@ -1079,9 +1107,6 @@ ALL_BASE_SOURCES = \ src/unix/fswatcher_kqueue.cpp \ src/unix/mimetype.cpp \ src/unix/uilocale.cpp \ - src/unix/fswatcher_inotify.cpp \ - src/unix/stdpaths.cpp \ - src/unix/secretstore.cpp \ src/msw/basemsw.cpp \ src/msw/crashrpt.cpp \ src/msw/debughlp.cpp \ @@ -1102,13 +1127,36 @@ ALL_BASE_SOURCES = \ src/msw/fswatcher.cpp \ src/msw/secretstore.cpp \ src/msw/uilocale.cpp \ - $(BASE_OSX_SRC) \ + src/osx/core/cfstring.cpp \ + src/osx/core/evtloop_cf.cpp \ + src/osx/core/strconv_cf.cpp \ + src/osx/cocoa/utils_base.mm \ + src/osx/core/secretstore.cpp \ + src/osx/core/stdpaths.mm \ + src/osx/volume.mm \ + src/common/fdiodispatcher.cpp \ + src/common/selectdispatcher.cpp \ + src/unix/appunix.cpp \ + src/unix/dir.cpp \ + src/unix/dlunix.cpp \ + src/unix/epolldispatcher.cpp \ + src/unix/evtloopunix.cpp \ + src/unix/fdiounix.cpp \ + src/unix/snglinst.cpp \ + src/unix/stackwalk.cpp \ + src/unix/timerunx.cpp \ + src/unix/threadpsx.cpp \ + src/unix/utilsunx.cpp \ + src/unix/wakeuppipe.cpp \ + src/unix/fswatcher_kqueue.cpp \ + src/osx/fswatcher_fsevents.cpp \ + src/osx/core/uilocale.mm \ + src/osx/core/mimetype.cpp \ src/common/event.cpp \ src/common/fs_mem.cpp \ src/common/msgout.cpp \ src/common/utilscmn.cpp \ src/osx/cocoa/utils.mm \ - src/osx/volume.mm \ src/msw/main.cpp \ src/msw/volume.cpp \ src/common/fs_inet.cpp \ @@ -2586,243 +2634,7 @@ COND_PLATFORM_WIN32_1_GTK_PLATFORM_HDR = \ @COND_TOOLKIT_X11@OPENGL_PLATFORM_HDR = wx/unix/glx11.h wx/x11/glcanvas.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@AUI_PLATFORM_HDR = wx/aui/tabartgtk.h @COND_TOOLKIT_MSW@AUI_PLATFORM_HDR = wx/aui/tabartmsw.h wx/aui/barartmsw.h -COND_TOOLKIT__BASE_OSX_SRC = \ - src/common/fdiodispatcher.cpp \ - src/common/selectdispatcher.cpp \ - src/unix/appunix.cpp \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/unix/mimetype.cpp \ - src/unix/uilocale.cpp \ - src/osx/core/cfstring.cpp \ - src/osx/core/evtloop_cf.cpp \ - src/osx/core/strconv_cf.cpp \ - src/osx/cocoa/utils_base.mm \ - src/osx/core/secretstore.cpp \ - src/osx/core/stdpaths.mm -@COND_TOOLKIT_@BASE_OSX_SRC = $(COND_TOOLKIT__BASE_OSX_SRC) -COND_TOOLKIT_COCOA_BASE_OSX_SRC = \ - src/common/fdiodispatcher.cpp \ - src/common/selectdispatcher.cpp \ - src/unix/appunix.cpp \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/unix/mimetype.cpp \ - src/unix/uilocale.cpp \ - src/osx/core/cfstring.cpp \ - src/osx/core/evtloop_cf.cpp \ - src/osx/core/strconv_cf.cpp \ - src/osx/cocoa/utils_base.mm \ - src/osx/core/secretstore.cpp \ - src/osx/core/stdpaths.mm -@COND_TOOLKIT_COCOA@BASE_OSX_SRC = $(COND_TOOLKIT_COCOA_BASE_OSX_SRC) -COND_TOOLKIT_GTK_BASE_OSX_SRC = \ - src/common/fdiodispatcher.cpp \ - src/common/selectdispatcher.cpp \ - src/unix/appunix.cpp \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/unix/mimetype.cpp \ - src/unix/uilocale.cpp \ - src/osx/core/cfstring.cpp \ - src/osx/core/evtloop_cf.cpp \ - src/osx/core/strconv_cf.cpp \ - src/osx/cocoa/utils_base.mm \ - src/osx/core/secretstore.cpp \ - src/osx/core/stdpaths.mm -@COND_TOOLKIT_GTK@BASE_OSX_SRC = $(COND_TOOLKIT_GTK_BASE_OSX_SRC) -COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC = \ - src/osx/core/mimetype.cpp \ - src/osx/core/cfstring.cpp \ - src/osx/core/evtloop_cf.cpp \ - src/osx/core/strconv_cf.cpp \ - src/osx/cocoa/utils_base.mm \ - src/osx/core/secretstore.cpp \ - src/osx/core/stdpaths.mm \ - src/common/fdiodispatcher.cpp \ - src/common/selectdispatcher.cpp \ - src/unix/appunix.cpp \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/osx/fswatcher_fsevents.cpp \ - src/osx/core/uilocale.mm -@COND_TOOLKIT_OSX_COCOA@BASE_OSX_SRC = $(COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC) -COND_TOOLKIT_OSX_IPHONE_BASE_OSX_SRC = \ - src/osx/core/mimetype.cpp \ - src/osx/core/cfstring.cpp \ - src/osx/core/evtloop_cf.cpp \ - src/osx/core/strconv_cf.cpp \ - src/osx/cocoa/utils_base.mm \ - src/osx/core/secretstore.cpp \ - src/osx/core/stdpaths.mm \ - src/common/fdiodispatcher.cpp \ - src/common/selectdispatcher.cpp \ - src/unix/appunix.cpp \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/osx/fswatcher_fsevents.cpp \ - src/osx/core/uilocale.mm -@COND_TOOLKIT_OSX_IPHONE@BASE_OSX_SRC = $(COND_TOOLKIT_OSX_IPHONE_BASE_OSX_SRC) -COND_TOOLKIT_X11_BASE_OSX_SRC = \ - src/common/fdiodispatcher.cpp \ - src/common/selectdispatcher.cpp \ - src/unix/appunix.cpp \ - src/unix/dir.cpp \ - src/unix/dlunix.cpp \ - src/unix/epolldispatcher.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/fdiounix.cpp \ - src/unix/snglinst.cpp \ - src/unix/stackwalk.cpp \ - src/unix/timerunx.cpp \ - src/unix/threadpsx.cpp \ - src/unix/utilsunx.cpp \ - src/unix/wakeuppipe.cpp \ - src/unix/fswatcher_kqueue.cpp \ - src/unix/mimetype.cpp \ - src/unix/uilocale.cpp \ - src/osx/core/cfstring.cpp \ - src/osx/core/evtloop_cf.cpp \ - src/osx/core/strconv_cf.cpp \ - src/osx/cocoa/utils_base.mm \ - src/osx/core/secretstore.cpp \ - src/osx/core/stdpaths.mm -@COND_TOOLKIT_X11@BASE_OSX_SRC = $(COND_TOOLKIT_X11_BASE_OSX_SRC) -COND_TOOLKIT__BASE_OSX_HDR = \ - wx/unix/app.h \ - wx/unix/apptbase.h \ - wx/unix/apptrait.h \ - wx/unix/chkconf.h \ - wx/unix/evtloop.h \ - wx/unix/evtloopsrc.h \ - wx/unix/pipe.h \ - wx/unix/stackwalk.h \ - wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/osx/core/cfdataref.h \ - wx/osx/core/cfref.h \ - wx/osx/core/cfstring.h \ - wx/osx/core/hid.h \ - wx/osx/core/evtloop.h \ - wx/osx/core/objcid.h \ - wx/osx/core/private.h \ - wx/osx/core/colour.h \ - wx/osx/carbon/region.h \ - wx/osx/core/cfdictionary.h \ - wx/osx/core/cfarray.h \ - wx/osx/core/cftype.h \ - wx/osx/core/joystick.h \ - wx/osx/core/mimetype.h \ - wx/osx/core/dataview.h \ - wx/osx/core/stdpaths.h -@COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR) -COND_TOOLKIT_COCOA_BASE_OSX_HDR = \ - wx/unix/app.h \ - wx/unix/apptbase.h \ - wx/unix/apptrait.h \ - wx/unix/chkconf.h \ - wx/unix/evtloop.h \ - wx/unix/evtloopsrc.h \ - wx/unix/pipe.h \ - wx/unix/stackwalk.h \ - wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/osx/core/cfdataref.h \ - wx/osx/core/cfref.h \ - wx/osx/core/cfstring.h \ - wx/osx/core/hid.h \ - wx/osx/core/evtloop.h \ - wx/osx/core/objcid.h \ - wx/osx/core/private.h \ - wx/osx/core/colour.h \ - wx/osx/carbon/region.h \ - wx/osx/core/cfdictionary.h \ - wx/osx/core/cfarray.h \ - wx/osx/core/cftype.h \ - wx/osx/core/joystick.h \ - wx/osx/core/mimetype.h \ - wx/osx/core/dataview.h \ - wx/osx/core/stdpaths.h -@COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR) -COND_TOOLKIT_GTK_BASE_OSX_HDR = \ - wx/unix/app.h \ - wx/unix/apptbase.h \ - wx/unix/apptrait.h \ - wx/unix/chkconf.h \ - wx/unix/evtloop.h \ - wx/unix/evtloopsrc.h \ - wx/unix/pipe.h \ - wx/unix/stackwalk.h \ - wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/osx/core/cfdataref.h \ - wx/osx/core/cfref.h \ - wx/osx/core/cfstring.h \ - wx/osx/core/hid.h \ - wx/osx/core/evtloop.h \ - wx/osx/core/objcid.h \ - wx/osx/core/private.h \ - wx/osx/core/colour.h \ - wx/osx/carbon/region.h \ - wx/osx/core/cfdictionary.h \ - wx/osx/core/cfarray.h \ - wx/osx/core/cftype.h \ - wx/osx/core/joystick.h \ - wx/osx/core/mimetype.h \ - wx/osx/core/dataview.h \ - wx/osx/core/stdpaths.h -@COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR) -COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ +COND_PLATFORM_MACOSX_1_BASE_PLATFORM_HDR = \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ @@ -2849,37 +2661,11 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ wx/unix/stackwalk.h \ wx/unix/fswatcher_kqueue.h \ wx/osx/fswatcher_fsevents.h -@COND_TOOLKIT_OSX_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR) -COND_TOOLKIT_X11_BASE_OSX_HDR = \ - wx/unix/app.h \ - wx/unix/apptbase.h \ - wx/unix/apptrait.h \ - wx/unix/chkconf.h \ - wx/unix/evtloop.h \ - wx/unix/evtloopsrc.h \ - wx/unix/pipe.h \ - wx/unix/stackwalk.h \ - wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/osx/core/cfdataref.h \ - wx/osx/core/cfref.h \ - wx/osx/core/cfstring.h \ - wx/osx/core/hid.h \ - wx/osx/core/evtloop.h \ - wx/osx/core/objcid.h \ - wx/osx/core/private.h \ - wx/osx/core/colour.h \ - wx/osx/carbon/region.h \ - wx/osx/core/cfdictionary.h \ - wx/osx/core/cfarray.h \ - wx/osx/core/cftype.h \ - wx/osx/core/joystick.h \ - wx/osx/core/mimetype.h \ - wx/osx/core/dataview.h \ - wx/osx/core/stdpaths.h -@COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR) -@COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR) +@COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_MACOSX_1_BASE_PLATFORM_HDR) COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ + wx/unix/fswatcher_inotify.h \ + wx/unix/stdpaths.h \ + wx/unix/mimetype.h \ wx/unix/app.h \ wx/unix/apptbase.h \ wx/unix/apptrait.h \ @@ -2888,10 +2674,7 @@ COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stackwalk.h \ - wx/unix/fswatcher_kqueue.h \ - wx/unix/mimetype.h \ - wx/unix/fswatcher_inotify.h \ - wx/unix/stdpaths.h + wx/unix/fswatcher_kqueue.h @COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR) COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR = \ wx/msw/apptrait.h \ @@ -4290,13 +4073,13 @@ COND_USE_SOVERSOLARIS_1___monodll___so_symlinks_uninst_cmd = rm -f \ $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_USE_SOVERSOLARIS_1@__monodll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___monodll___so_symlinks_uninst_cmd) COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS = \ - monodll_core_mimetype.o \ monodll_cfstring.o \ monodll_evtloop_cf.o \ monodll_strconv_cf.o \ monodll_utils_base.o \ monodll_core_secretstore.o \ monodll_core_stdpaths.o \ + monodll_osx_volume.o \ monodll_fdiodispatcher.o \ monodll_selectdispatcher.o \ monodll_appunix.o \ @@ -4313,9 +4096,13 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_wakeuppipe.o \ monodll_fswatcher_kqueue.o \ monodll_fswatcher_fsevents.o \ - monodll_core_uilocale.o + monodll_core_uilocale.o \ + monodll_core_mimetype.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \ + monodll_fswatcher_inotify.o \ + monodll_unix_stdpaths.o \ + monodll_unix_secretstore.o \ monodll_fdiodispatcher.o \ monodll_selectdispatcher.o \ monodll_appunix.o \ @@ -4332,10 +4119,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_wakeuppipe.o \ monodll_fswatcher_kqueue.o \ monodll_unix_mimetype.o \ - monodll_unix_uilocale.o \ - monodll_fswatcher_inotify.o \ - monodll_unix_stdpaths.o \ - monodll_unix_secretstore.o + monodll_unix_uilocale.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_basemsw.o \ @@ -4362,7 +4146,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ @COND_PLATFORM_WIN32_1@ = monodll_main.o monodll_msw_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \ -@COND_TOOLKIT_OSX_COCOA@ = monodll_cocoa_utils.o monodll_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = monodll_cocoa_utils.o COND_PLATFORM_MACOSX_1___NET_PLATFORM_SRC_OBJECTS = \ monodll_socketiohandler.o \ monodll_sockunix.o \ @@ -6073,13 +5857,13 @@ COND_MONOLITHIC_1_SHARED_0___monolib___depname = \ @COND_USE_PCH_1@_____pch_wxprec_monolib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_monolib/wx/wxprec.h.gch COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ - monolib_core_mimetype.o \ monolib_cfstring.o \ monolib_evtloop_cf.o \ monolib_strconv_cf.o \ monolib_utils_base.o \ monolib_core_secretstore.o \ monolib_core_stdpaths.o \ + monolib_osx_volume.o \ monolib_fdiodispatcher.o \ monolib_selectdispatcher.o \ monolib_appunix.o \ @@ -6096,9 +5880,13 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_wakeuppipe.o \ monolib_fswatcher_kqueue.o \ monolib_fswatcher_fsevents.o \ - monolib_core_uilocale.o + monolib_core_uilocale.o \ + monolib_core_mimetype.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ + monolib_fswatcher_inotify.o \ + monolib_unix_stdpaths.o \ + monolib_unix_secretstore.o \ monolib_fdiodispatcher.o \ monolib_selectdispatcher.o \ monolib_appunix.o \ @@ -6115,10 +5903,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_wakeuppipe.o \ monolib_fswatcher_kqueue.o \ monolib_unix_mimetype.o \ - monolib_unix_uilocale.o \ - monolib_fswatcher_inotify.o \ - monolib_unix_stdpaths.o \ - monolib_unix_secretstore.o + monolib_unix_uilocale.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_basemsw.o \ @@ -6145,7 +5930,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \ @COND_PLATFORM_WIN32_1@ = monolib_main.o monolib_msw_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \ -@COND_TOOLKIT_OSX_COCOA@ = monolib_cocoa_utils.o monolib_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = monolib_cocoa_utils.o COND_PLATFORM_MACOSX_1___NET_PLATFORM_SRC_OBJECTS_1 = \ monolib_socketiohandler.o \ monolib_sockunix.o \ @@ -7906,13 +7691,13 @@ COND_USE_SOVERSOLARIS_1___basedll___so_symlinks_uninst_cmd = rm -f \ @COND_USE_SOVERSOLARIS_1@__basedll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___basedll___so_symlinks_uninst_cmd) @COND_PLATFORM_WIN32_1@__basedll___win32rc = basedll_version_rc.o COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ - basedll_core_mimetype.o \ basedll_cfstring.o \ basedll_evtloop_cf.o \ basedll_strconv_cf.o \ basedll_utils_base.o \ basedll_core_secretstore.o \ basedll_core_stdpaths.o \ + basedll_osx_volume.o \ basedll_fdiodispatcher.o \ basedll_selectdispatcher.o \ basedll_appunix.o \ @@ -7929,9 +7714,13 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_wakeuppipe.o \ basedll_fswatcher_kqueue.o \ basedll_fswatcher_fsevents.o \ - basedll_core_uilocale.o + basedll_core_uilocale.o \ + basedll_core_mimetype.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ + basedll_fswatcher_inotify.o \ + basedll_unix_stdpaths.o \ + basedll_unix_secretstore.o \ basedll_fdiodispatcher.o \ basedll_selectdispatcher.o \ basedll_appunix.o \ @@ -7948,10 +7737,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_wakeuppipe.o \ basedll_fswatcher_kqueue.o \ basedll_unix_mimetype.o \ - basedll_unix_uilocale.o \ - basedll_fswatcher_inotify.o \ - basedll_unix_stdpaths.o \ - basedll_unix_secretstore.o + basedll_unix_uilocale.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_basemsw.o \ @@ -7978,7 +7764,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \ @COND_PLATFORM_WIN32_1@ = basedll_main.o basedll_msw_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 \ -@COND_TOOLKIT_OSX_COCOA@ = basedll_cocoa_utils.o basedll_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = basedll_cocoa_utils.o COND_MONOLITHIC_0_SHARED_0___baselib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @COND_MONOLITHIC_0_SHARED_0@__baselib___depname = $(COND_MONOLITHIC_0_SHARED_0___baselib___depname) @@ -7991,13 +7777,13 @@ COND_MONOLITHIC_0_SHARED_0___baselib___depname = \ @COND_USE_PCH_1@_____pch_wxprec_baselib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_baselib/wx/wxprec.h.gch COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ - baselib_core_mimetype.o \ baselib_cfstring.o \ baselib_evtloop_cf.o \ baselib_strconv_cf.o \ baselib_utils_base.o \ baselib_core_secretstore.o \ baselib_core_stdpaths.o \ + baselib_osx_volume.o \ baselib_fdiodispatcher.o \ baselib_selectdispatcher.o \ baselib_appunix.o \ @@ -8014,9 +7800,13 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_wakeuppipe.o \ baselib_fswatcher_kqueue.o \ baselib_fswatcher_fsevents.o \ - baselib_core_uilocale.o + baselib_core_uilocale.o \ + baselib_core_mimetype.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ + baselib_fswatcher_inotify.o \ + baselib_unix_stdpaths.o \ + baselib_unix_secretstore.o \ baselib_fdiodispatcher.o \ baselib_selectdispatcher.o \ baselib_appunix.o \ @@ -8033,10 +7823,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_wakeuppipe.o \ baselib_fswatcher_kqueue.o \ baselib_unix_mimetype.o \ - baselib_unix_uilocale.o \ - baselib_fswatcher_inotify.o \ - baselib_unix_stdpaths.o \ - baselib_unix_secretstore.o + baselib_unix_uilocale.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_basemsw.o \ @@ -8063,7 +7850,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \ @COND_PLATFORM_WIN32_1@ = baselib_main.o baselib_msw_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 \ -@COND_TOOLKIT_OSX_COCOA@ = baselib_cocoa_utils.o baselib_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = baselib_cocoa_utils.o @COND_SHARED_1@____wxbase_namedll_DEP = $(__basedll___depname) @COND_SHARED_0@____wxbase_namelib_DEP = $(__baselib___depname) COND_MONOLITHIC_0_SHARED_1___netdll___depname = \ @@ -8234,9 +8021,9 @@ COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_uninst_cmd = rm -f \ @COND_USE_SOVERSOLARIS_1@__coredll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_uninst_cmd) @COND_PLATFORM_WIN32_1@__coredll___win32rc = coredll_version_rc.o @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \ -@COND_PLATFORM_WIN32_1@ = coredll_main.o coredll_msw_volume.o +@COND_PLATFORM_WIN32_1@ = coredll_main.o coredll_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 \ -@COND_TOOLKIT_OSX_COCOA@ = coredll_cocoa_utils.o coredll_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = coredll_cocoa_utils.o COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_4) \ $(__PLATFORM_SRC_OBJECTS_8) \ @@ -9744,9 +9531,9 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \ @COND_USE_PCH_1@_____pch_wxprec_corelib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_corelib/wx/wxprec.h.gch @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \ -@COND_PLATFORM_WIN32_1@ = corelib_main.o corelib_msw_volume.o +@COND_PLATFORM_WIN32_1@ = corelib_main.o corelib_volume.o @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 \ -@COND_TOOLKIT_OSX_COCOA@ = corelib_cocoa_utils.o corelib_osx_volume.o +@COND_TOOLKIT_OSX_COCOA@ = corelib_cocoa_utils.o COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ $(__LOWLEVEL_SRC_OBJECTS_6) \ $(__PLATFORM_SRC_OBJECTS_9) \ @@ -15606,12 +15393,6 @@ monodll_common_uilocale.o: $(srcdir)/src/common/uilocale.cpp $(MONODLL_ODEP) monodll_fs_data.o: $(srcdir)/src/common/fs_data.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_data.cpp -monodll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp - -monodll_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp - monodll_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp @@ -15621,6 +15402,12 @@ monodll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP) monodll_unix_secretstore.o: $(srcdir)/src/unix/secretstore.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/secretstore.cpp +monodll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp + +monodll_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp + monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp @@ -15681,9 +15468,6 @@ monodll_msw_secretstore.o: $(srcdir)/src/msw/secretstore.cpp $(MONODLL_ODEP) monodll_msw_uilocale.o: $(srcdir)/src/msw/uilocale.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uilocale.cpp -monodll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp - monodll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp @@ -15702,12 +15486,18 @@ monodll_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(MONODLL_ODE monodll_core_stdpaths.o: $(srcdir)/src/osx/core/stdpaths.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/core/stdpaths.mm +monodll_osx_volume.o: $(srcdir)/src/osx/volume.mm $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm + monodll_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp monodll_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/core/uilocale.mm +monodll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp + monodll_event.o: $(srcdir)/src/common/event.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -15729,9 +15519,6 @@ monodll_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(MONODLL_ODEP) monodll_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -monodll_osx_volume.o: $(srcdir)/src/osx/volume.mm $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - monodll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp @@ -20391,12 +20178,6 @@ monolib_common_uilocale.o: $(srcdir)/src/common/uilocale.cpp $(MONOLIB_ODEP) monolib_fs_data.o: $(srcdir)/src/common/fs_data.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_data.cpp -monolib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp - -monolib_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp - monolib_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp @@ -20406,6 +20187,12 @@ monolib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP) monolib_unix_secretstore.o: $(srcdir)/src/unix/secretstore.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/secretstore.cpp +monolib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp + +monolib_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp + monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp @@ -20466,9 +20253,6 @@ monolib_msw_secretstore.o: $(srcdir)/src/msw/secretstore.cpp $(MONOLIB_ODEP) monolib_msw_uilocale.o: $(srcdir)/src/msw/uilocale.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uilocale.cpp -monolib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp - monolib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp @@ -20487,12 +20271,18 @@ monolib_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(MONOLIB_ODE monolib_core_stdpaths.o: $(srcdir)/src/osx/core/stdpaths.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/core/stdpaths.mm +monolib_osx_volume.o: $(srcdir)/src/osx/volume.mm $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm + monolib_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp monolib_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/core/uilocale.mm +monolib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp + monolib_event.o: $(srcdir)/src/common/event.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -20514,9 +20304,6 @@ monolib_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(MONOLIB_ODEP) monolib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -monolib_osx_volume.o: $(srcdir)/src/osx/volume.mm $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - monolib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp @@ -25176,12 +24963,6 @@ basedll_common_uilocale.o: $(srcdir)/src/common/uilocale.cpp $(BASEDLL_ODEP) basedll_fs_data.o: $(srcdir)/src/common/fs_data.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_data.cpp -basedll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp - -basedll_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp - basedll_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp @@ -25191,6 +24972,12 @@ basedll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP) basedll_unix_secretstore.o: $(srcdir)/src/unix/secretstore.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/secretstore.cpp +basedll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp + +basedll_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp + basedll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp @@ -25251,9 +25038,6 @@ basedll_msw_secretstore.o: $(srcdir)/src/msw/secretstore.cpp $(BASEDLL_ODEP) basedll_msw_uilocale.o: $(srcdir)/src/msw/uilocale.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/uilocale.cpp -basedll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp - basedll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp @@ -25272,12 +25056,18 @@ basedll_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(BASEDLL_ODE basedll_core_stdpaths.o: $(srcdir)/src/osx/core/stdpaths.mm $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/core/stdpaths.mm +basedll_osx_volume.o: $(srcdir)/src/osx/volume.mm $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm + basedll_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp basedll_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.mm $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/core/uilocale.mm +basedll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp + basedll_event.o: $(srcdir)/src/common/event.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -25299,9 +25089,6 @@ basedll_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(BASEDLL_ODEP) basedll_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -basedll_osx_volume.o: $(srcdir)/src/osx/volume.mm $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - @COND_PLATFORM_UNIX_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp @@ -25650,12 +25437,6 @@ baselib_common_uilocale.o: $(srcdir)/src/common/uilocale.cpp $(BASELIB_ODEP) baselib_fs_data.o: $(srcdir)/src/common/fs_data.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fs_data.cpp -baselib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp - -baselib_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp - baselib_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp @@ -25665,6 +25446,12 @@ baselib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP) baselib_unix_secretstore.o: $(srcdir)/src/unix/secretstore.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/secretstore.cpp +baselib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp + +baselib_unix_uilocale.o: $(srcdir)/src/unix/uilocale.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/uilocale.cpp + baselib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp @@ -25725,9 +25512,6 @@ baselib_msw_secretstore.o: $(srcdir)/src/msw/secretstore.cpp $(BASELIB_ODEP) baselib_msw_uilocale.o: $(srcdir)/src/msw/uilocale.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/uilocale.cpp -baselib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp - baselib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp @@ -25746,12 +25530,18 @@ baselib_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(BASELIB_ODE baselib_core_stdpaths.o: $(srcdir)/src/osx/core/stdpaths.mm $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/core/stdpaths.mm +baselib_osx_volume.o: $(srcdir)/src/osx/volume.mm $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm + baselib_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp baselib_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.mm $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/core/uilocale.mm +baselib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp + baselib_event.o: $(srcdir)/src/common/event.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -25773,9 +25563,6 @@ baselib_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(BASELIB_ODEP) baselib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -baselib_osx_volume.o: $(srcdir)/src/osx/volume.mm $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - @COND_PLATFORM_UNIX_1@baselib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASELIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp @@ -26013,15 +25800,12 @@ coredll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(COREDLL_ODEP) coredll_main.o: $(srcdir)/src/msw/main.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp -coredll_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(COREDLL_ODEP) +coredll_volume.o: $(srcdir)/src/msw/volume.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp coredll_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -coredll_osx_volume.o: $(srcdir)/src/osx/volume.mm $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - coredll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(COREDLL_ODEP) $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c @@ -29766,15 +29550,12 @@ corelib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(CORELIB_ODEP) corelib_main.o: $(srcdir)/src/msw/main.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp -corelib_msw_volume.o: $(srcdir)/src/msw/volume.cpp $(CORELIB_ODEP) +corelib_volume.o: $(srcdir)/src/msw/volume.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp corelib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -corelib_osx_volume.o: $(srcdir)/src/osx/volume.mm $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/volume.mm - corelib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(CORELIB_ODEP) $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index c6ad88b2f3..3eea13d4a6 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -85,22 +85,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/unix/fswatcher_kqueue.h - - - $(BASE_UNIX_AND_DARWIN_SRC) - src/unix/mimetype.cpp - src/unix/uilocale.cpp - - - - $(BASE_UNIX_AND_DARWIN_HDR) - wx/unix/mimetype.h - - - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC) src/unix/fswatcher_inotify.cpp src/unix/stdpaths.cpp src/unix/secretstore.cpp + $(BASE_UNIX_AND_DARWIN_SRC) + src/unix/mimetype.cpp + src/unix/uilocale.cpp - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR) wx/unix/fswatcher_inotify.h wx/unix/stdpaths.h + wx/unix/mimetype.h + $(BASE_UNIX_AND_DARWIN_HDR) @@ -185,6 +172,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/cocoa/utils_base.mm src/osx/core/secretstore.cpp src/osx/core/stdpaths.mm + src/osx/volume.mm wx/osx/core/cfdataref.h @@ -206,14 +194,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - - src/osx/core/mimetype.cpp + $(BASE_COREFOUNDATION_SRC) $(BASE_UNIX_AND_DARWIN_SRC) src/osx/fswatcher_fsevents.cpp src/osx/core/uilocale.mm + src/osx/core/mimetype.cpp - + $(BASE_COREFOUNDATION_HDR) $(BASE_UNIX_AND_DARWIN_HDR) wx/osx/fswatcher_fsevents.h @@ -222,17 +210,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/cocoa/utils.mm - src/osx/volume.mm - - - - - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC) - $(BASE_COREFOUNDATION_SRC) - - - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR) - $(BASE_COREFOUNDATION_HDR) @@ -3215,23 +3192,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - - - $(BASE_OSX_SHARED_SRC) - $(BASE_OSX_SHARED_SRC) - $(BASE_OSX_NOTWXMAC_SRC) - $(BASE_OSX_NOTWXMAC_SRC) - $(BASE_OSX_NOTWXMAC_SRC) - - - - $(BASE_OSX_NOTWXMAC_SRC) - $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) - $(BASE_OSX_SHARED_SRC) + $(BASE_OSX_SRC) $(BASE_AND_GUI_OSX_COCOA_SRC) @@ -3243,18 +3207,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - - - $(BASE_OSX_SHARED_HDR) - $(BASE_OSX_NOTWXMAC_HDR) - $(BASE_OSX_NOTWXMAC_HDR) - $(BASE_OSX_NOTWXMAC_HDR) - - - - $(BASE_OSX_NOTWXMAC_HDR) - $(BASE_UNIX_HDR) $(BASE_WIN32_HDR) diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index a05b86f126..2a17698af5 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -31,28 +31,20 @@ set(BASE_UNIX_AND_DARWIN_HDR wx/unix/fswatcher_kqueue.h ) -set(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC +set(BASE_UNIX_SRC + src/unix/fswatcher_inotify.cpp + src/unix/secretstore.cpp + src/unix/stdpaths.cpp ${BASE_UNIX_AND_DARWIN_SRC} src/unix/mimetype.cpp src/unix/uilocale.cpp ) -set(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR - ${BASE_UNIX_AND_DARWIN_HDR} - wx/unix/mimetype.h -) - -set(BASE_UNIX_SRC - ${BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC} - src/unix/fswatcher_inotify.cpp - src/unix/secretstore.cpp - src/unix/stdpaths.cpp -) - set(BASE_UNIX_HDR - ${BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR} wx/unix/fswatcher_inotify.h wx/unix/stdpaths.h + ${BASE_UNIX_AND_DARWIN_HDR} + wx/unix/mimetype.h ) set(BASE_WIN32_SRC @@ -115,6 +107,7 @@ set(BASE_COREFOUNDATION_SRC src/osx/core/strconv_cf.cpp src/osx/cocoa/utils_base.mm src/osx/core/stdpaths.mm + src/osx/volume.mm ) set(BASE_COREFOUNDATION_HDR @@ -136,15 +129,15 @@ set(BASE_COREFOUNDATION_HDR wx/osx/core/stdpaths.h ) -set(BASE_OSX_SHARED_SRC - src/osx/core/mimetype.cpp +set(BASE_OSX_SRC src/osx/fswatcher_fsevents.cpp ${BASE_COREFOUNDATION_SRC} ${BASE_UNIX_AND_DARWIN_SRC} src/osx/core/uilocale.mm + src/osx/core/mimetype.cpp ) -set(BASE_OSX_SHARED_HDR +set(BASE_OSX_HDR wx/osx/fswatcher_fsevents.h ${BASE_COREFOUNDATION_HDR} ${BASE_UNIX_AND_DARWIN_HDR} @@ -152,17 +145,6 @@ set(BASE_OSX_SHARED_HDR set(BASE_AND_GUI_OSX_COCOA_SRC src/osx/cocoa/utils.mm - src/osx/volume.mm -) - -set(BASE_OSX_NOTWXMAC_SRC - ${BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC} - ${BASE_COREFOUNDATION_SRC} -) - -set(BASE_OSX_NOTWXMAC_HDR - ${BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR} - ${BASE_COREFOUNDATION_HDR} ) set(QT_UNIX_SRC diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index 2466fcce6e..f2ec150386 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -430,6 +430,10 @@ function(wx_set_target_properties target_name) PUBLIC ${WIN32_LIBRARIES}) endif() + if(wxTOOLKIT_LIBRARY_DIRS AND NOT wxTARGET_IS_BASE) + target_link_directories(${target_name} + PUBLIC ${wxTOOLKIT_LIBRARY_DIRS}) + endif() if(wxTOOLKIT_LIBRARIES AND NOT wxTARGET_IS_BASE) target_link_libraries(${target_name} PUBLIC ${wxTOOLKIT_LIBRARIES}) diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 4132d60f79..ad2e6fa8ae 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -657,7 +657,7 @@ if(wxUSE_GUI) endif() endif() - if(wxUSE_MEDIACTRL AND WXGTK AND NOT APPLE AND NOT WIN32) + if(wxUSE_MEDIACTRL AND WXGTK AND NOT WIN32) find_package(GSTREAMER 1.0 COMPONENTS video) if(NOT GSTREAMER_FOUND) find_package(GSTREAMER 0.10 COMPONENTS interfaces) diff --git a/build/cmake/lib/base/CMakeLists.txt b/build/cmake/lib/base/CMakeLists.txt index 526136812b..a09d239540 100644 --- a/build/cmake/lib/base/CMakeLists.txt +++ b/build/cmake/lib/base/CMakeLists.txt @@ -14,13 +14,9 @@ if(WIN32) wx_append_sources(BASE_FILES BASE_WIN32) wx_append_sources(BASE_FILES BASE_AND_GUI_WIN32) elseif(APPLE) - if(WXOSX_COCOA OR WXOSX_IPHONE) - wx_append_sources(BASE_FILES BASE_OSX_SHARED) - if(WXOSX_COCOA) - wx_append_sources(BASE_FILES BASE_AND_GUI_OSX_COCOA) - endif() - else() - wx_append_sources(BASE_FILES BASE_OSX_NOTWXMAC) + wx_append_sources(BASE_FILES BASE_OSX) + if(WXOSX_COCOA) + wx_append_sources(BASE_FILES BASE_AND_GUI_OSX_COCOA) endif() elseif(UNIX) wx_append_sources(BASE_FILES BASE_UNIX) @@ -58,13 +54,24 @@ endif() if(APPLE) wx_lib_link_libraries(wxbase + PRIVATE + "-framework Security" PUBLIC "-framework CoreFoundation" ) + if(WXOSX_IPHONE) + wx_lib_link_libraries(wxbase + PUBLIC + "-framework UIKit" + ) + else() + wx_lib_link_libraries(wxbase + PUBLIC + "-framework AppKit" + ) + endif() if(WXOSX_COCOA) wx_lib_link_libraries(wxbase - PRIVATE - "-framework Security" PUBLIC "-framework Carbon" "-framework Cocoa" diff --git a/build/cmake/toolkit.cmake b/build/cmake/toolkit.cmake index 746e1f3395..093a4af029 100644 --- a/build/cmake/toolkit.cmake +++ b/build/cmake/toolkit.cmake @@ -67,6 +67,7 @@ endif() if(wxUSE_GUI) set(wxTOOLKIT_INCLUDE_DIRS) set(wxTOOLKIT_LIBRARIES) +set(wxTOOLKIT_LIBRARY_DIRS) set(wxTOOLKIT_VERSION) if(WXGTK) @@ -81,6 +82,7 @@ if(WXGTK) find_package(${gtk_lib} REQUIRED) list(APPEND wxTOOLKIT_INCLUDE_DIRS ${${gtk_lib}_INCLUDE_DIRS}) list(APPEND wxTOOLKIT_LIBRARIES ${${gtk_lib}_LIBRARIES}) + list(APPEND wxTOOLKIT_LIBRARY_DIRS ${${gtk_lib}_LIBRARY_DIRS}) list(APPEND wxTOOLKIT_DEFINITIONS ${${gtk_lib}_DEFINITIONS}) list(APPEND wxTOOLKIT_DEFINITIONS __WXGTK__) set(wxTOOLKIT_VERSION ${${gtk_lib}_VERSION}) diff --git a/build/files b/build/files index 50a7cc0117..52c7fc668f 100644 --- a/build/files +++ b/build/files @@ -50,31 +50,22 @@ BASE_UNIX_AND_DARWIN_HDR = wx/unix/stackwalk.h wx/unix/fswatcher_kqueue.h -# Files used on all Unix systems, including Darwin with any port but wxMac -# (this is really an aberration, we should also use these files for wxMac, -# it's not done because of some OS 9 support leftovers only now) -BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC = - $(BASE_UNIX_AND_DARWIN_SRC) - src/unix/mimetype.cpp - src/unix/uilocale.cpp - -BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR = - $(BASE_UNIX_AND_DARWIN_HDR) - wx/unix/mimetype.h - # Files used on all non-Darwin Unix systems (because Darwin provides other, # better, native equivalents of the functionality they implement (e.g. # CFSocket instead of BSD sockets) or doesn't provide it at all (epoll, # backtrace()) BASE_UNIX_SRC = - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC) + $(BASE_UNIX_AND_DARWIN_SRC) src/unix/fswatcher_inotify.cpp + src/unix/mimetype.cpp src/unix/secretstore.cpp src/unix/stdpaths.cpp + src/unix/uilocale.cpp BASE_UNIX_HDR = - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR) + $(BASE_UNIX_AND_DARWIN_HDR) wx/unix/fswatcher_inotify.h + wx/unix/mimetype.h wx/unix/stdpaths.h @@ -141,6 +132,7 @@ BASE_COREFOUNDATION_SRC = src/osx/core/stdpaths.mm src/osx/core/strconv_cf.cpp src/osx/cocoa/utils_base.mm + src/osx/volume.mm BASE_COREFOUNDATION_HDR = wx/osx/carbon/region.h @@ -161,32 +153,21 @@ BASE_COREFOUNDATION_HDR = wx/osx/core/stdpaths.h # Base files used by OS X ports (not Carbon) -BASE_OSX_SHARED_SRC = +BASE_OSX_SRC = + $(BASE_UNIX_AND_DARWIN_SRC) + $(BASE_COREFOUNDATION_SRC) src/osx/core/mimetype.cpp src/osx/core/uilocale.mm src/osx/fswatcher_fsevents.cpp - $(BASE_COREFOUNDATION_SRC) - $(BASE_UNIX_AND_DARWIN_SRC) -BASE_OSX_SHARED_HDR = - wx/osx/fswatcher_fsevents.h - $(BASE_COREFOUNDATION_HDR) +BASE_OSX_HDR = $(BASE_UNIX_AND_DARWIN_HDR) + $(BASE_COREFOUNDATION_HDR) + wx/osx/fswatcher_fsevents.h # Base and GUI files used by OS X BASE_AND_GUI_OSX_COCOA_SRC = src/osx/cocoa/utils.mm - src/osx/volume.mm - -# files used by non-wxMac OS X builds -BASE_OSX_NOTWXMAC_SRC = - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC) - $(BASE_COREFOUNDATION_SRC) - -BASE_OSX_NOTWXMAC_HDR = - $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR) - $(BASE_COREFOUNDATION_HDR) - ## Qt diff --git a/configure b/configure index f695d9aa3d..ddaeb3734f 100755 --- a/configure +++ b/configure @@ -41299,7 +41299,7 @@ $as_echo "$wx_cv_target_x86_64" >&6; } fi fi if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then - EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices -framework Foundation" + EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework AppKit -framework IOKit -framework CoreServices -framework System -framework ApplicationServices -framework Foundation" fi LDFLAGS="$LDFLAGS $EXTRA_FRAMEWORKS" diff --git a/configure.ac b/configure.ac index fa97d72e10..ec9530bd63 100644 --- a/configure.ac +++ b/configure.ac @@ -7737,7 +7737,7 @@ if test "$wxUSE_MAC" = 1 ; then fi fi if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then - EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices -framework Foundation" + EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework AppKit -framework IOKit -framework CoreServices -framework System -framework ApplicationServices -framework Foundation" fi LDFLAGS="$LDFLAGS $EXTRA_FRAMEWORKS" diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index 5916656d83..9d037ddd7e 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -43,6 +43,9 @@ while \__WINDOWS__ should be used for the platform tests.} @itemdef{\__WXOSX_IPHONE__, iPhone (UIKit)} @itemdef{\__WXOSX_COCOA__, macOS using Cocoa (AppKit)} @itemdef{\__WXOSX_MAC__, macOS (Cocoa)} +@itemdef{\__WXDARWIN__, wxBase built on macOS or iPhone, synonym of \__DARWIN__ (see below). This constant is available since wxWidgets 3.3.2.} +@itemdef{\__WXDARWIN_OSX__, wxBase built on macOS (can be used for with Apple and non-Apple GUIs). This constant is available since wxWidgets 3.3.2.} +@itemdef{\__WXDARWIN_IPHONE__, wxBase built on iPhone. This constant is available since wxWidgets 3.3.2.} @itemdef{\__WXPM__, OS/2 native Presentation Manager (not used any longer).} @itemdef{\__WXXT__, Xt; mutually exclusive with WX_MOTIF, not implemented in wxWidgets 2.x} @itemdef{\__WXX11__, wxX11 (\__WXUNIVERSAL__ will be also defined)} diff --git a/include/wx/defs.h b/include/wx/defs.h index 19ec0b67d3..41855ab0a5 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2754,22 +2754,44 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSData); DECLARE_WXCOCOA_OBJC_CLASS(NSMutableArray); DECLARE_WXCOCOA_OBJC_CLASS(NSString); DECLARE_WXCOCOA_OBJC_CLASS(NSObject); +DECLARE_WXCOCOA_OBJC_CLASS(NSSet); -#if wxOSX_USE_COCOA +#ifdef __WXDARWIN_OSX__ + +DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep); +DECLARE_WXCOCOA_OBJC_CLASS(NSColor); +DECLARE_WXCOCOA_OBJC_CLASS(NSFont); +DECLARE_WXCOCOA_OBJC_CLASS(NSFontDescriptor); +DECLARE_WXCOCOA_OBJC_CLASS(NSImage); +DECLARE_WXCOCOA_OBJC_CLASS(NSSound); +DECLARE_WXCOCOA_OBJC_CLASS(NSThread); + +typedef WX_NSColor WXColor; +typedef WX_NSImage WXImage; + +#elif defined(__WXDARWIN_IPHONE__) + +DECLARE_WXCOCOA_OBJC_CLASS(UIColor); +DECLARE_WXCOCOA_OBJC_CLASS(UIImage); +DECLARE_WXCOCOA_OBJC_CLASS(UIFont); + +typedef WX_UIColor WXColor; +typedef WX_UIImage WXImage; + +#else + +#endif + +#ifdef __WXOSX_COCOA__ DECLARE_WXCOCOA_OBJC_CLASS(NSApplication); -DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep); DECLARE_WXCOCOA_OBJC_CLASS(NSBox); DECLARE_WXCOCOA_OBJC_CLASS(NSButton); -DECLARE_WXCOCOA_OBJC_CLASS(NSColor); DECLARE_WXCOCOA_OBJC_CLASS(NSColorPanel); DECLARE_WXCOCOA_OBJC_CLASS(NSControl); DECLARE_WXCOCOA_OBJC_CLASS(NSCursor); DECLARE_WXCOCOA_OBJC_CLASS(NSEvent); -DECLARE_WXCOCOA_OBJC_CLASS(NSFont); -DECLARE_WXCOCOA_OBJC_CLASS(NSFontDescriptor); DECLARE_WXCOCOA_OBJC_CLASS(NSFontPanel); -DECLARE_WXCOCOA_OBJC_CLASS(NSImage); DECLARE_WXCOCOA_OBJC_CLASS(NSLayoutManager); DECLARE_WXCOCOA_OBJC_CLASS(NSMenu); DECLARE_WXCOCOA_OBJC_CLASS(NSMenuExtra); @@ -2778,14 +2800,12 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSNotification); DECLARE_WXCOCOA_OBJC_CLASS(NSPanel); DECLARE_WXCOCOA_OBJC_CLASS(NSResponder); DECLARE_WXCOCOA_OBJC_CLASS(NSScrollView); -DECLARE_WXCOCOA_OBJC_CLASS(NSSound); DECLARE_WXCOCOA_OBJC_CLASS(NSStatusItem); DECLARE_WXCOCOA_OBJC_CLASS(NSTableColumn); DECLARE_WXCOCOA_OBJC_CLASS(NSTableView); DECLARE_WXCOCOA_OBJC_CLASS(NSTextContainer); DECLARE_WXCOCOA_OBJC_CLASS(NSTextField); DECLARE_WXCOCOA_OBJC_CLASS(NSTextStorage); -DECLARE_WXCOCOA_OBJC_CLASS(NSThread); DECLARE_WXCOCOA_OBJC_CLASS(NSWindow); DECLARE_WXCOCOA_OBJC_CLASS(NSView); DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext); @@ -2803,36 +2823,27 @@ DECLARE_WXCOCOA_OBJC_CLASS(WKWebView); typedef WX_NSWindow WXWindow; typedef WX_NSEvent WXEvent; typedef WX_NSView WXWidget; -typedef WX_NSColor WXColor; -typedef WX_NSImage WXImage; typedef WX_NSMenu WXHMENU; typedef WX_NSOpenGLPixelFormat WXGLPixelFormat; typedef WX_NSOpenGLContext WXGLContext; typedef WX_NSPasteboard OSXPasteboard; typedef WX_WKWebView OSXWebViewPtr; -#elif wxOSX_USE_IPHONE +#elif defined(__WXOSX_IPHONE__) -DECLARE_WXCOCOA_OBJC_CLASS(UIColor); DECLARE_WXCOCOA_OBJC_CLASS(UIMenu); DECLARE_WXCOCOA_OBJC_CLASS(UIMenuItem); DECLARE_WXCOCOA_OBJC_CLASS(UIWindow); -DECLARE_WXCOCOA_OBJC_CLASS(UImage); DECLARE_WXCOCOA_OBJC_CLASS(UIView); -DECLARE_WXCOCOA_OBJC_CLASS(UIFont); -DECLARE_WXCOCOA_OBJC_CLASS(UIImage); DECLARE_WXCOCOA_OBJC_CLASS(UIEvent); DECLARE_WXCOCOA_OBJC_CLASS(UIPress); DECLARE_WXCOCOA_OBJC_CLASS(UIKey); -DECLARE_WXCOCOA_OBJC_CLASS(NSSet); DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext); DECLARE_WXCOCOA_OBJC_CLASS(UIPasteboard); typedef WX_UIWindow WXWindow; typedef WX_UIEvent WXEvent; typedef WX_UIView WXWidget; -typedef WX_UIColor WXColor; -typedef WX_UIImage WXImage; typedef WX_UIMenu WXHMENU; typedef WX_EAGLContext WXGLContext; typedef WX_NSString WXGLPixelFormat; @@ -2841,8 +2852,7 @@ typedef WX_UIPasteboard WXOSXPasteboard; #endif - -#endif /* __WXMAC__ */ +#endif /* __DARWIN__ */ /* ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port */ #if defined(__WIN32__) diff --git a/include/wx/gtk/mimetype.h b/include/wx/gtk/mimetype.h index f3e0779e49..6beaf53a88 100644 --- a/include/wx/gtk/mimetype.h +++ b/include/wx/gtk/mimetype.h @@ -12,10 +12,12 @@ #include "wx/defs.h" -#if defined(__UNIX__) -#include "wx/unix/mimetype.h" +#if defined(__DARWIN__) + #include "wx/osx/mimetype.h" +#elif defined(__UNIX__) + #include "wx/unix/mimetype.h" #elif defined(__WINDOWS__) -#include "wx/msw/mimetype.h" + #include "wx/msw/mimetype.h" #endif #if wxUSE_MIMETYPE @@ -23,7 +25,7 @@ class WXDLLIMPEXP_CORE wxGTKMimeTypesManagerImpl : public wxMimeTypesManagerImpl { protected: -#if defined(__UNIX__) +#if defined(__UNIX__) && !defined(__DARWIN__) wxString GetIconFromMimeType(const wxString& mime) override; #endif }; diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index 9c22a5a922..8fb3fa6e39 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -39,7 +39,7 @@ # endif #endif -#if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON +#if ( !wxUSE_GUI && !defined(__WXOSX_IPHONE__) ) || defined(__WXOSX_COCOA__) // Carbon functions are currently still used in wxOSX/Cocoa too (including // wxBase part of it). @@ -66,9 +66,9 @@ WXDLLIMPEXP_BASE NSString* wxNSStringWithWxString(const wxString &wxstring); WXDLLIMPEXP_BASE CFURLRef wxOSXCreateURLFromFileSystemPath( const wxString& path); -#if wxUSE_GUI +#if wxUSE_GUI && defined(__WXOSX__) -#if !wxOSX_USE_IPHONE +#if !defined(__WXOSX_IPHONE__) #include #endif @@ -1050,15 +1050,19 @@ protected : wxDECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl); }; -#endif // wxUSE_GUI +#endif // __WXOSX__ //--------------------------------------------------------------------------- // cocoa bridging utilities //--------------------------------------------------------------------------- -bool wxMacInitCocoa(); +#ifdef __WXDARWIN_OSX__ -class WXDLLIMPEXP_CORE wxMacAutoreleasePool +bool WXDLLIMPEXP_BASE wxMacInitCocoa(); + +#endif // __WXDARWIN_OSX__ + +class WXDLLIMPEXP_BASE wxMacAutoreleasePool { public : wxMacAutoreleasePool(); @@ -1069,9 +1073,9 @@ private : // NSObject -void wxMacCocoaRelease( void* obj ); -void wxMacCocoaAutorelease( void* obj ); -void* wxMacCocoaRetain( void* obj ); +void WXDLLIMPEXP_BASE wxMacCocoaRelease( void* obj ); +void WXDLLIMPEXP_BASE wxMacCocoaAutorelease( void* obj ); +void* WXDLLIMPEXP_BASE wxMacCocoaRetain( void* obj ); // shared_ptr like API for NSObject and subclasses template diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h index 23fd0025fb..113e244f14 100644 --- a/include/wx/osx/private.h +++ b/include/wx/osx/private.h @@ -3,12 +3,18 @@ #include "wx/osx/core/private.h" -#if wxOSX_USE_IPHONE +#ifdef __WXOSX_IPHONE__ #include "wx/osx/iphone/private.h" -#elif wxOSX_USE_COCOA +#elif defined(__WXOSX_COCOA__) #include "wx/osx/cocoa/private.h" -#elif wxUSE_GUI +#elif wxUSE_GUI && defined(__WXOSX__) #error "Must include wx/defs.h first" +#else + #include + + #ifdef __OBJC__ + #import + #endif #endif #endif diff --git a/include/wx/osx/private/webrequest_urlsession.h b/include/wx/osx/private/webrequest_urlsession.h index 3d23124cc2..3b7ad2415f 100644 --- a/include/wx/osx/private/webrequest_urlsession.h +++ b/include/wx/osx/private/webrequest_urlsession.h @@ -191,9 +191,9 @@ public: private: WX_NSURLSession m_session = nullptr; WX_wxWebSessionDelegate m_delegate; -#if !wxOSX_USE_IPHONE +#ifdef __WXDARWIN_OSX__ WX_NSURLComponents m_proxyURL = nullptr; -#endif // !wxOSX_USE_IPHONE +#endif // __WXDARWIN_OSX__ bool m_persistentStorageEnabled = false; wxDECLARE_NO_COPY_CLASS(wxWebSessionURLSession); diff --git a/include/wx/platform.h b/include/wx/platform.h index ea46f78be9..4273857913 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -419,8 +419,17 @@ # endif #endif -#ifdef __WXOSX_MAC__ +#ifdef __DARWIN__ # if defined(__MACH__) +# define __WXDARWIN__ 1 +# include +# if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE +/* this branch is also true for tv, catalyst, watch and vision */ +# define __WXDARWIN_IPHONE__ 1 +# elif defined(TARGET_OS_OSX) && TARGET_OS_OSX +# define __WXDARWIN_OSX__ 1 +# endif + # include # ifndef MAC_OS_X_VERSION_10_4 # define MAC_OS_X_VERSION_10_4 1040 diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h index 42aa1f4e9f..b1d1cd5a8a 100644 --- a/include/wx/stdpaths.h +++ b/include/wx/stdpaths.h @@ -223,7 +223,7 @@ protected: #if defined(__WINDOWS__) #include "wx/msw/stdpaths.h" #define wxHAS_NATIVE_STDPATHS - #elif defined(__DARWIN__) || defined(__WXOSX_IPHONE__) + #elif defined(__DARWIN__) #include "wx/osx/core/stdpaths.h" #define wxHAS_NATIVE_STDPATHS #elif defined(__UNIX__) diff --git a/samples/widgets/native.cpp b/samples/widgets/native.cpp index 3956e3f0f4..553c0ce17e 100644 --- a/samples/widgets/native.cpp +++ b/samples/widgets/native.cpp @@ -24,7 +24,7 @@ // Objective C++, but it's also still compiled by the makefiles directly as C++ // source because we can't easily exclude it, so check for this and only // compile the rest of this file once -#if !defined(__WXOSX_COCOA__) || defined(__OBJC__) +#if !defined(__DARWIN__) || defined(__OBJC__) // for all others, include the necessary headers #ifndef WX_PRECOMP diff --git a/src/common/arrstr.cpp b/src/common/arrstr.cpp index 7899726a7a..bb3b6e4342 100644 --- a/src/common/arrstr.cpp +++ b/src/common/arrstr.cpp @@ -810,7 +810,7 @@ int wxCMPFUNC_CONV wxCmpNaturalGeneric(const wxString& s1, const wxString& s2) // ---------------------------------------------------------------------------- // If native natural sort function isn't available, use the generic version. -#if !(defined(__WINDOWS__) || defined(__DARWIN__) || defined(__WXOSX_IPHONE__)) +#if !(defined(__WINDOWS__) || defined(__DARWIN__)) int wxCMPFUNC_CONV wxCmpNatural(const wxString& s1, const wxString& s2) { diff --git a/src/common/intl.cpp b/src/common/intl.cpp index b96c11b527..10a50cc71b 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -55,7 +55,7 @@ #ifdef __WIN32__ #include "wx/msw/private/uilocale.h" -#elif defined(__WXOSX__) +#elif defined(__DARWIN__) #include "wx/osx/core/cfref.h" #include "wx/osx/core/cfstring.h" #include @@ -535,7 +535,7 @@ wxString wxLocale::GetSystemEncodingName() default: encname.Printf(wxS("windows-%u"), codepage); } -#elif defined(__WXMAC__) +#elif defined(__DARWIN__) encname = wxCFStringRef::AsString( CFStringGetNameOfEncoding(CFStringGetSystemEncoding()) ); @@ -819,7 +819,7 @@ wxString wxLocale::GetHeaderValue(const wxString& header, // accessors for locale-dependent data // ---------------------------------------------------------------------------- -#if defined(__WINDOWS__) || defined(__WXOSX__) +#if defined(__WINDOWS__) || defined(__DARWIN__) namespace { @@ -1243,7 +1243,7 @@ wxString wxLocale::GetOSInfo(wxLocaleInfo index, wxLocaleCategory cat) return wxUILocale::GetCurrent().GetInfo(index, cat); } -#elif defined(__WXOSX__) +#elif defined(__DARWIN__) // This function is also used by wxUILocaleImpl, so don't make it private. extern wxString diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 40c895c963..e522213659 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -509,7 +509,7 @@ wxString wxGetCurrentDir() // ---------------------------------------------------------------------------- #ifdef __WXOSX__ -#if wxOSX_USE_COCOA_OR_CARBON +#if defined(wxOSX_USE_COCOA_OR_CARBON) && wxOSX_USE_COCOA_OR_CARBON #include #endif #endif @@ -531,7 +531,7 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map) // TODO : should we do something with logicals? char **env=nullptr; #elif defined(__DARWIN__) -#if wxOSX_USE_COCOA_OR_CARBON +#if defined(wxOSX_USE_COCOA_OR_CARBON) && wxOSX_USE_COCOA_OR_CARBON // Under Mac shared libraries don't have access to the global environ // variable so use this Mac-specific function instead as advised by // environ(7) under Darwin @@ -1513,7 +1513,7 @@ wxWindowDisabler::wxWindowDisabler(bool disable) { DoDisable(); -#if defined(__WXOSX__) && wxOSX_USE_COCOA +#if defined(__WXOSX__) && defined(wxOSX_USE_COCOA) && wxOSX_USE_COCOA AfterDisable(nullptr); #endif } @@ -1530,7 +1530,7 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip, wxWindow *winToSkip2) DoDisable(); -#if defined(__WXOSX__) && wxOSX_USE_COCOA +#if defined(__WXOSX__) && defined(wxOSX_USE_COCOA) && wxOSX_USE_COCOA AfterDisable(winToSkip); #endif } @@ -1563,7 +1563,7 @@ wxWindowDisabler::~wxWindowDisabler() if ( !m_disabled ) return; -#if defined(__WXOSX__) && wxOSX_USE_COCOA +#if defined(__WXOSX__) && defined(wxOSX_USE_COCOA) && wxOSX_USE_COCOA BeforeEnable(); #endif diff --git a/src/gtk/mimetype.cpp b/src/gtk/mimetype.cpp index a7d681927b..7e2825488c 100644 --- a/src/gtk/mimetype.cpp +++ b/src/gtk/mimetype.cpp @@ -18,7 +18,7 @@ #include "wx/gtk/private/string.h" #include "wx/gtk/private/object.h" -#if defined(__UNIX__) +#if defined(__UNIX__) && !defined(__DARWIN__) wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime) { wxString icon; diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm index 429f5c910f..14e45ff3b6 100644 --- a/src/osx/carbon/utilscocoa.mm +++ b/src/osx/carbon/utilscocoa.mm @@ -28,19 +28,6 @@ #include "wx/fontutil.h" #include "wx/private/bmpbndl.h" -#ifdef __WXMAC__ - -wxMacAutoreleasePool::wxMacAutoreleasePool() -{ - m_pool = [[NSAutoreleasePool alloc] init]; -} - -wxMacAutoreleasePool::~wxMacAutoreleasePool() -{ - [(NSAutoreleasePool*)m_pool release]; -} - -#endif #if wxOSX_USE_COCOA @@ -72,26 +59,6 @@ CGContextRef wxOSXGetContextFromCurrentContext() #endif -// ---------------------------------------------------------------------------- -// NSObject Utils -// ---------------------------------------------------------------------------- - -void wxMacCocoaRelease( void* obj ) -{ - [(NSObject*)obj release]; -} - -void wxMacCocoaAutorelease( void* obj ) -{ - [(NSObject*)obj autorelease]; -} - -void* wxMacCocoaRetain( void* obj ) -{ - [(NSObject*)obj retain]; - return obj; -} - // ---------------------------------------------------------------------------- // NSFont Utils // ---------------------------------------------------------------------------- @@ -699,20 +666,6 @@ wxPoint wxMacCocoaGetCursorHotSpot(WX_NSCursor cursor) } #endif -//--------------------------------------------------------- -// helper functions for NSString<->wxString conversion -//--------------------------------------------------------- - -wxString wxStringWithNSString(NSString *nsstring) -{ - return wxString([nsstring UTF8String], wxConvUTF8); -} - -NSString* wxNSStringWithWxString(const wxString &wxstring) -{ - return [NSString stringWithUTF8String: wxstring.mb_str(wxConvUTF8)]; -} - // ---------------------------------------------------------------------------- // helper class for getting the correct system colors according to the // appearance in effect diff --git a/src/osx/cocoa/utils_base.mm b/src/osx/cocoa/utils_base.mm index f5b7a888a7..dfafab25ee 100644 --- a/src/osx/cocoa/utils_base.mm +++ b/src/osx/cocoa/utils_base.mm @@ -41,7 +41,7 @@ wxSocketManager *wxOSXSocketManagerCF = nullptr; // our OS version is the same in non GUI and GUI cases wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro) { -#if wxHAS_NSPROCESSINFO +#ifdef wxHAS_NSPROCESSINFO NSOperatingSystemVersion osVer = [NSProcessInfo processInfo].operatingSystemVersion; if ( verMaj != nullptr ) @@ -73,7 +73,7 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro) bool wxCheckOsVersion(int majorVsn, int minorVsn, int microVsn) { -#if wxHAS_NSPROCESSINFO +#ifdef wxHAS_NSPROCESSINFO NSOperatingSystemVersion osVer; osVer.majorVersion = majorVsn; osVer.minorVersion = minorVsn; @@ -96,7 +96,7 @@ wxString wxGetOsDescription() int majorVer, minorVer; wxGetOsVersion(&majorVer, &minorVer); -#ifndef __WXOSX_IPHONE__ +#ifdef __WXDARWIN_OSX__ // Notice that neither the OS name itself nor the code names seem to be // ever translated, OS X itself uses the English words even for the // languages not using Roman alphabet. @@ -197,7 +197,7 @@ bool wxDateTime::GetFirstWeekDay(wxDateTime::WeekDay *firstDay) } #endif // wxUSE_DATETIME -#ifndef __WXOSX_IPHONE__ +#ifdef __WXDARWIN_OSX__ #include @@ -278,11 +278,16 @@ bool wxCocoaLaunch(const char* const* argv, pid_t &pid) NSRunningApplication *app = nil; - if ( [params count] > 0 ) - app = [ws openURLs:params withApplicationAtURL:url - options:NSWorkspaceLaunchAsync - configuration:[NSDictionary dictionary] - error:&error]; +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 + if ( WX_IS_MACOS_AVAILABLE(10, 10) ) + { + if ( [params count] > 0 ) + app = [ws openURLs:params withApplicationAtURL:url + options:NSWorkspaceLaunchAsync + configuration:[NSDictionary dictionary] + error:&error]; + } +#endif if ( app == nil ) { @@ -325,3 +330,62 @@ int wxCMPFUNC_CONV wxCmpNatural(const wxString& s1, const wxString& s2) // expected return values of wxCmpNatural(), so we don't need to convert. return [wxCFStringRef(s1).AsNSString() localizedStandardCompare: wxCFStringRef(s2).AsNSString()]; } + +wxMacAutoreleasePool::wxMacAutoreleasePool() +{ + m_pool = [[NSAutoreleasePool alloc] init]; +} + +wxMacAutoreleasePool::~wxMacAutoreleasePool() +{ + [(NSAutoreleasePool*)m_pool release]; +} + +// ---------------------------------------------------------------------------- +// NSObject Utils +// ---------------------------------------------------------------------------- + +void wxMacCocoaRelease( void* obj ) +{ + [(NSObject*)obj release]; +} + +void wxMacCocoaAutorelease( void* obj ) +{ + [(NSObject*)obj autorelease]; +} + +void* wxMacCocoaRetain( void* obj ) +{ + [(NSObject*)obj retain]; + return obj; +} + +//--------------------------------------------------------- +// helper functions for NSString<->wxString conversion +//--------------------------------------------------------- + +wxString wxStringWithNSString(NSString *nsstring) +{ + return wxString([nsstring UTF8String], wxConvUTF8); +} + +NSString* wxNSStringWithWxString(const wxString &wxstring) +{ + return [NSString stringWithUTF8String: wxstring.mb_str(wxConvUTF8)]; +} + +//---------------------------------------------------------------------------- +// helper when starting as a command line tool without an NSApp running at all +//---------------------------------------------------------------------------- + +#ifdef __WXDARWIN_OSX__ + +bool wxMacInitCocoa() +{ + bool cocoaLoaded = NSApplicationLoad(); + wxASSERT_MSG(cocoaLoaded,wxT("Couldn't load Cocoa Environment as console app")) ; + return cocoaLoaded; +} + +#endif // __WXDARWIN_OSX__ diff --git a/src/osx/core/mimetype.cpp b/src/osx/core/mimetype.cpp index e60f105a4f..9c6fb07728 100644 --- a/src/osx/core/mimetype.cpp +++ b/src/osx/core/mimetype.cpp @@ -426,7 +426,17 @@ void wxMimeTypesManagerImpl::LoadDisplayDataForUti(const wxString& uti) wxCFStringRef ext = UTTypeCopyPreferredTagWithClass( cfuti, kUTTagClassFilenameExtension ); // Look up the preferred application - wxCFRef appUrl = LSCopyDefaultApplicationURLForContentType( cfuti, kLSRolesAll, nullptr); + wxCFRef appUrl; +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10 + CFURLRef aurl; + // THIS FUNCTION, DESPITE ITS NAME, RETAINS THE URL REFERENCE ON BEHALF OF THE CALLER. + OSStatus status = LSGetApplicationForInfo( kLSUnknownType, kLSUnknownCreator, ext, kLSRolesAll, nullptr, &aurl ); + if( status != noErr ) + return; + appUrl.reset(aurl); +#else + appUrl.reset(LSCopyDefaultApplicationURLForContentType( cfuti, kLSRolesAll, nullptr)); +#endif if( !appUrl ) return; diff --git a/src/osx/core/uilocale.mm b/src/osx/core/uilocale.mm index 8fa0e137f7..299abb505e 100644 --- a/src/osx/core/uilocale.mm +++ b/src/osx/core/uilocale.mm @@ -43,7 +43,7 @@ NSLocale* wxGetCurrentNSLocale() { if (!gs_currentNSLocale) { - static wxCFRef stdCLocale([[NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"] retain]); + static wxCFRef stdCLocale([[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]); gs_currentNSLocale = stdCLocale; } return gs_currentNSLocale; @@ -103,8 +103,11 @@ public: // completely invalid strings, so we need to check if the name is // actually in the list of the supported locales ourselves. bool isAvailable = false; - for ( id nsLocId in [NSLocale availableLocaleIdentifiers] ) + NSArray* availableLocaleIds = [NSLocale availableLocaleIdentifiers]; + + for (NSUInteger i = 0; i < [availableLocaleIds count]; i++) { + NSString* nsLocId = [availableLocaleIds objectAtIndex:i]; // We can't simply compare the names here because the list returned // by NSLocale is incomplete and doesn't contain all synonyms, e.g. // it only contains "zh_Hant_TW" but not "zh_TW" itself, so we need @@ -146,10 +149,12 @@ public: return nullptr; wxCFStringRef cfName(locId.GetName()); - auto nsloc = [NSLocale localeWithLocaleIdentifier: cfName.AsNSString()]; + NSLocale* nsloc = [[NSLocale alloc] initWithLocaleIdentifier:cfName.AsNSString()]; if ( !nsloc ) return nullptr; + [nsloc autorelease]; + return new wxUILocaleImplCF(nsloc); } @@ -239,17 +244,17 @@ wxUILocaleImplCF::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const return wxString(); } - NSString* str = nullptr; + NSString* str = nil; switch (name) { case wxLOCALE_NAME_LOCALE: - str = [convLocale localizedStringForLocaleIdentifier:[m_nsloc localeIdentifier]]; + str = [convLocale displayNameForKey:NSLocaleIdentifier value:[m_nsloc objectForKey:NSLocaleIdentifier]]; break; case wxLOCALE_NAME_LANGUAGE: - str = [convLocale localizedStringForLanguageCode:[m_nsloc languageCode]]; + str = [convLocale displayNameForKey:NSLocaleLanguageCode value:[m_nsloc objectForKey:NSLocaleLanguageCode]]; break; case wxLOCALE_NAME_COUNTRY: - str = [convLocale localizedStringForCountryCode:[m_nsloc countryCode]]; + str = [convLocale displayNameForKey:NSLocaleCountryCode value:[m_nsloc objectForKey:NSLocaleCountryCode]]; break; } return wxCFStringRef::AsString(str); @@ -350,7 +355,7 @@ wxUILocaleImplCF::GetWeekDayName(wxDateTime::WeekDay weekday, wxDateTime::NameFo wxLayoutDirection wxUILocaleImplCF::GetLayoutDirection() const { - NSLocaleLanguageDirection layoutDirection = [NSLocale characterDirectionForLanguage:[m_nsloc languageCode]]; + NSLocaleLanguageDirection layoutDirection = [NSLocale characterDirectionForLanguage:[m_nsloc objectForKey:NSLocaleLanguageCode]]; if (layoutDirection == NSLocaleLanguageDirectionLeftToRight) return wxLayout_LeftToRight; else if (layoutDirection == NSLocaleLanguageDirectionRightToLeft) @@ -367,14 +372,14 @@ wxUILocaleImplCF::GetNumberFormatting() const wxString wxUILocaleImplCF::GetCurrencySymbol() const { - NSString* str = [m_nsloc currencySymbol]; + NSString* str = [m_nsloc objectForKey:NSLocaleCurrencySymbol]; return wxCFStringRef::AsString(str); } wxString wxUILocaleImplCF::GetCurrencyCode() const { - NSString* str = [m_nsloc currencyCode]; + NSString* str = [m_nsloc objectForKey:NSLocaleCurrencyCode]; return wxCFStringRef::AsString(str); } @@ -386,7 +391,7 @@ wxUILocaleImplCF::GetCurrencySymbolPosition() const formatter.locale = m_nsloc; formatter.numberStyle = NSNumberFormatterCurrencyStyle; - NSString* formatted = [formatter stringFromNumber:@123]; + NSString* formatted = [formatter stringFromNumber:[NSNumber numberWithInt:123]]; NSString* symbol = formatter.currencySymbol; NSRange symbolRange = [formatted rangeOfString:symbol]; @@ -478,7 +483,7 @@ wxUILocaleImplCF::UsesMetricSystem() const { if ([m_nsloc respondsToSelector:@selector(usesMetricSystem)]) { - BOOL isMetric = [m_nsloc usesMetricSystem]; + BOOL isMetric = [(NSNumber*) [m_nsloc objectForKey:NSLocaleUsesMetricSystem] boolValue]; return (isMetric) ? wxMeasurementSystem::Metric : wxMeasurementSystem::NonMetric; } return wxMeasurementSystem::Unknown; @@ -492,7 +497,7 @@ wxUILocaleImpl* wxUILocaleImpl::CreateStdC() // wouldn't be much better as we'd still need a hack for it in GetName() // because the locale names are always converted to lower case, while we // really want to return "C" rather than "c" as the name of this one. - return new wxUILocaleImplCF([NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]); + return new wxUILocaleImplCF([[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"] autorelease]); } /* static */ @@ -512,10 +517,11 @@ wxVector wxUILocaleImpl::GetPreferredUILanguages() { wxVector preferred; NSArray* preferredLangs = [NSLocale preferredLanguages]; - NSUInteger count = preferredLangs.count; - - for (NSUInteger j = 0; j < count; ++j) - preferred.push_back(wxCFStringRef::AsString(preferredLangs[j])); + for (NSUInteger i = 0; i < [preferredLangs count]; i++) \ + { + NSString* preferredLang = [preferredLangs objectAtIndex:i]; + preferred.push_back(wxCFStringRef::AsString(preferredLang)); + } return preferred; } diff --git a/src/osx/volume.mm b/src/osx/volume.mm index c26a91d8ca..0d3e5f8988 100644 --- a/src/osx/volume.mm +++ b/src/osx/volume.mm @@ -35,13 +35,22 @@ #import #import +#if __MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 + +#define NSURLVolumeLocalizedNameKey @"NSURLVolumeLocalizedNameKey" +#define NSURLVolumeIsLocalKey @"NSURLVolumeIsLocalKey" +#define NSURLVolumeIsReadOnlyKey @"NSURLVolumeIsReadOnlyKey" +#define NSURLVolumeIsRemovableKey @"NSURLVolumeIsRemovableKey" + +#endif + //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // wxFSVolume //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset) { - auto nativeVolumes = [[NSFileManager defaultManager] + NSArray* nativeVolumes = [[NSFileManager defaultManager] mountedVolumeURLsIncludingResourceValuesForKeys:nil options:NSVolumeEnumerationSkipHiddenVolumes]; @@ -56,9 +65,10 @@ wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset) } else { - for (NSURL* url in nativeVolumes) + for (NSUInteger i = 0; i < [nativeVolumes count]; i++) \ { - wxFSVolumeBase volume(url.fileSystemRepresentation); + NSURL* url = [nativeVolumes objectAtIndex:i]; + wxFSVolumeBase volume([[url path] fileSystemRepresentation]); int flags = volume.GetFlags(); if ((flags & flagsSet) == flagsSet && !(flags & flagsUnset)) volumePaths.push_back(volume.GetName()); @@ -87,7 +97,7 @@ bool wxFSVolumeBase::Create(const wxString& name) m_volName = name; NSURL* url = [NSURL fileURLWithPath:wxCFStringRef(name).AsNSString()]; - auto values = [url resourceValuesForKeys:@[NSURLVolumeLocalizedNameKey] error:nil]; + NSDictionary* values = [url resourceValuesForKeys:[NSArray arrayWithObjects: NSURLVolumeLocalizedNameKey, nil] error:nil]; if (values) { m_isOk = true; @@ -105,7 +115,7 @@ bool wxFSVolumeBase::IsOk() const wxFSVolumeKind wxFSVolumeBase::GetKind() const { NSURL* url = [NSURL fileURLWithPath:wxCFStringRef(GetName()).AsNSString()]; - auto values = [url resourceValuesForKeys:@[NSURLVolumeIsLocalKey, NSURLVolumeIsReadOnlyKey] error:nil]; + NSDictionary* values = [url resourceValuesForKeys:[NSArray arrayWithObjects: NSURLVolumeIsLocalKey, NSURLVolumeIsReadOnlyKey, nil] error:nil]; // Assume disk for local volumes if ([(NSNumber*)[values objectForKey:NSURLVolumeIsLocalKey] boolValue]) @@ -122,7 +132,7 @@ wxFSVolumeKind wxFSVolumeBase::GetKind() const int wxFSVolumeBase::GetFlags() const { NSURL* url = [NSURL fileURLWithPath:wxCFStringRef(GetName()).AsNSString()]; - auto values = [url resourceValuesForKeys:@[NSURLVolumeIsRemovableKey, NSURLVolumeIsLocalKey, NSURLVolumeIsReadOnlyKey] error:nil]; + NSDictionary* values = [url resourceValuesForKeys:[NSArray arrayWithObjects: NSURLVolumeIsRemovableKey, NSURLVolumeIsLocalKey, NSURLVolumeIsReadOnlyKey, nil] error:nil]; if (values) { // mounted status cannot be determined, assume mounted diff --git a/src/osx/webrequest_urlsession.mm b/src/osx/webrequest_urlsession.mm index 1ba44f0a0e..618055d669 100644 --- a/src/osx/webrequest_urlsession.mm +++ b/src/osx/webrequest_urlsession.mm @@ -506,9 +506,9 @@ wxWebSessionURLSession::~wxWebSessionURLSession() { [m_session release]; [m_delegate release]; -#if !wxOSX_USE_IPHONE +#ifdef __WXDARWIN_OSX__ [m_proxyURL release]; -#endif // !wxOSX_USE_IPHONE +#endif // __WXDARWIN_OSX__ } wxWebRequestImplPtr @@ -542,10 +542,10 @@ wxVersionInfo wxWebSessionURLSession::GetLibraryVersionInfo() const bool wxWebSessionURLSession::SetProxy(const wxWebProxy& proxy) { -#if wxOSX_USE_IPHONE +#ifndef __WXDARWIN_OSX__ // Setting the proxy doesn't seem to be supported under iOS. return false; -#else // !wxOSX_USE_IPHONE +#else // !__WXDARWIN_OSX__ wxCHECK_MSG( !m_session, false, "Proxy must be set before the first request is made" ); @@ -621,7 +621,7 @@ bool wxWebSessionURLSession::SetProxy(const wxWebProxy& proxy) } return wxWebSessionImpl::SetProxy(proxy); -#endif // wxOSX_USE_IPHONE/!wxOSX_USE_IPHONE +#endif // __WXDARWIN_OSX__ } bool wxWebSessionURLSession::EnablePersistentStorage(bool enable) @@ -641,7 +641,7 @@ WX_NSURLSession wxWebSessionURLSession::GetSession() [NSURLSessionConfiguration defaultSessionConfiguration] : [NSURLSessionConfiguration ephemeralSessionConfiguration]; -#if !wxOSX_USE_IPHONE +#ifdef __WXDARWIN_OSX__ switch ( GetProxy().GetType() ) { case wxWebProxy::Type::URL: @@ -670,7 +670,7 @@ WX_NSURLSession wxWebSessionURLSession::GetSession() // Nothing to do, system proxy will be used by default. break; } -#endif // !wxOSX_USE_IPHONE +#endif // __WXDARWIN_OSX__ m_session = [[NSURLSession sessionWithConfiguration:config delegate:m_delegate delegateQueue:nil] retain]; } diff --git a/src/unix/appunix.cpp b/src/unix/appunix.cpp index cf7a1a6f49..e70d9d42ea 100644 --- a/src/unix/appunix.cpp +++ b/src/unix/appunix.cpp @@ -20,6 +20,10 @@ #include "wx/private/fdiodispatcher.h" #include "wx/private/fdioeventloopsourcehandler.h" +#ifdef __DARWIN__ +#include "wx/osx/private.h" +#endif + #include #include @@ -86,6 +90,14 @@ wxAppConsole::~wxAppConsole() // same names bool wxAppConsole::Initialize(int& argc_, wxChar** argv_) { +#ifdef __DARWIN__ + // On command line apps on macOS we need to initialize Cocoa framework + wxMacAutoreleasePool autoreleasepool; +#ifdef __WXDARWIN_OSX__ + wxMacInitCocoa(); +#endif +#endif // __DARWIN__ + if ( !wxAppConsoleBase::Initialize(argc_, argv_) ) return false; diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 57088a259e..f4f96c953a 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -489,7 +489,7 @@ private: // wxExecute implementations // ---------------------------------------------------------------------------- -#if defined(__DARWIN__) && !defined(__WXOSX_IPHONE__) +#ifdef __WXDARWIN_OSX__ bool wxCocoaLaunch(const char* const* argv, pid_t &pid); #endif @@ -610,7 +610,7 @@ long wxExecute(const char* const* argv, int flags, wxProcess* process, wxT("wxExecute() can be called only from the main thread") ); #endif // wxUSE_THREADS pid_t pid; -#if defined(__DARWIN__) && !defined(__WXOSX_IPHONE__) +#ifdef __WXDARWIN_OSX__ pid = -1; // wxCocoaLaunch() only executes app bundles and only does it asynchronously. // It returns false if the target is not an app bundle, thus falling