don't place NULL pointers in the GDK window array in GTKGetWindow()

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

diff --git a/interface/wx/icon.h b/interface/wx/icon.h
index c81d0d41889bc71b54d8bd3cd0e0fd763abfcde8..5a055a7168e75fd1a5755a8ee1c4989b03edb9be 100644 (file)
--- a/interface/wx/icon.h
+++ b/interface/wx/icon.h
@@ -90,24 +90,13 @@ public:
         @param bits
             Specifies an array of pixel values.
         @param width
-            Specifies the width of the bitmap.
+            The width of the image.
         @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);
-
-
-    /**
-        Creates a new icon. A depth of ::wxICON_SCREEN_DEPTH indicates the
-        depth of the current screen or visual.
+            The height of the image.
 
-        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.
@@ -213,7 +202,7 @@ public:
     /**
         Returns @true if icon data is present.
     */
-    bool IsOk() const;
+    virtual bool IsOk() const;
 
     /**
         Loads an icon from a file or resource.
@@ -271,7 +260,7 @@ public:
         @param icon
             Icon to assign.
     */
-    wxIcon operator =(const wxIcon& icon);
+    wxIcon& operator=(const wxIcon& icon);
 };
 
 /**