diff --git a/docs/doxygen/mainpages/introduction.h b/docs/doxygen/mainpages/introduction.h index b894f0b42d..e060f5ec32 100644 --- a/docs/doxygen/mainpages/introduction.h +++ b/docs/doxygen/mainpages/introduction.h @@ -91,7 +91,7 @@ primary supported compiler is GNU g++. @li wxOSX: wxOSX/Cocoa is the primary port for Apple computers, replacing the older and now deprecated wxOSX/Carbon port. wxOSX supports either PowerPC or -Intel Macs running OS X 10.6 or higher and can be compiled in either 32 or 64 +Intel Macs running OS X 10.5 or higher and can be compiled in either 32 or 64 bits using Apple Developer Tools (both GNU g++ and clang are supported). Other platforms (iOS, Windows CE, OS/2), compilers (Borland C++ under Windows, diff --git a/docs/osx/install.txt b/docs/osx/install.txt index a0ab245450..d02c9c2183 100644 --- a/docs/osx/install.txt +++ b/docs/osx/install.txt @@ -1,19 +1,18 @@ wxWidgets for Mac OS X installation ----------------------------------- -wxWidgets can be compiled using Apple's Carbon or Cocoa libraries. -Carbon is the older library, and Cocoa is the more modern library. +wxWidgets can be compiled using Apple's Cocoa or Carbon libraries. +Cocoa is the more modern library, and Carbon is the older deprecated library. -In wxWidgets 2.9.x, Cocoa is the recommended library. While Carbon is still +In wxWidgets 3, Cocoa is the recommended library. While Carbon is still supported by Apple, little new work is being done in Carbon. Most Mac OS X developers should start by downloading and installing Xcode from http://developer.apple.com. It is a free IDE from Apple that provides all of the tools you need for working with wxWidgets. -After Xcode is installed, download either wxWidgets-{version}.tar.gz or -wxMac-{version}.tar.gz and then double-click on it to unpack it to create -a wxWidgets directory. +After Xcode is installed, download wxWidgets-{version}.tar.bz2 and then +double-click on it to unpack it to create a wxWidgets directory. Next use Terminal (under Applications, Utilities, Terminal) to access a command prompt. Use cd to change directories to your wxWidgets directory and execute @@ -28,7 +27,7 @@ installed when you install Xcode 3.x. # Build the library for Cocoa (wxWidgets 2.9.0 and later) mkdir build-cocoa-debug cd build-cocoa-debug -../configure --with-osx_cocoa --enable-debug +../configure --enable-debug make # Build the samples and demos cd samples; make;cd .. @@ -39,7 +38,7 @@ cd demos; make;cd .. # Build the library for Carbon mkdir build-carbon-debug cd build-carbon-debug -../configure --enable-debug --disable-shared --enable-macosx_arch=i386 --with-macosx-sdk=/Developer/SDKs/MacOSX10.6.sdk CC=/Developer/usr/bin/gcc-4.2 CXX=/Developer/usr/bin/g++-4.2 LD=/Developer/usr/bin/ld +../configure --with-carbon --enable-debug --disable-shared --enable-macosx_arch=i386 --with-macosx-sdk=/Developer/SDKs/MacOSX10.6.sdk CC=/Developer/usr/bin/gcc-4.2 CXX=/Developer/usr/bin/g++-4.2 LD=/Developer/usr/bin/ld make # Build the samples and demos cd samples;make;cd .. @@ -48,10 +47,10 @@ cd demos; make;cd .. --------- After the compilation completes, use Finder to run the samples and demos + Go to build-cocoa-debug/samples to experiment with the Cocoa samples. + Go to build-cocoa-debug/demos to experiment with the Cocoa demos. Go to build-carbon-debug/samples to experiment with the Carbon samples. Go to build-carbon-debug/demos to experiment with the Carbon demos. - Go to build-cocoa-debug/samples to experiment with the Cocoa samples. - Go to biuld-cocoa-debug/demos to experiment with the Cocoa demos. Double-click on the executables which have an icon showing three small squares. The source code for the samples is in wxWidgets/samples The source code for the demos is in wxWidgets/demos @@ -93,8 +92,10 @@ to wx-config with the --in-place option you can avoid installing the library. Apple Developer Tools: Xcode ---------------------------- -You can use the project in src/wxWindows.xcodeproj to build wxWidgets, -and there is a sample project supplied with the minimal sample. +You can use the project in build/osx/wxcocoa.xcodeproj to build the Cocoa +version of wxWidgets (wxOSX/Cocoa) and build/osx/wxcarbon.xcodeproj to +build the Carbon version of wxWidgets (wxOSX/Carbon). There are also sample +projects supplied with the minimal sample. Notice that the command line build above builds not just the library itself but also wxrc tool which doesn't have its own Xcode project. If you need this tool, @@ -130,8 +131,8 @@ binaries together. Assuming building on a PPC system: 2. Then, build for Intel, in a different folder. This time use: -export CFLAGS="-g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" -export LDFLAGS="-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" +export CFLAGS="-g -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386" +export LDFLAGS="-syslibroot,/Developer/SDKs/MacOSX10.5.sdk" ./configure --disable-dependency-tracking --enable-static=yes --enable-shared=no \ --target=i386-apple-darwin8 --host=powerpc-apple-darwin8 --build=i386-apple-darwin8 diff --git a/docs/publicity/WoWoW30.html b/docs/publicity/WoWoW30.html index 0809990646..d81e2d80f6 100644 --- a/docs/publicity/WoWoW30.html +++ b/docs/publicity/WoWoW30.html @@ -53,7 +53,7 @@ supports are Windows (Windows 95, NT, 2000, XP, Vista) including its mobile variants (Windows CE, PocketPC, Windows Mobile), Linux and Unix using the GTK+ 2 toolkit (minimum version is GTK+ 2.4, more recent features are used when available) and Mac OS X (minimum -version 10.4 Tiger, both Intel, PPC and the Universal Binaries for +version 10.5 Tiger, both Intel, PPC and the Universal Binaries for both are supported). wxWidgets includes many code pieces for optimising dialog and general layout for small screens such as those of the recent netbooks and mobile phones and tablets.

@@ -103,7 +103,7 @@ tries to both make use of new features of the different operating systems and support older systems for as long as possible and as long as supporting them does not hinder development for up-to-date systems. This is especially true for OS X and GTK+ 2 and it was -therefore decided that OS X versions older than 10.4 Tiger and GTK+ 2 +therefore decided that OS X versions older than 10.5 Leopard and GTK+ 2 version older than 2.4 are no longer supported. The wxWidgets team also realized that it could not do everything and that support for a cross-platform database API was beyond the scope and focus of the @@ -276,23 +276,19 @@ Touch) including both general wrapping or front-end classes for much of the GUI code as well as a wrapper for the so called CoreFoundation classes of OS X, which are responsible on all OS X variants for string manipulation, font support, graphics and other basic -functionality (CoreImage and CoreVideo have recently been added by -Apple) and toolkit dependent code for the Carbon, Cocoa and Cocoa -Touch API. The Carbon variant is the core of what used to be wxMac -and is the most stable and mature version. The reason behind adding -optional support for Cocoa and Cocoa Touch is that Carbon is not -available on iPhones at all and that it has been deprecated for all -64-bit versions of OS X, which is likely to be the default a few -years from now. So while present applications using wxOSX are advised -to use the Carbon backend due its maturity, future developement will -have to focus on the Cocoa backend.

+functionality and toolkit dependent code for the Carbon, Cocoa, and +Cocoa Touch API. wxOSX/Carbon is the core of what used to be wxMac +and is now deprecated in favour of wxOSX/Cocoa. Existing applications +are encouraged to switch to wxOSX/Cocoa as Carbon is a deprecated OS X +feature, not available for 64-bit GUI applications, and not available for +iOS devices at all.

As part of the restructuring, all remaining drawing code using the old QuickDraw API has been removed (it was only an option before) and drawing now always takes place using CoreGraphics. Likewise, all code using Carbon functions no longer present in OS X -10.4 has been removed to clean-up the code greatly. This is turn +10.4 and 10.5 has been removed to clean-up the code greatly. This is turn means, as mentioned above, that applications will require a minimum -of OS X 10.4 in order to run, better yet OS X 10.5.

+of OS X 10.5 in order to run.

Apart from these large changes, these additional features can be noted: