wxMac merge

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/mac/install.txt b/docs/mac/install.txt
index 52f4cae387f9bb7cd6e0a19f103773355ec88d07..4fc2eed8870ba5cbd50c2e660e90aeeb672b9957 100644 (file)
--- a/docs/mac/install.txt
+++ b/docs/mac/install.txt
@@ -16,4 +16,15 @@ if you want to build the carbon targets, you will also need the latest carbonize
 MSL from Metrowerks, at the time of writing, this meant applying the changes from the folders
 CodeWarrior Pro 5:Pre-Release:Carbon & MacOSX Development:Carbonized MSL and
 CodeWarrior Pro 5:Pre-Release:Carbon & MacOSX Development:Carbonized Runtimes 
-(consult the file CodeWarrior Pro 5:Pre-Release:Carbon & MacOSX Development:Carbon & MacOSX README)
\ No newline at end of file
+(consult the file CodeWarrior Pro 5:Pre-Release:Carbon & MacOSX Development:Carbon & MacOSX README)
+
+changing the type of the .xpm files
+
+if you have downloaded all the files and get errors like :
+
+Error   : the file 'wx/generic/tip.xpm' cannot be opened
+tipdlg.cpp line 201   #include "wx/generic/tip.xpm"
+
+then your cvs has changed the type of the .xpm files to something other than text, in order to fix this
+either change the type by using a resource editor or drag the files from /include/wx/generic/..xpm on 
+the MakeMetrowerksText application that is included in this folder

diff --git a/samples/minimal/makemac.mcp b/samples/minimal/makemac.mcp
new file mode 100644 (file)
index 0000000..988af88
Binary files /dev/null and b/samples/minimal/makemac.mcp differ