Use /bin/echo for creation of Mac OS X PkgInfo files.

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

diff --git a/interface/wx/icon.h b/interface/wx/icon.h
index 3f5e9dcf25542847c0da075306fb0b83ac195611..083bce75340f76322c280c281c65a7ae71eb7205 100644 (file)
--- a/interface/wx/icon.h
+++ b/interface/wx/icon.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxIcon
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxIcon
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -50,7 +50,7 @@
     @see @ref overview_bitmap, @ref overview_bitmap_supportedformats,
          wxDC::DrawIcon, wxCursor
 */
     @see @ref overview_bitmap, @ref overview_bitmap_supportedformats,
          wxDC::DrawIcon, wxCursor
 */

-class wxIcon : public wxBitmap
+class wxIcon : public wxGDIObject

 {
 public:
     /**
 {
 public:
     /**


@@ -90,24 +90,17 @@ public:
         @param bits
             Specifies an array of pixel values.
         @param width
         @param bits
             Specifies an array of pixel values.
         @param width

-            Specifies the width of the bitmap.
+            The width of the image.

         @param height
         @param height

-            Specifies the height of the bitmap.
-        @param depth
-            Specifies the depth of the bitmap.
-            If this is omitted, then a value of 1 (monochrome bitmap) is used.
-    */
-    wxIcon(const char bits[], int width, int height, int depth = 1);
-
+            The height of the image.

 
 

-    /**
-        Creates a new icon. A depth of ::wxICON_SCREEN_DEPTH indicates the
-        depth of the current screen or visual.
+        @beginWxPerlOnly
+        In wxPerl use Wx::Icon->newBits(bits, width, height, depth = -1);
+        @endWxPerlOnly

 
 

-        Some platforms only support 1 for monochrome and ::wxICON_SCREEN_DEPTH for
-        the current colour setting.
+        @onlyfor{wxmsw,wxosx}

     */
     */

-    wxIcon(int width, int height, int depth = wxICON_SCREEN_DEPTH);
+    wxIcon(const char bits[], int width, int height);

 
     /**
         Creates a bitmap from XPM data.
 
     /**
         Creates a bitmap from XPM data.


@@ -125,17 +118,21 @@ public:
         the appropriate platform, or an icon resource on Windows.
 
         @code
         the appropriate platform, or an icon resource on Windows.
 
         @code

-        wxIcon icon(wxICON(mondrian));
+        wxIcon icon(wxICON(sample));

 
         // Equivalent to:
         #if defined(__WXGTK__) || defined(__WXMOTIF__)
 
         // Equivalent to:
         #if defined(__WXGTK__) || defined(__WXMOTIF__)

-        wxIcon icon(mondrian_xpm);
+        wxIcon icon(sample_xpm);

         #endif
 
         #if defined(__WXMSW__)
         #endif
 
         #if defined(__WXMSW__)

-        wxIcon icon("mondrian");
+        wxIcon icon("sample");

         #endif
         @endcode
         #endif
         @endcode

+
+        @beginWxPerlOnly
+        In wxPerl use Wx::Icon->newFromXPM(data).
+        @endWxPerlOnly

     */
     wxIcon(const char* const* bits);
 
     */
     wxIcon(const char* const* bits);
 


@@ -182,6 +179,19 @@ public:
     */
     virtual ~wxIcon();
 
     */
     virtual ~wxIcon();
 

+    /**
+        Returns disabled (dimmed) version of the icon.
+
+        This method is available in wxIcon only under wxMSW, other ports only
+        have it in wxBitmap. You can always use wxImage::ConvertToDisabled()
+        and create the icon from wxImage manually however.
+
+        @onlyfor{wxmsw}
+
+        @since 2.9.0
+    */
+    wxIcon ConvertToDisabled(unsigned char brightness = 255) const;
+

     /**
         Copies @a bmp bitmap to this icon.
         Under MS Windows the bitmap must have mask colour set.
     /**
         Copies @a bmp bitmap to this icon.
         Under MS Windows the bitmap must have mask colour set.