Consider wxOSX the port name, and have wxOSX/Carbon and wxOSX/Cocoa as variations...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/doxygen/mainpages/platdetails.h b/docs/doxygen/mainpages/platdetails.h
index 55b6d741d307afa3de85f6c63a7d7d66729cc7e6..7a25cd4c1007c834db1b038c0fe3226b59b13869 100644 (file)
--- a/docs/doxygen/mainpages/platdetails.h
+++ b/docs/doxygen/mainpages/platdetails.h
@@ -19,8 +19,7 @@ requires. This chapter collects notes about differences among supported platform
 and ports.
 
 @li @ref page_port_wxgtk
 and ports.
 
 @li @ref page_port_wxgtk

-@li @ref page_port_wxosx_carbon
-@li @ref page_port_wxosx_cocoa
+@li @ref page_port_wxosx

 @li @ref page_port_wxos2
 @li @ref page_port_wxmgl
 @li @ref page_port_wxx11
 @li @ref page_port_wxos2
 @li @ref page_port_wxmgl
 @li @ref page_port_wxx11


@@ -71,15 +70,15 @@ For further information, please see the files in @c docs/gtk
 in the distribution.
 
 
 in the distribution.
 
 

-
-
-@section page_port_wxosx_carbon wxOSX/Carbon
+@section page_port_wxosx wxOSX

 
 @htmlonly
 <img src="logo_osxleopard.png" alt="Mac OS X (Leopard) logo"
     title="Mac OS X (Leopard) logo" class="logo">
 @endhtmlonly
 
 
 @htmlonly
 <img src="logo_osxleopard.png" alt="Mac OS X (Leopard) logo"
     title="Mac OS X (Leopard) logo" class="logo">
 @endhtmlonly
 

+@subsection page_port_wxosx_carbon wxOSX/Carbon
+

 wxOSX/Carbon is a port of wxWidgets for the Macintosh OS platform.
 Currently MacOS X 10.4 or higher are supported. wxOSX/Carbon can
 be compiled both using Apple's command line developer tools
 wxOSX/Carbon is a port of wxWidgets for the Macintosh OS platform.
 Currently MacOS X 10.4 or higher are supported. wxOSX/Carbon can
 be compiled both using Apple's command line developer tools


@@ -90,17 +89,16 @@ 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.
 
 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.
+

 For further information, please see the files in @c docs/osx
 in the distribution.
 
 
 
 For further information, please see the files in @c docs/osx
 in the distribution.
 
 
 

-@section page_port_wxosx_cocoa wxOSX/Cocoa
-
-@htmlonly
-<img src="logo_osxleopard.png" alt="Mac OS X (Leopard) logo"
-    title="Mac OS X (Leopard) logo" class="logo">
-@endhtmlonly
+@subsection page_port_wxosx_cocoa wxOSX/Cocoa

 
 wxOSX/Cocoa is another port of wxWidgets for the Macintosh OS
 platform. In contrast to wxOSX/Carbon, it uses the Cocoa API 
 
 wxOSX/Cocoa is another port of wxWidgets for the Macintosh OS
 platform. In contrast to wxOSX/Carbon, it uses the Cocoa API 


@@ -109,10 +107,15 @@ controls are functional, but the port has not reached the maturity
 of the wxOSX/Carbon port yet. It is possible to use wxOSX/Cocoa
 on 64-bit architectures.
 
 of the wxOSX/Carbon port yet. It is possible to use wxOSX/Cocoa
 on 64-bit architectures.
 

+In order to configure wxWidgets to compile wxOSX/Cocoa you will
+need to type:
+
+@verbatim configure --with-osx_cocoa @endverbatim
+

 For further information, please see the files in @c docs/osx
 in the distribution.
 
 For further information, please see the files in @c docs/osx
 in the distribution.
 

-Note that there was a previous effort towards a Cocoa port called 
+@note There was a previous effort towards a Cocoa port called 

 wxCocoa, which was implemented totally with Cocoa API unlike the OSX/Cocoa port
 which uses OS X C APIs to share code, and while it is no longer being actively 
 developed, docs for it are available in @c docs/cocoa in the distribution.
 wxCocoa, which was implemented totally with Cocoa API unlike the OSX/Cocoa port
 which uses OS X C APIs to share code, and while it is no longer being actively 
 developed, docs for it are available in @c docs/cocoa in the distribution.

diff --git a/interface/wx/app.h b/interface/wx/app.h
index 7bc9844834e2b60b3936e2ffe3701efc7038355d..4053532457888150a2b2543f194e800d3f3d7831 100644 (file)
--- a/interface/wx/app.h
+++ b/interface/wx/app.h
@@ -212,7 +212,7 @@ public:
         Called in response of an "open-application" Apple event.
         Override this to create a new document in your app.
 
         Called in response of an "open-application" Apple event.
         Override this to create a new document in your app.
 

-        @onlyfor{wxmac}
+        @onlyfor{wxosx}

     */
     virtual void MacNewFile();
 
     */
     virtual void MacNewFile();
 


@@ -223,28 +223,28 @@ public:
         user double clicked on it or if the document file was dropped on either the
         running application or the application icon in Finder.
 
         user double clicked on it or if the document file was dropped on either the
         running application or the application icon in Finder.
 

-        @onlyfor{wxmac}
+        @onlyfor{wxosx}

     */
     virtual void MacOpenFile(const wxString& fileName);
 
     /**
         Called in response of a "get-url" Apple event.
 
     */
     virtual void MacOpenFile(const wxString& fileName);
 
     /**
         Called in response of a "get-url" Apple event.
 

-        @onlyfor{wxmac}
+        @onlyfor{wxosx}

     */
     virtual void MacOpenURL(const wxString& url);
 
     /**
         Called in response of a "print-document" Apple event.
 
     */
     virtual void MacOpenURL(const wxString& url);
 
     /**
         Called in response of a "print-document" Apple event.
 

-        @onlyfor{wxmac}
+        @onlyfor{wxosx}

     */
     virtual void MacPrintFile(const wxString& fileName);
 
     /**
         Called in response of a "reopen-application" Apple event.
 
     */
     virtual void MacPrintFile(const wxString& fileName);
 
     /**
         Called in response of a "reopen-application" Apple event.
 

-        @onlyfor{wxmac}
+        @onlyfor{wxosx}

     */
     virtual void MacReopenApp();
 
     */
     virtual void MacReopenApp();
 

diff --git a/interface/wx/dnd.h b/interface/wx/dnd.h
index 0855d6872a8a3c60117fadb637c4b58a7e8a6155..6c2ed5394f890ac2620f513dc6f8d83cfd9ffb40 100644 (file)
--- a/interface/wx/dnd.h
+++ b/interface/wx/dnd.h
@@ -192,7 +192,7 @@ public:
         icons for GTK. You should use the macro wxDROP_ICON() in portable
         programs instead of directly using either of these types.
 
         icons for GTK. You should use the macro wxDROP_ICON() in portable
         programs instead of directly using either of these types.
 

-        @onlyfor{wxmsw,wxmac}
+        @onlyfor{wxmsw,wxosx}

 
         @param win
             The window which initiates the drag and drop operation.
 
         @param win
             The window which initiates the drag and drop operation.


@@ -216,7 +216,7 @@ public:
         icons for GTK. You should use the macro wxDROP_ICON() in portable
         programs instead of directly using either of these types.
 
         icons for GTK. You should use the macro wxDROP_ICON() in portable
         programs instead of directly using either of these types.
 

-        @onlyfor{wxmsw,wxmac}
+        @onlyfor{wxmsw,wxosx}

 
         @param data
             The data associated with the drop source.
 
         @param data
             The data associated with the drop source.

diff --git a/interface/wx/icon.h b/interface/wx/icon.h
index bab04d6e6df69ff4f1f7c2094ae68ea32cd2a1c2..5a055a7168e75fd1a5755a8ee1c4989b03edb9be 100644 (file)
--- a/interface/wx/icon.h
+++ b/interface/wx/icon.h
@@ -94,7 +94,7 @@ public:
         @param height
             The height of the image.
 
         @param height
             The height of the image.
 

-        @onlyfor{wxmsw,wxmac}
+        @onlyfor{wxmsw,wxosx}

     */
     wxIcon(const char bits[], int width, int height);
 
     */
     wxIcon(const char bits[], int width, int height);
 

diff --git a/interface/wx/imaglist.h b/interface/wx/imaglist.h
index e0b8a2d4fe67a8a1a9e88112c2fc03237067aab3..f5a4dc3203b5e490022f8d7e5a586807cb98b999 100644 (file)
--- a/interface/wx/imaglist.h
+++ b/interface/wx/imaglist.h
@@ -101,7 +101,7 @@ public:
                  matching the dimensions of the image list.
                  This does not apply when adding icons.
 
                  matching the dimensions of the image list.
                  This does not apply when adding icons.
 

-        @onlyfor{wxmsw,wxmac}
+        @onlyfor{wxmsw,wxosx}

     */
     int Add(const wxIcon& icon);
 
     */
     int Add(const wxIcon& icon);
 


@@ -209,7 +209,7 @@ public:
         @remarks The original bitmap or icon is not affected by the Replace()
                  operation, and can be deleted afterwards.
 
         @remarks The original bitmap or icon is not affected by the Replace()
                  operation, and can be deleted afterwards.
 

-        @onlyfor{wxmsw,wxmac}
+        @onlyfor{wxmsw,wxosx}

     */
     bool Replace(int index, const wxIcon& icon);
 };
     */
     bool Replace(int index, const wxIcon& icon);
 };

diff --git a/interface/wx/menuitem.h b/interface/wx/menuitem.h
index 8d5553c92eede86f58aec11ded7c624e1a15e2d8..8566896a96af76d2f4bf90dab96788889da28658 100644 (file)
--- a/interface/wx/menuitem.h
+++ b/interface/wx/menuitem.h
@@ -276,7 +276,7 @@ public:
         Sets the bitmap for the menu item.
         It is equivalent to wxMenuItem::SetBitmaps(bmp, wxNullBitmap).
 
         Sets the bitmap for the menu item.
         It is equivalent to wxMenuItem::SetBitmaps(bmp, wxNullBitmap).
 

-        @onlyfor{wxmsw,wxmac,wxgtk}
+        @onlyfor{wxmsw,wxosx,wxgtk}

     */
     virtual void SetBitmap(const wxBitmap& bmp);
 
     */
     virtual void SetBitmap(const wxBitmap& bmp);
 

diff --git a/interface/wx/pen.h b/interface/wx/pen.h
index 0bcddb1248c6dc6f994d0e1c33facb90b8fc2c64..0b617945d8443cdaaf9daf872e2e9565522f35ef 100644 (file)
--- a/interface/wx/pen.h
+++ b/interface/wx/pen.h
@@ -182,7 +182,7 @@ public:
         @param stipple
             A stipple bitmap.
 
         @param stipple
             A stipple bitmap.
 

-        @onlyfor{wxmsw,wxmac}
+        @onlyfor{wxmsw,wxosx}

 
         @see SetWidth(), SetStipple()
     */
 
         @see SetWidth(), SetStipple()
     */