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 76a8eaf5dbc0fd0fa91c209c154159a69538146b..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

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


@@ -100,6 +100,8 @@ public:
                  bitmap will automatically be split into smaller images, each
                  matching the dimensions of the image list.
                  This does not apply when adding icons.
                  bitmap will automatically be split into smaller images, each
                  matching the dimensions of the image list.
                  This does not apply when adding icons.

+
+        @onlyfor{wxmsw,wxosx}

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


@@ -206,6 +208,8 @@ 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,wxosx}

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