1. restored wxEvent::operator=()

[wxWidgets.git] / docs / mac / install.txt

diff --git a/docs/mac/install.txt b/docs/mac/install.txt
index 63e88368e90780bc5c23fd21ec9cad7485930499..3fd1bf7a3cfdcccb96dbf955371f503db637d5eb 100644 (file)
--- a/docs/mac/install.txt
+++ b/docs/mac/install.txt
@@ -11,19 +11,11 @@ to successfully compile the code (also necessary if you don't want to build the
        ftp://ftp.apple.com/developer/Development_Kits/UniversalInterfaces3.3.2.sit.hqx
 3. put the Interfaces and Libraries Folder into the MacOS Support folder and replace older versions
 4. remove from the MacOS Support folder the separate OpenTransport folder
        ftp://ftp.apple.com/developer/Development_Kits/UniversalInterfaces3.3.2.sit.hqx
 3. put the Interfaces and Libraries Folder into the MacOS Support folder and replace older versions
 4. remove from the MacOS Support folder the separate OpenTransport folder

-5. open the file MacOS Support:MacHeaders:MacHeaders.pch and add the line
-        #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
-       after the 
-        #pragma once on
-6. open the file MacOS Support:MacHeaders:MacHeaders.pch++ and add the line
-        #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
-       after the 
-        #pragma once on
-7. open the file MacOS Support:MacHeaders:MacHeaders.c and add the line
+5. open the file MacOS Support:MacHeaders:MacHeaders.c and add the line

                #include <ControlDefinitions.h>
        after the 
                #include <Controls.h>
                #include <ControlDefinitions.h>
        after the 
                #include <Controls.h>

-8. rebuild all MacHeaders from the MacHeaders.mcp project in the same folder
+6. rebuild all MacHeaders from the MacHeaders.mcp project in the same folder

 
 if you want to build the carbon targets, you will also need the latest carbonized version of
 MSL from Metrowerks, at the time of writing, this meant applying the changes from the folders
 
 if you want to build the carbon targets, you will also need the latest carbonized version of
 MSL from Metrowerks, at the time of writing, this meant applying the changes from the folders


@@ -31,18 +23,72 @@ 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)
 
 CodeWarrior Pro 5:Pre-Release:Carbon & MacOSX Development:Carbonized Runtimes 
 (consult the file CodeWarrior Pro 5:Pre-Release:Carbon & MacOSX Development:Carbon & MacOSX README)
 

+setup.h
+-------
+
+in order to build wxMac with CodeWarrior, you must copy or alias the file include/wx/mac/setup0.h
+to include/wx/setup.h.
+
+this step is not needed when using the Apple Developer Tools under Mac OS X since the setup.h
+file is automatically generated during the configuration of wxMac.
+

 OpenGL
 ------
 
 OpenGL
 ------
 

-in order to build opengl support you must install the opengl libraries and headers from 
-http://developer.apple.com/opengl/index.html
+In order to build opengl support with CodeWarrior, you must install the opengl libraries and headers
+from http://developer.apple.com/opengl/index.html

 
 

-if you don't want OpenGL support, set the wxUSE_OPENGL in mac/setup.h to 0
+If you want OpenGL support with CodeWarrior, set wxUSE_OPENGL in include/wx/setup.h to 1
+
+If you don't want OpenGl support, remove the file "glcanvas.cpp" from the project before
+compilation and leave the setting at 0
+
+If you want OpenGL support with the Apple Developer Tools under Mac OS X, add --with-opengl to the
+arguments of configure when configuring wxMac.

 
 Project Files
 -------------
 
 
 Project Files
 -------------
 

-there are always the makemac.mcp files for Pro 5.3 and the makemac6.mcp files for Pro 6
+There are always the makemac.mcp or *M5.mcp files for Pro 5.3 and the makemac6.mcp files for Pro 6
+
+In order to build the library (and then the samples) you need to make the
+following projects (for 5.3)
+:src:wxWindowsM5.mcp
+:src:png:makemac.mcp
+:src:tif:makemac.mcp
+:src:jpeg:makemac.mcp
+:src:zlib:makemac.mcp
+
+Apple Developers Tools
+----------------------
+
+As in all Unix projects, you need to do something like this
+under MacOS 10.1 with the Apple Developers Tools installed.
+
+1) cd into the source dir
+2) mkdir build
+3) cd build
+4) ../configure
+5) make
+
+If you want to install the library, you need to be able
+to log in as "root". For this, "root" has to be activated
+in the NetInfo utility - there you will also have to
+choose a password for the "root" user. Then
+
+6) su
+7) type <PASSWORD>
+8) make install
+9) exit
+
+Note: There are currently link problems (in some rare cases)
+with wxMAC and Apple's tools when compiling the library as
+a shared library (the default). You might want to type
+
+4) ../configure --disable-shared
+
+to build a static library instead.
+

 
 Problems with .xpm files
 ------------------------
 
 Problems with .xpm files
 ------------------------


@@ -54,9 +100,11 @@ 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 
 
 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
+the SetTypeFromExtension application that is included in this folder. This small applet itself queries
+the Internet Config, so you will have to associate the "xpm" extension with CodeWarrior before making
+use of this applet.

 
 Missing PLStringFuncsLib
 ------------------------
 
 
 Missing PLStringFuncsLib
 ------------------------
 

-You will have to build All Targets for MacOS Support:Libraries:Sources:PLStringFuncs:Glue:PLStringFuncsGlue.mcp
\ No newline at end of file
+You will have to build All Targets for MacOS Support:Libraries:Sources:PLStringFuncs:Glue:PLStringFuncsGlue.mcp