Merge in from trunk r64802 - r68625

[wxWidgets.git] / interface / wx / imaglist.h

diff --git a/interface/wx/imaglist.h b/interface/wx/imaglist.h
index e0b8a2d4fe67a8a1a9e88112c2fc03237067aab3..7c9cd1d72ba8c685a50f560e4417684891f89d24 100644 (file)
--- a/interface/wx/imaglist.h
+++ b/interface/wx/imaglist.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxImageList
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxImageList
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -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);
 };