wxGrid focus handling fixes:

[wxWidgets.git] / include / wx / generic / icon.h

diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h
index 03ffbbef905e070b8671850bf5391a67fe58db70..b73d919c9c071e8882425825026c247f84886a5f 100644 (file)
--- a/include/wx/generic/icon.h
+++ b/include/wx/generic/icon.h
@@ -27,8 +27,10 @@ class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
 public:
     wxIcon();
 
-    wxIcon( const char **bits, int width=-1, int height=-1 );
-    wxIcon( char **bits, int width=-1, int height=-1 );
+    wxIcon(const char* const* bits);
+#ifdef wxNEEDS_CHARPP
+    wxIcon(char **bits);
+#endif
 
     // For compatibility with wxMSW where desired size is sometimes required to
     // distinguish between multiple icons in a resource.