Remove wxOSX/Carbon support.
Cocoa has been the default toolkit in wxWidgets for a long time. There is really no good reason to use Carbon in 2016 and this removes a lot of unused and unmaintained code.
This commit is contained in:
@@ -37,11 +37,10 @@ using @ifdef_ and not @if_.
|
||||
Notice that for compatibility reasons, this symbol is defined for console
|
||||
applications under Windows as well, but it should only be used in the GUI code
|
||||
while <tt>__WINDOWS__</tt> should be used for the platform tests.}
|
||||
@itemdef{__WXOSX__, OS X GUI using any Apple widget framework (Carbon, AppKit or UIKit)}
|
||||
@itemdef{__WXOSX__, OS X GUI using any Apple widget framework (AppKit or UIKit)}
|
||||
@itemdef{__WXOSX_IPHONE__, OS X iPhone (UIKit)}
|
||||
@itemdef{__WXOSX_CARBON__, Mac OS X using Carbon}
|
||||
@itemdef{__WXOSX_COCOA__, Mac OS X using Cocoa (AppKit)}
|
||||
@itemdef{__WXOSX_MAC__, Mac OS X (Carbon or Cocoa)}
|
||||
@itemdef{__WXOSX_MAC__, Mac OS X (Cocoa)}
|
||||
@itemdef{__WXPM__, OS/2 native Presentation Manager (not used any longer).}
|
||||
@itemdef{__WXSTUBS__, Stubbed version ('template' wxWin implementation)}
|
||||
@itemdef{__WXXT__, Xt; mutually exclusive with WX_MOTIF, not implemented in wxWidgets 2.x}
|
||||
@@ -52,17 +51,13 @@ while <tt>__WINDOWS__</tt> should be used for the platform tests.}
|
||||
@itemdef{__X__, any X11-based GUI toolkit except GTK+}
|
||||
@endDefList
|
||||
|
||||
There are two wxWidgets ports to Mac OS X. One of them, wxOSX is the successor of the
|
||||
venerable wxMac, it currently exists in three versions: Carbon and Cocoa for the
|
||||
desktop and a very early iPhone port. And there is the Cocoa port named wxCocoa
|
||||
which has not been updated very actively since beginning 2008. To summarize:
|
||||
wxOSX is the successor of the venerable wxMac, it currently exists in two
|
||||
versions: Cocoa for the desktop and a very early iPhone port. To summarize:
|
||||
|
||||
@li If you want to test for wxOSX on the desktop, use
|
||||
<tt>__WXOSX_MAC__</tt>.
|
||||
@li If you want to test for wxOSX on the iPhone, use
|
||||
<tt>__WXOSX_IPHONE__</tt>.
|
||||
@li If you want to test for a particular GUI Mac port under OS X, use
|
||||
<tt>__WXOSX_CARBON__</tt> or <tt>__WXOSX_COCOA__</tt>.
|
||||
@li If you want to test for any port under Mac OS X, including, for
|
||||
example, wxGTK and also wxBase, use <tt>__DARWIN__</tt> (see below).
|
||||
|
||||
|
@@ -89,13 +89,12 @@ 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 primary port for Apple computers, replacing the
|
||||
older and now deprecated wxOSX/Carbon port. 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.
|
||||
@li wxOSX: wxOSX/Cocoa is the only 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 (wxOSX/Carbon,
|
||||
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.
|
||||
Please see the @subpage page_port "platform details page" for more information.
|
||||
|
||||
|
@@ -61,9 +61,8 @@ distribution.
|
||||
|
||||
@subsection page_port_wxosx_cocoa wxOSX/Cocoa
|
||||
|
||||
wxOSX/Cocoa is the currently recommended port of wxWidgets for the Macintosh OS
|
||||
platform. It requires OS X 10.7 or later and, unlike wxOSX/Carbon, fully
|
||||
supports 64 bit builds.
|
||||
wxOSX/Cocoa is the only 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
|
||||
@@ -74,28 +73,6 @@ For further information, please see the files in @c docs/osx in the
|
||||
distribution.
|
||||
|
||||
|
||||
@subsection page_port_wxosx_carbon wxOSX/Carbon
|
||||
|
||||
wxOSX/Carbon is an older port of wxWidgets for the Macintosh OS platform. Currently
|
||||
OS X 10.5 or higher are supported. wxOSX/Carbon can be compiled both using
|
||||
Apple's command line developer tools as well as Apple's Xcode IDE. wxOSX/Carbon
|
||||
supports Intel and PowerPC architectures and can be used to produce
|
||||
"universal binaries" in order create application which can run both
|
||||
architecture. Unfortunately, wxOSX/Carbon does not support any 64-bit
|
||||
architecture since Apple decided not to port its Carbon API entirely to 64-bit.
|
||||
|
||||
@note Carbon has been deprecated by Apple as of OS X 10.5 and will likely be
|
||||
removed entirely in a future OS version. It's recommended you look into
|
||||
switching your app over to wxOSX/Cocoa as soon as possible.
|
||||
|
||||
To build wxWidgets using wxOSX/Carbon you need to do
|
||||
|
||||
@verbatim configure --with-osx_carbon @endverbatim
|
||||
|
||||
For further information, please see the files in @c docs/osx in the
|
||||
distribution.
|
||||
|
||||
|
||||
|
||||
|
||||
@section page_port_wxx11 wxX11
|
||||
@@ -207,7 +184,6 @@ necessary to use the underlying toolkit API directly:
|
||||
- GLib docs at http://library.gnome.org/devel/glib/unstable/
|
||||
- GObject docs at http://library.gnome.org/devel/gobject/unstable/
|
||||
- Pango docs at http://library.gnome.org/devel/pango/unstable/
|
||||
- wxMac port uses the Carbon API: see Carbon docs at http://developer.apple.com/carbon
|
||||
- wxCocoa port uses the Cocoa API: see Cocoa docs at http://developer.apple.com/cocoa
|
||||
- wxOSX port uses the Cocoa API: see Cocoa docs at http://developer.apple.com/cocoa
|
||||
|
||||
*/
|
||||
|
@@ -34,7 +34,7 @@ disadvantage is that it the widget will look the same on all platforms, and
|
||||
thus it may not integrate well with the native look and feel.
|
||||
|
||||
The second method is to build it directly upon the native toolkits of the
|
||||
platforms you want to support (e.g. GTK+, Carbon and GDI). In this way you'll
|
||||
platforms you want to support (e.g. GTK+, Cocoa and GDI). In this way you'll
|
||||
get a @b native widget. This method in fact has the advantage of a native look
|
||||
and feel but requires different implementations and thus more work.
|
||||
|
||||
|
Reference in New Issue
Block a user