From f0453239348e3a050d7e05d21598c95190fc362f Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 9 Sep 2017 23:34:50 +0200 Subject: [PATCH] Adding native macos Cocoa implementation for overlays into build files --- Makefile.in | 54 ++++++++------------- build/bakefiles/files.bkl | 2 +- build/files | 2 +- build/osx/wxcocoa.xcodeproj/project.pbxproj | 18 ++++--- include/wx/overlay.h | 2 + include/wx/private/overlay.h | 4 +- 6 files changed, 37 insertions(+), 45 deletions(-) diff --git a/Makefile.in b/Makefile.in index edb650cde8..0199d265ce 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.10 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -5434,7 +5434,8 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS = \ monodll_cocoa_toolbar.o \ monodll_cocoa_tooltip.o \ monodll_cocoa_window.o \ - monodll_cocoa_settings.o + monodll_cocoa_settings.o \ + monodll_cocoa_overlay.o @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS) COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS = \ $(__OSX_COMMON_SRC_OBJECTS) \ @@ -7457,7 +7458,8 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_cocoa_toolbar.o \ monolib_cocoa_tooltip.o \ monolib_cocoa_window.o \ - monolib_cocoa_settings.o + monolib_cocoa_settings.o \ + monolib_cocoa_overlay.o @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1) COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1 = \ $(__OSX_COMMON_SRC_OBJECTS_0) \ @@ -9624,7 +9626,8 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_cocoa_toolbar.o \ coredll_cocoa_tooltip.o \ coredll_cocoa_window.o \ - coredll_cocoa_settings.o + coredll_cocoa_settings.o \ + coredll_cocoa_overlay.o @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2) COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2 = \ $(__OSX_COMMON_SRC_OBJECTS_8) \ @@ -11099,7 +11102,8 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_cocoa_toolbar.o \ corelib_cocoa_tooltip.o \ corelib_cocoa_window.o \ - corelib_cocoa_settings.o + corelib_cocoa_settings.o \ + corelib_cocoa_overlay.o @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3) COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3 = \ $(__OSX_COMMON_SRC_OBJECTS_9) \ @@ -13317,7 +13321,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS = \ monodll_carbon_frame.o \ monodll_carbon_mdi.o \ monodll_carbon_metafile.o \ - monodll_carbon_overlay.o \ monodll_carbon_popupwin.o \ monodll_carbon_renderer.o \ monodll_statbrma.o \ @@ -13465,7 +13468,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_0 = \ monolib_carbon_frame.o \ monolib_carbon_mdi.o \ monolib_carbon_metafile.o \ - monolib_carbon_overlay.o \ monolib_carbon_popupwin.o \ monolib_carbon_renderer.o \ monolib_statbrma.o \ @@ -13613,7 +13615,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8 = \ coredll_carbon_frame.o \ coredll_carbon_mdi.o \ coredll_carbon_metafile.o \ - coredll_carbon_overlay.o \ coredll_carbon_popupwin.o \ coredll_carbon_renderer.o \ coredll_statbrma.o \ @@ -13743,7 +13744,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_9 = \ corelib_carbon_frame.o \ corelib_carbon_mdi.o \ corelib_carbon_metafile.o \ - corelib_carbon_overlay.o \ corelib_carbon_popupwin.o \ corelib_carbon_renderer.o \ corelib_statbrma.o \ @@ -16628,6 +16628,9 @@ monodll_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONODLL_ODEP) monodll_cocoa_settings.o: $(srcdir)/src/osx/cocoa/settings.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/settings.mm +monodll_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm + monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp @@ -19541,12 +19544,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp @@ -21488,6 +21485,9 @@ monolib_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONOLIB_ODEP) monolib_cocoa_settings.o: $(srcdir)/src/osx/cocoa/settings.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/settings.mm +monolib_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm + monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp @@ -24401,12 +24401,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp @@ -27011,6 +27005,9 @@ coredll_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(COREDLL_ODEP) coredll_cocoa_settings.o: $(srcdir)/src/osx/cocoa/settings.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/settings.mm +coredll_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm + coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp @@ -29324,12 +29321,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp @@ -30413,6 +30404,9 @@ corelib_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(CORELIB_ODEP) corelib_cocoa_settings.o: $(srcdir)/src/osx/cocoa/settings.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/settings.mm +corelib_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm + corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp @@ -32726,12 +32720,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index f0eb24dc09..630090e8b8 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2298,7 +2298,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/carbon/frame.cpp src/osx/carbon/mdi.cpp src/osx/carbon/metafile.cpp - src/osx/carbon/overlay.cpp src/osx/carbon/popupwin.cpp src/osx/carbon/renderer.cpp src/osx/carbon/statbrma.cpp @@ -2461,6 +2460,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/cocoa/tooltip.mm src/osx/cocoa/window.mm src/osx/cocoa/settings.mm + src/osx/cocoa/overlay.mm wx/osx/cocoa/chkconf.h diff --git a/build/files b/build/files index ce0f95922a..d5f864909d 100644 --- a/build/files +++ b/build/files @@ -2140,7 +2140,6 @@ OSX_COMMON_SRC = src/osx/carbon/frame.cpp src/osx/carbon/mdi.cpp src/osx/carbon/metafile.cpp - src/osx/carbon/overlay.cpp src/osx/carbon/popupwin.cpp src/osx/carbon/renderer.cpp src/osx/carbon/statbrma.cpp @@ -2284,6 +2283,7 @@ OSX_COCOA_SRC = src/osx/cocoa/nonownedwnd.mm src/osx/cocoa/notebook.mm src/osx/cocoa/radiobut.mm + src/osx/cocoa/overlay.mm src/osx/cocoa/preferences.mm src/osx/cocoa/printdlg.mm src/osx/cocoa/scrolbar.mm diff --git a/build/osx/wxcocoa.xcodeproj/project.pbxproj b/build/osx/wxcocoa.xcodeproj/project.pbxproj index 0ad5c97864..bb96270b15 100644 --- a/build/osx/wxcocoa.xcodeproj/project.pbxproj +++ b/build/osx/wxcocoa.xcodeproj/project.pbxproj @@ -826,6 +826,9 @@ 4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; 4040AE89BF9F34668091064B /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; 4040AE89BF9F34668091064C /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; + 4156FDB73D0A397A870E4302 /* overlay.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FBD8031E28A3C9CB7C45784 /* overlay.mm */; }; + 4156FDB73D0A397A870E4303 /* overlay.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FBD8031E28A3C9CB7C45784 /* overlay.mm */; }; + 4156FDB73D0A397A870E4304 /* overlay.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FBD8031E28A3C9CB7C45784 /* overlay.mm */; }; 41943A8F82723027A151A468 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; 41943A8F82723027A151A469 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; 41943A8F82723027A151A46A /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; @@ -2256,9 +2259,6 @@ CD241361D4693785A0B8939D /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */; }; CD241361D4693785A0B8939E /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */; }; CD241361D4693785A0B8939F /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */; }; - CD2A9111B8A83AFA8B5B97E5 /* overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2128AD8BD12E3F33AD57478E /* overlay.cpp */; }; - CD2A9111B8A83AFA8B5B97E6 /* overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2128AD8BD12E3F33AD57478E /* overlay.cpp */; }; - CD2A9111B8A83AFA8B5B97E7 /* overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2128AD8BD12E3F33AD57478E /* overlay.cpp */; }; CD35A576FD363FD49C3AC4B3 /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 375E7A99FF4C38FA9E223772 /* LexAda.cxx */; }; CD35A576FD363FD49C3AC4B4 /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 375E7A99FF4C38FA9E223772 /* LexAda.cxx */; }; CD35A576FD363FD49C3AC4B5 /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 375E7A99FF4C38FA9E223772 /* LexAda.cxx */; }; @@ -3921,6 +3921,7 @@ 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlcmn.cpp; path = ../../src/common/ctrlcmn.cpp; sourceTree = ""; }; 0EEAD9C3E180305D8899441E /* strvararg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strvararg.cpp; path = ../../src/common/strvararg.cpp; sourceTree = ""; }; 0FA0840034F1386F94D17639 /* timectrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrl_osx.cpp; path = ../../src/osx/timectrl_osx.cpp; sourceTree = ""; }; + 0FBD8031E28A3C9CB7C45784 /* overlay.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = overlay.mm; path = ../../src/osx/cocoa/overlay.mm; sourceTree = ""; }; 108517BCD39230E7A89BC943 /* jerror.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jerror.c; path = ../../src/jpeg/jerror.c; sourceTree = ""; }; 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dumpmode.c; path = ../../src/tiff/libtiff/tif_dumpmode.c; sourceTree = ""; }; 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexVHDL.cxx; path = ../../src/stc/scintilla/lexers/LexVHDL.cxx; sourceTree = ""; }; @@ -3982,7 +3983,6 @@ 207F0F88390138B6B41183EB /* aboutdlg.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = aboutdlg.mm; path = ../../src/osx/cocoa/aboutdlg.mm; sourceTree = ""; }; 20B922D61CDB3CCEB59A5194 /* convauto.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = convauto.cpp; path = ../../src/common/convauto.cpp; sourceTree = ""; }; 20E4A10BCD773C84AEC481A1 /* jdmarker.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmarker.c; path = ../../src/jpeg/jdmarker.c; sourceTree = ""; }; - 2128AD8BD12E3F33AD57478E /* overlay.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = overlay.cpp; path = ../../src/osx/carbon/overlay.cpp; sourceTree = ""; }; 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_tree.cpp; path = ../../src/xrc/xh_tree.cpp; sourceTree = ""; }; 22636000460133C8B517AA95 /* libwx_osx_cocoau_stc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwx_osx_cocoau_stc.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcscreen.cpp; path = ../../src/osx/carbon/dcscreen.cpp; sourceTree = ""; }; @@ -5358,6 +5358,7 @@ 2DF2456ED905357B8C1D74D9 /* webkit.mm */, DAAED71A534135A9A61612A6 /* colordlgosx.mm */, 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */, + 0FBD8031E28A3C9CB7C45784 /* overlay.mm */, 8C78A1539462370CAA429508 /* accel.cpp */, 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */, 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */, @@ -5375,7 +5376,6 @@ C3019BA65DD73F30A865365F /* frame.cpp */, B568A7364ECA30288820CCE7 /* mdi.cpp */, C2BB2949CC0B387AB6879539 /* metafile.cpp */, - 2128AD8BD12E3F33AD57478E /* overlay.cpp */, 530DC2E26BF2313E8702AD43 /* popupwin.cpp */, 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */, E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */, @@ -6978,6 +6978,8 @@ /* Begin PBXProject section */ 19367367C9323490BB936F06 /* Project object */ = { isa = PBXProject; + attributes = { + }; buildConfigurationList = 6976B5F5F3A63A21A92029E3 /* Build configuration list for PBXProject "wxcocoa" */; compatibilityVersion = "Xcode 3.1"; developmentRegion = English; @@ -7577,7 +7579,6 @@ BDAB44F5D017395D9D3A1F25 /* frame.cpp in Sources */, 27E2EABB117334CD89CFD2A6 /* mdi.cpp in Sources */, 73AA68AB9F1236ED9F1FBB30 /* metafile.cpp in Sources */, - CD2A9111B8A83AFA8B5B97E7 /* overlay.cpp in Sources */, 805CCAE64D023561AD334B55 /* popupwin.cpp in Sources */, 6832385DDBB33D1B90C73CBC /* renderer.cpp in Sources */, F6A1AC5CF84E32C19F91A616 /* statbrma.cpp in Sources */, @@ -7662,6 +7663,7 @@ BF1760458996391E8EB4294B /* ctrlsub.cpp in Sources */, 2D60F289103837EA8925E3F3 /* dcbase.cpp in Sources */, 39D6435B10073B85A499AFDA /* dcbufcmn.cpp in Sources */, + 4156FDB73D0A397A870E4304 /* overlay.mm in Sources */, 9564A6968D66325DAEADEBA5 /* dcgraph.cpp in Sources */, B791BD05072B3B909A7093C4 /* dcsvg.cpp in Sources */, B559E894684A38238CAAA117 /* dirctrlcmn.cpp in Sources */, @@ -8253,7 +8255,6 @@ BDAB44F5D017395D9D3A1F24 /* frame.cpp in Sources */, 27E2EABB117334CD89CFD2A5 /* mdi.cpp in Sources */, 73AA68AB9F1236ED9F1FBB2F /* metafile.cpp in Sources */, - CD2A9111B8A83AFA8B5B97E6 /* overlay.cpp in Sources */, 805CCAE64D023561AD334B54 /* popupwin.cpp in Sources */, 6832385DDBB33D1B90C73CBB /* renderer.cpp in Sources */, F6A1AC5CF84E32C19F91A615 /* statbrma.cpp in Sources */, @@ -8298,6 +8299,7 @@ 22E90F33B5C9308EBF37A701 /* printdlg.mm in Sources */, 5303FA25D0773FAEB963D8E4 /* scrolbar.mm in Sources */, 30AEDF41EC5C374DBF96EFFC /* slider.mm in Sources */, + 4156FDB73D0A397A870E4303 /* overlay.mm in Sources */, 5DA146A9F7653F53BF5299E9 /* spinbutt.mm in Sources */, 55F01295F1D23805BCA12F16 /* srchctrl.mm in Sources */, B30D10F6257631B0A1926F8A /* statbox.mm in Sources */, @@ -9477,7 +9479,6 @@ BDAB44F5D017395D9D3A1F23 /* frame.cpp in Sources */, 27E2EABB117334CD89CFD2A4 /* mdi.cpp in Sources */, 73AA68AB9F1236ED9F1FBB2E /* metafile.cpp in Sources */, - CD2A9111B8A83AFA8B5B97E5 /* overlay.cpp in Sources */, 805CCAE64D023561AD334B53 /* popupwin.cpp in Sources */, 6832385DDBB33D1B90C73CBA /* renderer.cpp in Sources */, F6A1AC5CF84E32C19F91A614 /* statbrma.cpp in Sources */, @@ -9657,6 +9658,7 @@ 9F70A89D00B03D4894AF7638 /* validate.cpp in Sources */, 1937FBA0A0DD32A8A743CFE1 /* valtext.cpp in Sources */, 6A032420671B375D81273714 /* valnum.cpp in Sources */, + 4156FDB73D0A397A870E4302 /* overlay.mm in Sources */, A2769D1659AE3CA3B58C2CAE /* wincmn.cpp in Sources */, 1BCC944F5E0936F5830F03E8 /* windowid.cpp in Sources */, 3399AB7BB1333B5AAF5FAF55 /* wrapsizer.cpp in Sources */, diff --git a/include/wx/overlay.h b/include/wx/overlay.h index 57b87b48df..b5e43f84a2 100644 --- a/include/wx/overlay.h +++ b/include/wx/overlay.h @@ -15,6 +15,8 @@ #if defined(__WXDFB__) #define wxHAS_NATIVE_OVERLAY 1 +#elif defined(__WXOSX__) && wxOSX_USE_COCOA + #define wxHAS_NATIVE_OVERLAY 1 #else // don't define wxHAS_NATIVE_OVERLAY #endif diff --git a/include/wx/private/overlay.h b/include/wx/private/overlay.h index 1149701f7c..61cc7e9a60 100644 --- a/include/wx/private/overlay.h +++ b/include/wx/private/overlay.h @@ -15,8 +15,8 @@ #ifdef wxHAS_NATIVE_OVERLAY -#if defined(__WXMAC__) - #include "wx/osx/carbon/private/overlay.h" +#if defined(__WXOSX__) && wxOSX_USE_COCOA + #include "wx/osx/cocoa/private/overlay.h" #elif defined(__WXDFB__) #include "wx/dfb/private/overlay.h" #else