Fix scrolling to the bottom in wxTextCtrl::AppendText().

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

diff --git a/interface/wx/icon.h b/interface/wx/icon.h
index c81d0d41889bc71b54d8bd3cd0e0fd763abfcde8..80a40419da9cc580d460a0fbd6859df3bb17633b 100644 (file)
--- a/interface/wx/icon.h
+++ b/interface/wx/icon.h
@@ -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.

 
 

+        @beginWxPerlOnly
+        In wxPerl use Wx::Icon->newBits(bits, width, height, depth = -1);
+        @endWxPerlOnly

 
 

-    /**
-        Creates a new icon. A depth of ::wxICON_SCREEN_DEPTH indicates the
-        depth of the current screen or visual.
-
-        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.


@@ -136,6 +129,10 @@ public:
         wxIcon icon("mondrian");
         #endif
         @endcode
         wxIcon icon("mondrian");
         #endif
         @endcode

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

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


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

+    /**
+        Returns disabled (dimmed) version of the icon. MSW only.
+        @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.


@@ -213,7 +216,7 @@ public:
     /**
         Returns @true if icon data is present.
     */
     /**
         Returns @true if icon data is present.
     */

-    bool IsOk() const;
+    virtual bool IsOk() const;

 
     /**
         Loads an icon from a file or resource.
 
     /**
         Loads an icon from a file or resource.


@@ -271,7 +274,7 @@ public:
         @param icon
             Icon to assign.
     */
         @param icon
             Icon to assign.
     */

-    wxIcon operator =(const wxIcon& icon);
+    wxIcon& operator=(const wxIcon& icon);

 };
 
 /**
 };
 
 /**