Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding new defines for OSX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-02-16 10:55:48 +00:00
parent 2d14a14c57
commit 3f63d14108
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
docs/doxygen/mainpages/const_cpp.h
View File

@@ -36,7 +36,7 @@ always tested using @ifdef_ and not @if_.
@itemdef{__WIN16__, Win16 API (not supported since wxWidgets 2.6)} @itemdef{__WIN16__, Win16 API (not supported since wxWidgets 2.6)}
@itemdef{__WIN32__, Win32 API} @itemdef{__WIN32__, Win32 API}
@itemdef{__WXBASE__, Only wxBase, no GUI features (same as @c wxUSE_GUI == 0)} @itemdef{__WXBASE__, Only wxBase, no GUI features (same as @c wxUSE_GUI == 0)}
@itemdef{__WXCOCOA__, OS X using Cocoa API} @itemdef{__WXCOCOA__, OS X using wxCocoa Port}
@itemdef{__WXDFB__, wxUniversal using DirectFB} @itemdef{__WXDFB__, wxUniversal using DirectFB}
@itemdef{__WXWINCE__, Windows CE} @itemdef{__WXWINCE__, Windows CE}
@itemdef{__WXGTK__, GTK+} @itemdef{__WXGTK__, GTK+}
@@ -45,16 +45,18 @@ always tested using @ifdef_ and not @if_.
@itemdef{__WXGTK24__, GTK+ 2.4 or higher} @itemdef{__WXGTK24__, GTK+ 2.4 or higher}
@itemdef{__WXGTK26__, GTK+ 2.6 or higher} @itemdef{__WXGTK26__, GTK+ 2.6 or higher}
@itemdef{__WXGTK210__, GTK+ 2.10 or higher} @itemdef{__WXGTK210__, GTK+ 2.10 or higher}
@itemdef{__WXMAC__, old define for Mac OS X}
@itemdef{__WXMOTIF__, Motif} @itemdef{__WXMOTIF__, Motif}
@itemdef{__WXMOTIF20__, Motif 2.0 or higher} @itemdef{__WXMOTIF20__, Motif 2.0 or higher}
@itemdef{__WXMAC__, Mac OS all targets}
@itemdef{__WXMAC_CLASSIC__, MacOS for Classic}
@itemdef{__WXMAC_CARBON__, MacOS for Carbon CFM (running under Classic or OSX)
or true OS X Mach-O Builds}
@itemdef{__WXMAC_OSX__, MacOS X Carbon Mach-O Builds}
@itemdef{__WXMGL__, SciTech Soft MGL (__WXUNIVERSAL__ will be also defined)} @itemdef{__WXMGL__, SciTech Soft MGL (__WXUNIVERSAL__ will be also defined)}
@itemdef{__WXMSW__, Any Windows} @itemdef{__WXMSW__, Any Windows}
@itemdef{__WXOSX__, Any Mac OS X port (either Carbon or Cocoa)} @itemdef{__WXOSX__, any OS X}
@itemdef{__WXOSX_IPHONE__, OS X iPhone}
@itemdef{__WXOSX_CARBON__, Mac OS X using Carbon}
@itemdef{__WXOSX_COCOA__, Mac OS X using Cocoa}
@itemdef{__WXOSX_MAC__, Mac OS X (Carbon or Cocoa)}
@itemdef{__WXOSX_OR_COCOA__, Any Mac OS X port (wxOSX-Carbon, wxOSX-Cocoa or
wxCocoa)}
@itemdef{__WXPALMOS__, PalmOS} @itemdef{__WXPALMOS__, PalmOS}
@itemdef{__WXPM__, OS/2 native Presentation Manager} @itemdef{__WXPM__, OS/2 native Presentation Manager}
@itemdef{__WXSTUBS__, Stubbed version ('template' wxWin implementation)} @itemdef{__WXSTUBS__, Stubbed version ('template' wxWin implementation)}
@@ -66,17 +68,17 @@ always tested using @ifdef_ and not @if_.
@itemdef{__X__, any X11-based GUI toolkit except GTK+} @itemdef{__X__, any X11-based GUI toolkit except GTK+}
@endDefList @endDefList
There are two wxWidgets ports to Mac OS. One of them, wxMac, exists in two versions: There are two wxWidgets ports to Mac OS X. One of them, wxOSX is the successor of the
Classic and Carbon. The Classic version is the only one to work on Mac OS version 8. venerable wxMac, it currently exists in three versions: Carbon and Cocoa for the
The Carbon version may be built either as CFM or Mach-O (binary format, like ELF) desktop and a very early iPhone port. And there is the Cocoa port named wxCocoa
and the former may run under OS 9 while the latter only runs under OS X. which has not been updated very actively since beginning 2008. To summarize:
Finally, there is a new Cocoa port which can only be used under OS X. To
summarize:
@li If you want to test for all Mac platforms, classic and OS X, you @li If you want to test for wxOSX on the desktop, use
should test both @c __WXMAC__ and @c __WXCOCOA__. @c __WXOSX_MAC__.
@li If you want to test for wxOSX on the iPhone, use
@c __WXOSX_IPHONE__.
@li If you want to test for any GUI Mac port under OS X, use @li If you want to test for any GUI Mac port under OS X, use
@c __WXOSX__. @c __WXOSX_OR_COCOA__.
@li If you want to test for any port under Mac OS X, including, for @li If you want to test for any port under Mac OS X, including, for
example, wxGTK and also wxBase, use @c __DARWIN__ (see below). example, wxGTK and also wxBase, use @c __DARWIN__ (see below).