diff --git a/docs/doxygen/mainpages/introduction.h b/docs/doxygen/mainpages/introduction.h index 9aa1c1676f..52fe56dce5 100644 --- a/docs/doxygen/mainpages/introduction.h +++ b/docs/doxygen/mainpages/introduction.h @@ -89,13 +89,13 @@ mature. Both ports work on almost any Unix system (Linux, FreeBSD, OpenBSD, NetBSD, Solaris, AIX, ...) and require GTK+ 2.6 or later or GTK+ 3.x. The primary supported compiler is GNU g++. -@li wxOSX: wxOSX/Cocoa is the only port for Apple computers. wxOSX/Cocoa +@li wxOSX/Cocoa: This is the native port for Apple computers. wxOSX/Cocoa supports 32 or 64 bit Intel Macs running OS X 10.7 or later. The port can be built either with g++ or clang. Other platforms (e.g. iOS), compilers (Borland C++ under Windows, Sun CC, HP-UX aCC, IBM xlC or SGI mipsPro under Unix) and ports ( -wxGTK1, wxX11, wxDFB, wxPM...) are also supported but to a lesser extent. +wxQT, wxGTK1, wxX11, wxDFB...) are also supported but to a lesser extent. Please see the @subpage page_port "platform details page" for more information. There are no CPU speed requirements but the faster (and more) CPU(s) you have, diff --git a/docs/doxygen/mainpages/platdetails.h b/docs/doxygen/mainpages/platdetails.h index fdb9d101f3..9db5804706 100644 --- a/docs/doxygen/mainpages/platdetails.h +++ b/docs/doxygen/mainpages/platdetails.h @@ -57,18 +57,11 @@ distribution. -@section page_port_wxosx wxOSX +@section page_port_wxosx wxOSX/Cocoa -@subsection page_port_wxosx_cocoa wxOSX/Cocoa - -wxOSX/Cocoa is the only port of wxWidgets for the OS X platform. It requires +wxOSX/Cocoa is the port of wxWidgets for the OS X platform. It requires OS X 10.7 or later and fully supports 64 bit builds. -This is the default port when building wxOSX, but in order to select it -explicitly you can use - -@verbatim configure --with-osx_cocoa @endverbatim - For further information, please see the files in @c docs/osx in the distribution. diff --git a/docs/osx/install.txt b/docs/osx/install.txt index b1b9768b1f..1b53e24608 100644 --- a/docs/osx/install.txt +++ b/docs/osx/install.txt @@ -4,7 +4,7 @@ wxWidgets for Mac OS X installation wxWidgets can be compiled using Apple's Cocoa library. 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 +from the App Store. It is a free IDE from Apple that provides all of the tools you need for working with wxWidgets. After Xcode is installed, download wxWidgets-{version}.tar.bz2 and then @@ -12,7 +12,7 @@ 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 -one of the following sets of commands from the wxWidgets directory. +the following sets of commands from the wxWidgets directory. --------- diff --git a/docs/osx/readme.txt b/docs/osx/readme.txt index 26642a039f..cbb1ea9cdb 100644 --- a/docs/osx/readme.txt +++ b/docs/osx/readme.txt @@ -4,15 +4,14 @@ More Information is available from the wxWidgets project home page at https://www.wxwidgets.org -For more information, please see install.txt, todo.txt, and the -manuals. +For more information, please see install.txt and the manuals. Please send problems concerning installation, feature requests, bug reports or comments to the wxWidgets users list. Information on how to subscribe is available from the wxWidgets.org homepage. -Questions/Problems related directly to the mac port can be sent directly -csomor@advancedconcepts.ch. +Questions/Problems related directly to the mac port can be reported +at http://trac.wxwidgets.org. wxWidgets/Mac doesn't come with any guarantee whatsoever. It might crash your harddisk or destroy your monitor. It doesn't