Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved wxMacExecute out of src/mac/corefoundation/hid.cpp and into

Browse Source 
new src/mac/corefoundation/utilsexc_base.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2005-06-22 00:20:28 +00:00
parent 40c6b0f210
commit 1ccb7433ee
4 changed files with 270 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
Makefile.in
View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -430,6 +430,7 @@ ALL_BASE_SOURCES = \
src/mac/corefoundation/cfstring.cpp \
src/mac/corefoundation/hid.cpp \
src/mac/corefoundation/stdpaths_cf.cpp \
src/mac/corefoundation/utilsexc_base.cpp \
src/os2/dir.cpp \
src/os2/mimetype.cpp \
src/os2/stdpaths.cpp \
@@ -2602,6 +2603,7 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS = \
monodll_cfstring.o \
monodll_hid.o \
monodll_stdpaths_cf.o \
monodll_utilsexc_base.o \
monodll_DirectoryCopy.o \
monodll_FSpCompat.o \
monodll_FileCopy.o \
@@ -2662,7 +2664,8 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS = \
monodll_threadpsx.o \
monodll_cfstring.o \
monodll_hid.o \
monodll_stdpaths_cf.o
monodll_stdpaths_cf.o \
monodll_utilsexc_base.o
@COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS)
COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS = \
monodll_baseunix.o \
@@ -2675,7 +2678,8 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS = \
monodll_threadpsx.o \
monodll_cfstring.o \
monodll_hid.o \
monodll_stdpaths_cf.o
monodll_stdpaths_cf.o \
monodll_utilsexc_base.o
@COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS)
COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS = \
monodll_baseunix.o \
@@ -2688,7 +2692,8 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS = \
monodll_threadpsx.o \
monodll_cfstring.o \
monodll_hid.o \
monodll_stdpaths_cf.o
monodll_stdpaths_cf.o \
monodll_utilsexc_base.o
@COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS)
COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS = \
monodll_dirmac.o \
@@ -2700,6 +2705,7 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS = \
monodll_cfstring.o \
monodll_hid.o \
monodll_stdpaths_cf.o \
monodll_utilsexc_base.o \
monodll_baseunix.o \
monodll_dlunix.o \
monodll_stdpaths.o
@@ -2715,7 +2721,8 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS = \
monodll_threadpsx.o \
monodll_cfstring.o \
monodll_hid.o \
monodll_stdpaths_cf.o
monodll_stdpaths_cf.o \
monodll_utilsexc_base.o
@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS)
COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS = \
monodll_baseunix.o \
@@ -2728,7 +2735,8 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS = \
monodll_threadpsx.o \
monodll_cfstring.o \
monodll_hid.o \
monodll_stdpaths_cf.o
monodll_stdpaths_cf.o \
monodll_utilsexc_base.o
@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS)
@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
@COND_PLATFORM_MACOSX_1@ = monodll_utilsunx.o
@@ -4063,6 +4071,7 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
monolib_cfstring.o \
monolib_hid.o \
monolib_stdpaths_cf.o \
monolib_utilsexc_base.o \
monolib_DirectoryCopy.o \
monolib_FSpCompat.o \
monolib_FileCopy.o \
@@ -4124,7 +4133,8 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_1 = \
monolib_threadpsx.o \
monolib_cfstring.o \
monolib_hid.o \
monolib_stdpaths_cf.o
monolib_stdpaths_cf.o \
monolib_utilsexc_base.o
@COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_1)
COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 = \
monolib_baseunix.o \
@@ -4137,7 +4147,8 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 = \
monolib_threadpsx.o \
monolib_cfstring.o \
monolib_hid.o \
monolib_stdpaths_cf.o
monolib_stdpaths_cf.o \
monolib_utilsexc_base.o
@COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1)
COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 = \
monolib_baseunix.o \
@@ -4150,7 +4161,8 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 = \
monolib_threadpsx.o \
monolib_cfstring.o \
monolib_hid.o \
monolib_stdpaths_cf.o
monolib_stdpaths_cf.o \
monolib_utilsexc_base.o
@COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1)
COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 = \
monolib_dirmac.o \
@@ -4162,6 +4174,7 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 = \
monolib_cfstring.o \
monolib_hid.o \
monolib_stdpaths_cf.o \
monolib_utilsexc_base.o \
monolib_baseunix.o \
monolib_dlunix.o \
monolib_stdpaths.o
@@ -4177,7 +4190,8 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1 = \
monolib_threadpsx.o \
monolib_cfstring.o \
monolib_hid.o \
monolib_stdpaths_cf.o
monolib_stdpaths_cf.o \
monolib_utilsexc_base.o
@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1)
COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 = \
monolib_baseunix.o \
@@ -4190,7 +4204,8 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 = \
monolib_threadpsx.o \
monolib_cfstring.o \
monolib_hid.o \
monolib_stdpaths_cf.o
monolib_stdpaths_cf.o \
monolib_utilsexc_base.o
@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1)
@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
@COND_PLATFORM_MACOSX_1@ = monolib_utilsunx.o
@@ -5563,6 +5578,7 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
basedll_cfstring.o \
basedll_hid.o \
basedll_stdpaths_cf.o \
basedll_utilsexc_base.o \
basedll_DirectoryCopy.o \
basedll_FSpCompat.o \
basedll_FileCopy.o \
@@ -5624,7 +5640,8 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_2 = \
basedll_threadpsx.o \
basedll_cfstring.o \
basedll_hid.o \
basedll_stdpaths_cf.o
basedll_stdpaths_cf.o \
basedll_utilsexc_base.o
@COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_2)
COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 = \
basedll_baseunix.o \
@@ -5637,7 +5654,8 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 = \
basedll_threadpsx.o \
basedll_cfstring.o \
basedll_hid.o \
basedll_stdpaths_cf.o
basedll_stdpaths_cf.o \
basedll_utilsexc_base.o
@COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2)
COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 = \
basedll_baseunix.o \
@@ -5650,7 +5668,8 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 = \
basedll_threadpsx.o \
basedll_cfstring.o \
basedll_hid.o \
basedll_stdpaths_cf.o
basedll_stdpaths_cf.o \
basedll_utilsexc_base.o
@COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2)
COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 = \
basedll_dirmac.o \
@@ -5662,6 +5681,7 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 = \
basedll_cfstring.o \
basedll_hid.o \
basedll_stdpaths_cf.o \
basedll_utilsexc_base.o \
basedll_baseunix.o \
basedll_dlunix.o \
basedll_stdpaths.o
@@ -5677,7 +5697,8 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2 = \
basedll_threadpsx.o \
basedll_cfstring.o \
basedll_hid.o \
basedll_stdpaths_cf.o
basedll_stdpaths_cf.o \
basedll_utilsexc_base.o
@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2)
COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 = \
basedll_baseunix.o \
@@ -5690,7 +5711,8 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 = \
basedll_threadpsx.o \
basedll_cfstring.o \
basedll_hid.o \
basedll_stdpaths_cf.o
basedll_stdpaths_cf.o \
basedll_utilsexc_base.o
@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2)
@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
@COND_PLATFORM_MACOSX_1@ = basedll_utilsunx.o
@@ -5720,6 +5742,7 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
baselib_cfstring.o \
baselib_hid.o \
baselib_stdpaths_cf.o \
baselib_utilsexc_base.o \
baselib_DirectoryCopy.o \
baselib_FSpCompat.o \
baselib_FileCopy.o \
@@ -5781,7 +5804,8 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_3 = \
baselib_threadpsx.o \
baselib_cfstring.o \
baselib_hid.o \
baselib_stdpaths_cf.o
baselib_stdpaths_cf.o \
baselib_utilsexc_base.o
@COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_3)
COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 = \
baselib_baseunix.o \
@@ -5794,7 +5818,8 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 = \
baselib_threadpsx.o \
baselib_cfstring.o \
baselib_hid.o \
baselib_stdpaths_cf.o
baselib_stdpaths_cf.o \
baselib_utilsexc_base.o
@COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3)
COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 = \
baselib_baseunix.o \
@@ -5807,7 +5832,8 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 = \
baselib_threadpsx.o \
baselib_cfstring.o \
baselib_hid.o \
baselib_stdpaths_cf.o
baselib_stdpaths_cf.o \
baselib_utilsexc_base.o
@COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3)
COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 = \
baselib_dirmac.o \
@@ -5819,6 +5845,7 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 = \
baselib_cfstring.o \
baselib_hid.o \
baselib_stdpaths_cf.o \
baselib_utilsexc_base.o \
baselib_baseunix.o \
baselib_dlunix.o \
baselib_stdpaths.o
@@ -5834,7 +5861,8 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3 = \
baselib_threadpsx.o \
baselib_cfstring.o \
baselib_hid.o \
baselib_stdpaths_cf.o
baselib_stdpaths_cf.o \
baselib_utilsexc_base.o
@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3)
COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 = \
baselib_baseunix.o \
@@ -5847,7 +5875,8 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 = \
baselib_threadpsx.o \
baselib_cfstring.o \
baselib_hid.o \
baselib_stdpaths_cf.o
baselib_stdpaths_cf.o \
baselib_utilsexc_base.o
@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3)
@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
@COND_PLATFORM_MACOSX_1@ = baselib_utilsunx.o
@@ -11101,6 +11130,27 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOS_1@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOS_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monodll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monodll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monodll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOS_1@monodll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOS_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_UNIX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
@@ -14551,6 +14601,27 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOS_1@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOS_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monolib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monolib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monolib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOS_1@monolib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOS_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_UNIX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
@@ -17557,6 +17628,27 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
@COND_PLATFORM_MACOS_1@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
@COND_PLATFORM_MACOS_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASEDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASEDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASEDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@basedll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASEDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@basedll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASEDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_@basedll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASEDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOS_1@basedll_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASEDLL_ODEP)
@COND_PLATFORM_MACOS_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_UNIX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
@@ -18109,6 +18201,27 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOS_1@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOS_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@baselib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@baselib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_@baselib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_MACOS_1@baselib_utilsexc_base.o: $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOS_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_base.cpp
@COND_PLATFORM_UNIX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASELIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
@@ -24693,6 +24806,7 @@ SAMPLES_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/samples/internat/ka
mkdir $(DISTDIR)/samples/internat/pl
mkdir $(DISTDIR)/samples/internat/ru
mkdir $(DISTDIR)/samples/internat/sv
cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
@@ -24706,6 +24820,7 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/internat/ka/*.mo $(DISTDIR)/samples/internat/ka
cp $(SAMPDIR)/internat/pl/*.mo $(DISTDIR)/samples/internat/pl
cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru
cp $(SAMPDIR)/internat/sv/*.mo $(DISTDIR)/samples/internat/sv
cp $(SAMPDIR)/internat/bg/*.po $(DISTDIR)/samples/internat/bg
cp $(SAMPDIR)/internat/cs/*.po $(DISTDIR)/samples/internat/cs
cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
@@ -24714,6 +24829,7 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/internat/ka/*.po $(DISTDIR)/samples/internat/ka
cp $(SAMPDIR)/internat/pl/*.po $(DISTDIR)/samples/internat/pl
cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
cp $(SAMPDIR)/internat/sv/*.po $(DISTDIR)/samples/internat/sv
mkdir $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc

1
build/bakefiles/files.bkl
View File

@@ -136,6 +136,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/mac/corefoundation/cfstring.cpp
src/mac/corefoundation/hid.cpp
src/mac/corefoundation/stdpaths_cf.cpp
src/mac/corefoundation/utilsexc_base.cpp
</set>
<set var="BASE_COREFOUNDATION_HDR" hints="files">
wx/mac/corefoundation/cfstring.h

114
src/mac/corefoundation/hid.cpp
View File

@@ -568,118 +568,4 @@ bool wxGetKeyState (wxKeyCode key)
}
}
//
// TODO: Find a better file to put this in
//
#include "wx/intl.h"
#include <CoreFoundation/CoreFoundation.h>
#include <ApplicationServices/ApplicationServices.h>
#include "wx/uri.h"
#include "wx/mac/corefoundation/cfstring.h"
long wxMacExecute(wxChar **argv,
int flags,
wxProcess *process)
{
const long errorCode = ((flags & wxEXEC_SYNC) ? -1 : 0);
const long successCode = ((flags & wxEXEC_SYNC) ? 0 : -1); // fake PID
CFIndex cfiCount = 0;
//get count
for(wxChar** argvcopy = argv; *argvcopy != NULL ; ++argvcopy)
{
++cfiCount;
}
if(cfiCount == 0) //no file to launch?
{
wxLogDebug(wxT("wxMacExecute No file to launch!"));
return errorCode ;
}
CFURLRef cfurlApp = CFURLCreateWithString(
kCFAllocatorDefault,
wxMacCFStringHolder(*argv++, wxLocale::GetSystemEncoding()),
NULL);
wxASSERT(cfurlApp);
CFBundleRef cfbApp = CFBundleCreate(kCFAllocatorDefault, cfurlApp);
if(!cfbApp)
{
wxLogDebug(wxT("wxMacExecute Bad bundle"));
CFRelease(cfurlApp);
return errorCode ;
}
UInt32 dwBundleType, dwBundleCreator;
CFBundleGetPackageInfo(cfbApp, &dwBundleType, &dwBundleCreator);
//Only call wxMacExecute for .app bundles - others could be actual unix programs
if(dwBundleType != 'APPL')
{
CFRelease(cfurlApp);
return errorCode ;
}
//
// We have a good bundle - so let's launch it!
//
CFMutableArrayRef cfaFiles =
CFArrayCreateMutable(kCFAllocatorDefault, cfiCount - 1, &kCFTypeArrayCallBacks);
wxASSERT(cfaFiles);
if(--cfiCount)
{
for( ; *argv != NULL ; ++argv)
{
// wxLogDebug(*argv);
wxString sCurrentFile;
if(wxURI(*argv).IsReference())
sCurrentFile = wxString(wxT("file://")) + *argv;
else
sCurrentFile = *argv;
CFURLRef cfurlCurrentFile = CFURLCreateWithString(
kCFAllocatorDefault,
wxMacCFStringHolder(sCurrentFile, wxLocale::GetSystemEncoding()),
NULL);
wxASSERT(cfurlCurrentFile);
CFArrayAppendValue(
cfaFiles,
cfurlCurrentFile
);
CFRelease(cfurlCurrentFile); // array has retained it
}
}
LSLaunchURLSpec launchspec;
launchspec.appURL = cfurlApp;
launchspec.itemURLs = cfaFiles;
launchspec.passThruParams = NULL; //AEDesc*
launchspec.launchFlags = kLSLaunchDefaults | kLSLaunchDontSwitch; //TODO: Possibly be smarter with flags
launchspec.asyncRefCon = NULL;
OSStatus status = LSOpenFromURLSpec(&launchspec,
NULL); //2nd is CFURLRef* really launched
//cleanup
CFRelease(cfurlApp);
CFRelease(cfaFiles);
//check for error
if(status != noErr)
{
wxLogDebug(wxT("wxMacExecute ERROR: %d"), (int)status);
return errorCode ;
}
return successCode; //success
}
#endif //__DARWIN__

132
src/mac/corefoundation/utilsexc_base.cpp Normal file
View File

@@ -0,0 +1,132 @@
/////////////////////////////////////////////////////////////////////////////
// Name: mac/corefoundation/utilsexc_base.cpp
// Purpose: wxMacExecute
// Author: Ryan Norton
// Modified by:
// Created: 2005-06-21
// RCS-ID: $Id$
// Copyright: (c) Ryan Norton
// Licence: wxWindows licence
// Notes: Source was originally in utilsexc_cf.cpp,1.6 then moved
// to totally unrelated hid.cpp,1.8.
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/string.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/utils.h"
#endif // WX_PRECOMP
#include <CoreFoundation/CoreFoundation.h>
#include <ApplicationServices/ApplicationServices.h>
#include "wx/uri.h"
#include "wx/mac/corefoundation/cfstring.h"
long wxMacExecute(wxChar **argv,
int flags,
wxProcess *process)
{
const long errorCode = ((flags & wxEXEC_SYNC) ? -1 : 0);
const long successCode = ((flags & wxEXEC_SYNC) ? 0 : -1); // fake PID
CFIndex cfiCount = 0;
//get count
for(wxChar** argvcopy = argv; *argvcopy != NULL ; ++argvcopy)
{
++cfiCount;
}
if(cfiCount == 0) //no file to launch?
{
wxLogDebug(wxT("wxMacExecute No file to launch!"));
return errorCode ;
}
CFURLRef cfurlApp = CFURLCreateWithString(
kCFAllocatorDefault,
wxMacCFStringHolder(*argv++, wxLocale::GetSystemEncoding()),
NULL);
wxASSERT(cfurlApp);
CFBundleRef cfbApp = CFBundleCreate(kCFAllocatorDefault, cfurlApp);
if(!cfbApp)
{
wxLogDebug(wxT("wxMacExecute Bad bundle"));
CFRelease(cfurlApp);
return errorCode ;
}
UInt32 dwBundleType, dwBundleCreator;
CFBundleGetPackageInfo(cfbApp, &dwBundleType, &dwBundleCreator);
//Only call wxMacExecute for .app bundles - others could be actual unix programs
if(dwBundleType != 'APPL')
{
CFRelease(cfurlApp);
return errorCode ;
}
//
// We have a good bundle - so let's launch it!
//
CFMutableArrayRef cfaFiles =
CFArrayCreateMutable(kCFAllocatorDefault, cfiCount - 1, &kCFTypeArrayCallBacks);
wxASSERT(cfaFiles);
if(--cfiCount)
{
for( ; *argv != NULL ; ++argv)
{
// wxLogDebug(*argv);
wxString sCurrentFile;
if(wxURI(*argv).IsReference())
sCurrentFile = wxString(wxT("file://")) + *argv;
else
sCurrentFile = *argv;
CFURLRef cfurlCurrentFile = CFURLCreateWithString(
kCFAllocatorDefault,
wxMacCFStringHolder(sCurrentFile, wxLocale::GetSystemEncoding()),
NULL);
wxASSERT(cfurlCurrentFile);
CFArrayAppendValue(
cfaFiles,
cfurlCurrentFile
);
CFRelease(cfurlCurrentFile); // array has retained it
}
}
LSLaunchURLSpec launchspec;
launchspec.appURL = cfurlApp;
launchspec.itemURLs = cfaFiles;
launchspec.passThruParams = NULL; //AEDesc*
launchspec.launchFlags = kLSLaunchDefaults | kLSLaunchDontSwitch; //TODO: Possibly be smarter with flags
launchspec.asyncRefCon = NULL;
OSStatus status = LSOpenFromURLSpec(&launchspec,
NULL); //2nd is CFURLRef* really launched
//cleanup
CFRelease(cfurlApp);
CFRelease(cfaFiles);
//check for error
if(status != noErr)
{
wxLogDebug(wxT("wxMacExecute ERROR: %d"), (int)status);
return errorCode ;
}
return successCode; //success
}