From 9f43ec03e65e4539fd6bbf84f9d357e74f2b9e23 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 28 Aug 2021 01:10:14 +0200 Subject: [PATCH] Rename Mac uilocale.cpp to uilocale.mm No real changes yet, just prepare for using Objective-C code in this file. --- Makefile.in | 30 ++++++++++---------- build/bakefiles/files.bkl | 2 +- build/cmake/files.cmake | 2 +- build/files | 2 +- build/osx/wxcocoa.xcodeproj/project.pbxproj | 16 +++++------ build/osx/wxiphone.xcodeproj/project.pbxproj | 16 +++++------ src/osx/core/{uilocale.cpp => uilocale.mm} | 2 +- 7 files changed, 35 insertions(+), 35 deletions(-) rename src/osx/core/{uilocale.cpp => uilocale.mm} (98%) diff --git a/Makefile.in b/Makefile.in index 519cf77147..73bc043727 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2368,7 +2368,7 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC = \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ - src/osx/core/uilocale.cpp \ + src/osx/core/uilocale.mm \ src/common/fdiodispatcher.cpp \ src/common/selectdispatcher.cpp \ src/unix/appunix.cpp \ @@ -2394,7 +2394,7 @@ COND_TOOLKIT_OSX_IPHONE_BASE_OSX_SRC = \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ - src/osx/core/uilocale.cpp \ + src/osx/core/uilocale.mm \ src/common/fdiodispatcher.cpp \ src/common/selectdispatcher.cpp \ src/unix/appunix.cpp \ @@ -2435,7 +2435,7 @@ COND_TOOLKIT_COCOA_BASE_OSX_SRC = \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ - src/osx/core/uilocale.cpp + src/osx/core/uilocale.mm @COND_TOOLKIT_COCOA@BASE_OSX_SRC = $(COND_TOOLKIT_COCOA_BASE_OSX_SRC) COND_TOOLKIT_GTK_BASE_OSX_SRC = \ src/common/fdiodispatcher.cpp \ @@ -2459,7 +2459,7 @@ COND_TOOLKIT_GTK_BASE_OSX_SRC = \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ - src/osx/core/uilocale.cpp + src/osx/core/uilocale.mm @COND_TOOLKIT_GTK@BASE_OSX_SRC = $(COND_TOOLKIT_GTK_BASE_OSX_SRC) COND_TOOLKIT_X11_BASE_OSX_SRC = \ src/common/fdiodispatcher.cpp \ @@ -2483,7 +2483,7 @@ COND_TOOLKIT_X11_BASE_OSX_SRC = \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ - src/osx/core/uilocale.cpp + src/osx/core/uilocale.mm @COND_TOOLKIT_X11@BASE_OSX_SRC = $(COND_TOOLKIT_X11_BASE_OSX_SRC) COND_TOOLKIT_MOTIF_BASE_OSX_SRC = \ src/common/fdiodispatcher.cpp \ @@ -2507,7 +2507,7 @@ COND_TOOLKIT_MOTIF_BASE_OSX_SRC = \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ - src/osx/core/uilocale.cpp + src/osx/core/uilocale.mm @COND_TOOLKIT_MOTIF@BASE_OSX_SRC = $(COND_TOOLKIT_MOTIF_BASE_OSX_SRC) COND_TOOLKIT__BASE_OSX_SRC = \ src/common/fdiodispatcher.cpp \ @@ -2531,7 +2531,7 @@ COND_TOOLKIT__BASE_OSX_SRC = \ src/osx/core/strconv_cf.cpp \ src/osx/cocoa/utils_base.mm \ src/osx/core/secretstore.cpp \ - src/osx/core/uilocale.cpp + src/osx/core/uilocale.mm @COND_TOOLKIT_@BASE_OSX_SRC = $(COND_TOOLKIT__BASE_OSX_SRC) COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ wx/osx/core/cfdataref.h \ @@ -16124,8 +16124,8 @@ monodll_utils_base.o: $(srcdir)/src/osx/cocoa/utils_base.mm $(MONODLL_ODEP) monodll_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/secretstore.cpp -monodll_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/uilocale.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_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp @@ -21413,8 +21413,8 @@ monolib_utils_base.o: $(srcdir)/src/osx/cocoa/utils_base.mm $(MONOLIB_ODEP) monolib_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/secretstore.cpp -monolib_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/uilocale.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_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp @@ -26702,8 +26702,8 @@ basedll_utils_base.o: $(srcdir)/src/osx/cocoa/utils_base.mm $(BASEDLL_ODEP) basedll_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/secretstore.cpp -basedll_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/uilocale.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_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp @@ -27188,8 +27188,8 @@ baselib_utils_base.o: $(srcdir)/src/osx/cocoa/utils_base.mm $(BASELIB_ODEP) baselib_core_secretstore.o: $(srcdir)/src/osx/core/secretstore.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/secretstore.cpp -baselib_core_uilocale.o: $(srcdir)/src/osx/core/uilocale.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/uilocale.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_fswatcher_fsevents.o: $(srcdir)/src/osx/fswatcher_fsevents.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/fswatcher_fsevents.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index afa23f0bcc..20f690cf12 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -189,7 +189,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/core/strconv_cf.cpp src/osx/cocoa/utils_base.mm src/osx/core/secretstore.cpp - src/osx/core/uilocale.cpp + src/osx/core/uilocale.mm wx/osx/core/cfdataref.h diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index df46473e51..8e5bee9963 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -116,7 +116,7 @@ set(BASE_COREFOUNDATION_SRC src/osx/core/secretstore.cpp src/osx/core/strconv_cf.cpp src/osx/cocoa/utils_base.mm - src/osx/core/uilocale.cpp + src/osx/core/uilocale.mm ) set(BASE_COREFOUNDATION_HDR diff --git a/build/files b/build/files index eafe03673d..66277ee757 100644 --- a/build/files +++ b/build/files @@ -141,7 +141,7 @@ BASE_COREFOUNDATION_SRC = src/osx/core/evtloop_cf.cpp src/osx/core/secretstore.cpp src/osx/core/strconv_cf.cpp - src/osx/core/uilocale.cpp + src/osx/core/uilocale.mm src/osx/cocoa/utils_base.mm BASE_COREFOUNDATION_HDR = diff --git a/build/osx/wxcocoa.xcodeproj/project.pbxproj b/build/osx/wxcocoa.xcodeproj/project.pbxproj index 4f426507e2..6ec448a196 100644 --- a/build/osx/wxcocoa.xcodeproj/project.pbxproj +++ b/build/osx/wxcocoa.xcodeproj/project.pbxproj @@ -1823,9 +1823,9 @@ 9A63148F193E33B5964DD029 /* uilocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E4466371B7E3265AE7B1E0C /* uilocale.cpp */; }; 9A63148F193E33B5964DD02A /* uilocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E4466371B7E3265AE7B1E0C /* uilocale.cpp */; }; 9A63148F193E33B5964DD02B /* uilocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E4466371B7E3265AE7B1E0C /* uilocale.cpp */; }; - 9A63148F193E33B5964DD02C /* uilocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E4466371B7E3265AE7B1E0D /* uilocale.cpp */; }; - 9A63148F193E33B5964DD02D /* uilocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E4466371B7E3265AE7B1E0D /* uilocale.cpp */; }; - 9A63148F193E33B5964DD02E /* uilocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E4466371B7E3265AE7B1E0D /* uilocale.cpp */; }; + AE660214E0CB375FBA508A36 /* uilocale.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B794996B953D00AC7BC2AE /* uilocale.mm */; }; + AE660214E0CB375FBA508A37 /* uilocale.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B794996B953D00AC7BC2AE /* uilocale.mm */; }; + AE660214E0CB375FBA508A38 /* uilocale.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B794996B953D00AC7BC2AE /* uilocale.mm */; }; 9A83D365AD1F37FA9C7030C2 /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EF330EAACFA53877BE289896 /* matrix.cpp */; }; 9A83D365AD1F37FA9C7030C3 /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EF330EAACFA53877BE289896 /* matrix.cpp */; }; 9A83D365AD1F37FA9C7030C4 /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EF330EAACFA53877BE289896 /* matrix.cpp */; }; @@ -4257,7 +4257,7 @@ 4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = ""; }; 4CB467F9898C3952A68D988B /* zutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = ../../src/zlib/zutil.c; sourceTree = ""; }; 4E4466371B7E3265AE7B1E0C /* uilocale.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uilocale.cpp; path = ../../src/common/uilocale.cpp; sourceTree = ""; }; - 4E4466371B7E3265AE7B1E0D /* uilocale.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uilocale.cpp; path = ../../src/osx/core/uilocale.cpp; sourceTree = ""; }; + E1B794996B953D00AC7BC2AE /* uilocale.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; name = uilocale.mm; path = ../../src/osx/core/uilocale.mm; sourceTree = ""; }; 4E74E9E53454331F8E10ECC5 /* pcre2_match_data.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pcre2_match_data.c; path = ../../3rdparty/pcre/src/pcre2_match_data.c; sourceTree = ""; }; 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/lexers/LexCSS.cxx; sourceTree = ""; }; 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = ""; }; @@ -6207,7 +6207,7 @@ D5F9383D1CE931499F339D85 /* strconv_cf.cpp */, 2ED0C0702D2734D9B08FC31D /* utils_base.mm */, 5BE1FB352696346BB642C045 /* secretstore.cpp */, - 4E4466371B7E3265AE7B1E0D /* uilocale.cpp */, + E1B794996B953D00AC7BC2AE /* uilocale.mm */, 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */, A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */, B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */, @@ -7638,7 +7638,7 @@ AAAB5DF8E60736D88273DD00 /* strconv_cf.cpp in Sources */, 68C300D096BF39239876D045 /* utils_base.mm in Sources */, B0FD1B96EAE635AFBFCF2C96 /* secretstore.cpp in Sources */, - 9A63148F193E33B5964DD02E /* uilocale.cpp in Sources */, + AE660214E0CB375FBA508A38 /* uilocale.mm in Sources */, D36E76A4CAF5352D9397E201 /* fdiodispatcher.cpp in Sources */, D3FB75C8E3A73AE38EE8A6F8 /* selectdispatcher.cpp in Sources */, BAAB6B1D80A33843A8436B12 /* appunix.cpp in Sources */, @@ -8356,7 +8356,7 @@ AAAB5DF8E60736D88273DCFF /* strconv_cf.cpp in Sources */, 68C300D096BF39239876D044 /* utils_base.mm in Sources */, B0FD1B96EAE635AFBFCF2C95 /* secretstore.cpp in Sources */, - 9A63148F193E33B5964DD02D /* uilocale.cpp in Sources */, + AE660214E0CB375FBA508A37 /* uilocale.mm in Sources */, D36E76A4CAF5352D9397E200 /* fdiodispatcher.cpp in Sources */, D3FB75C8E3A73AE38EE8A6F7 /* selectdispatcher.cpp in Sources */, BAAB6B1D80A33843A8436B11 /* appunix.cpp in Sources */, @@ -9649,7 +9649,7 @@ AAAB5DF8E60736D88273DCFE /* strconv_cf.cpp in Sources */, 68C300D096BF39239876D043 /* utils_base.mm in Sources */, B0FD1B96EAE635AFBFCF2C94 /* secretstore.cpp in Sources */, - 9A63148F193E33B5964DD02C /* uilocale.cpp in Sources */, + AE660214E0CB375FBA508A36 /* uilocale.mm in Sources */, D36E76A4CAF5352D9397E1FF /* fdiodispatcher.cpp in Sources */, D3FB75C8E3A73AE38EE8A6F6 /* selectdispatcher.cpp in Sources */, BAAB6B1D80A33843A8436B10 /* appunix.cpp in Sources */, diff --git a/build/osx/wxiphone.xcodeproj/project.pbxproj b/build/osx/wxiphone.xcodeproj/project.pbxproj index 5b5f939880..64498022f5 100644 --- a/build/osx/wxiphone.xcodeproj/project.pbxproj +++ b/build/osx/wxiphone.xcodeproj/project.pbxproj @@ -538,8 +538,8 @@ 99E7A46106C03484BA70D29E /* tif_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D2F8259CC99380CB8217DEF /* tif_unix.c */; }; 99F7D7BFBB543A04AB728375 /* m_hline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */; }; 9A178ED42D96329D8CBF9B89 /* tif_predict.c in Sources */ = {isa = PBXBuildFile; fileRef = 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */; }; - 9A63148F193E33B5964DD029 /* uilocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E4466371B7E3265AE7B1E0C /* uilocale.cpp */; }; - 9A63148F193E33B5964DD02A /* uilocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E4466371B7E3265AE7B1E0D /* uilocale.cpp */; }; + 9A63148F193E33B5964DD029 /* uilocale.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E4466371B7E3265AE7B1E0C /* uilocale.mm */; }; + 9A63148F193E33B5964DD02A /* uilocale.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E4466371B7E3265AE7B1E0D /* uilocale.mm */; }; 9A83D365AD1F37FA9C7030C2 /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EF330EAACFA53877BE289896 /* matrix.cpp */; }; 9B3F9D04FB533D99B58BD519 /* jfdctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */; }; 9B6A35E706543CDAA6A5014A /* LexGui4Cli.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */; }; @@ -1148,8 +1148,8 @@ 4BFEBC5061693DA0B52BC4AC /* pcre2_ord2utf.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pcre2_ord2utf.c; path = ../../3rdparty/pcre/src/pcre2_ord2utf.c; sourceTree = ""; }; 4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = ""; }; 4CB467F9898C3952A68D988B /* zutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = ../../src/zlib/zutil.c; sourceTree = ""; }; - 4E4466371B7E3265AE7B1E0C /* uilocale.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uilocale.cpp; path = ../../src/common/uilocale.cpp; sourceTree = ""; }; - 4E4466371B7E3265AE7B1E0D /* uilocale.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uilocale.cpp; path = ../../src/osx/core/uilocale.cpp; sourceTree = ""; }; + 4E4466371B7E3265AE7B1E0C /* uilocale.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uilocale.mm; path = ../../src/common/uilocale.mm; sourceTree = ""; }; + 4E4466371B7E3265AE7B1E0D /* uilocale.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uilocale.mm; path = ../../src/osx/core/uilocale.mm; sourceTree = ""; }; 4E74E9E53454331F8E10ECC5 /* pcre2_match_data.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pcre2_match_data.c; path = ../../3rdparty/pcre/src/pcre2_match_data.c; sourceTree = ""; }; 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/lexers/LexCSS.cxx; sourceTree = ""; }; 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = ""; }; @@ -2726,14 +2726,14 @@ 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */, 5BE1FB352696346BB642C044 /* secretstore.cpp */, 99A9D5F9254D35BE8F4176A4 /* lzmastream.cpp */, - 4E4466371B7E3265AE7B1E0C /* uilocale.cpp */, + 4E4466371B7E3265AE7B1E0C /* uilocale.mm */, 7C97C1F26B5A38C49543060C /* mimetype.cpp */, 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */, 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */, D5F9383D1CE931499F339D85 /* strconv_cf.cpp */, 2ED0C0702D2734D9B08FC31D /* utils_base.mm */, 5BE1FB352696346BB642C045 /* secretstore.cpp */, - 4E4466371B7E3265AE7B1E0D /* uilocale.cpp */, + 4E4466371B7E3265AE7B1E0D /* uilocale.mm */, 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */, A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */, B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */, @@ -3066,14 +3066,14 @@ E49F0D43B5A63EF1A57A7112 /* fswatcherg.cpp in Sources */, B0FD1B96EAE635AFBFCF2C91 /* secretstore.cpp in Sources */, A486A28E216D320AB57452D3 /* lzmastream.cpp in Sources */, - 9A63148F193E33B5964DD029 /* uilocale.cpp in Sources */, + 9A63148F193E33B5964DD029 /* uilocale.mm in Sources */, 4657E7382E9E3EDC8DE2401E /* mimetype.cpp in Sources */, 1DBDF75500D73A3098015E7F /* cfstring.cpp in Sources */, 9FBC642677C63D01AA2511BC /* evtloop_cf.cpp in Sources */, AAAB5DF8E60736D88273DCFE /* strconv_cf.cpp in Sources */, 68C300D096BF39239876D043 /* utils_base.mm in Sources */, B0FD1B96EAE635AFBFCF2C92 /* secretstore.cpp in Sources */, - 9A63148F193E33B5964DD02A /* uilocale.cpp in Sources */, + 9A63148F193E33B5964DD02A /* uilocale.mm in Sources */, D36E76A4CAF5352D9397E1FF /* fdiodispatcher.cpp in Sources */, D3FB75C8E3A73AE38EE8A6F6 /* selectdispatcher.cpp in Sources */, BAAB6B1D80A33843A8436B10 /* appunix.cpp in Sources */, diff --git a/src/osx/core/uilocale.cpp b/src/osx/core/uilocale.mm similarity index 98% rename from src/osx/core/uilocale.cpp rename to src/osx/core/uilocale.mm index 96a0058f5a..a035ad2c3a 100644 --- a/src/osx/core/uilocale.cpp +++ b/src/osx/core/uilocale.mm @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: src/osx/core/uilocale.cpp +// Name: src/osx/core/uilocale.mm // Purpose: wxUILocale implementation for macOS // Author: Vadim Zeitlin // Created: 2021-08-01