adapted Julian's new speed improved version

[wxWidgets.git] / src / mac / carbon / bitmap.cpp

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 7fd7536644e8a2d081a4fa90009a3fc7f70114ec..9608e346ef184fd65eefba7e38c3cbea3a4d4e20 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -565,8 +565,9 @@ IconRef wxBitmapRefData::GetIconRef()
         HLock((Handle) iconFamily);
         OSStatus err = GetIconRefFromIconFamilyPtr( *iconFamily, GetHandleSize((Handle) iconFamily), &m_iconRef );
         HUnlock((Handle) iconFamily);
-        wxASSERT_MSG( err == noErr , wxT("Error when constructing icon ref") );
         DisposeHandle( (Handle) iconFamily ) ;
+
+        wxCHECK_MSG( err == noErr, NULL, wxT("Error when constructing icon ref") );
     }
 
     return m_iconRef ;
@@ -1614,12 +1615,6 @@ WXHBITMAP wxMask::GetHBITMAP() const
     return m_maskBitmap ;
 }
 
-// ----------------------------------------------------------------------------
-// wxBitmapHandler
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
-
 // ----------------------------------------------------------------------------
 // Standard Handlers
 // ----------------------------------------------------------------------------