X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..2b3bddf68b97d4b2a70f402772838a92abd60565:/src/mac/carbon/icon.cpp

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 004b47fc6e..c90a0b37c7 100644
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -90,13 +90,7 @@ wxIcon::wxIcon( const char bits[], int width, int height )
     CopyFromBitmap( bmp ) ;
 }
 
-wxIcon::wxIcon( const char **bits )
-{
-    wxBitmap bmp( bits ) ;
-    CopyFromBitmap( bmp ) ;
-}
-
-wxIcon::wxIcon( char **bits )
+wxIcon::wxIcon(const char* const* bits)
 {
     wxBitmap bmp( bits ) ;
     CopyFromBitmap( bmp ) ;
@@ -226,7 +220,11 @@ bool wxIcon::LoadFile(
                     HLock((Handle) iconFamily);
                     OSStatus err = GetIconRefFromIconFamilyPtr( *iconFamily, GetHandleSize((Handle) iconFamily), &iconRef );
                     HUnlock((Handle) iconFamily);
-                    wxASSERT_MSG( err == noErr , wxT("Error when constructing icon ref") );
+                    if ( err != noErr )
+                    {
+                        wxFAIL_MSG("Error when constructing icon ref");
+                    }
+
                     ReleaseResource( resHandle ) ;
                 }
               }