activate new xpm handler under Classic Mac OS after xpm handler fixes

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

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 2fb0616ba868dd7be6f3d61460c6c464f2489fed..7f666da534c9e6552d39e87f86e912075f8d24c4 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -15,7 +15,9 @@
 
 #include "wx/icon.h"
 
+#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
+#endif
 
 /*
  * Icons
@@ -58,6 +60,14 @@ wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(he
 {
 }
 
+wxIcon::wxIcon( const char **bits, int width, int height )
+{
+}
+
+wxIcon::wxIcon( char **bits, int width, int height )
+{
+}
+
 wxIcon::wxIcon(const wxString& icon_file, long flags,
     int desiredWidth, int desiredHeight)
 
@@ -92,24 +102,32 @@ bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
        Str255 theName ;
        short theId ;
        OSType theType ;
-       strcpy( (char*) theName , name ) ;
-       c2pstr( (char*) theName ) ;
+
+#if TARGET_CARBON
+       c2pstrcpy( (StringPtr) theName , name ) ;
+#else
+       strcpy( (char *) theName , name ) ;
+       c2pstr( (char *) theName ) ;
+#endif
        
        Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
-       GetResInfo( resHandle , &theId , &theType , theName ) ;
-       ReleaseResource( resHandle ) ;
-       
-       CIconHandle theIcon = (CIconHandle ) GetCIcon( theId ) ;
-       if ( theIcon )
+       if ( resHandle != 0L )
        {
-               M_ICONHANDLERDATA->m_hIcon = theIcon ;
-               M_ICONHANDLERDATA->m_width =  32 ;
-               M_ICONHANDLERDATA->m_height = 32 ;
+               GetResInfo( resHandle , &theId , &theType , theName ) ;
+               ReleaseResource( resHandle ) ;
                
-               M_ICONHANDLERDATA->m_depth = 8 ;
-               M_ICONHANDLERDATA->m_ok = true ;
-               M_ICONHANDLERDATA->m_numColors = 256 ;
-               return TRUE ;
+               CIconHandle theIcon = (CIconHandle ) GetCIcon( theId ) ;
+               if ( theIcon )
+               {
+                       M_ICONHANDLERDATA->m_hIcon = theIcon ;
+                       M_ICONHANDLERDATA->m_width =  32 ;
+                       M_ICONHANDLERDATA->m_height = 32 ;
+                       
+                       M_ICONHANDLERDATA->m_depth = 8 ;
+                       M_ICONHANDLERDATA->m_ok = true ;
+                       M_ICONHANDLERDATA->m_numColors = 256 ;
+                       return TRUE ;
+               }
        }
        return FALSE ;
 }