added clientcontext variable to Open Transport initialisation

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

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 537165343e72e87a96ec2bf6ac7b8bbd81daf955..7f666da534c9e6552d39e87f86e912075f8d24c4 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -60,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)
 
 wxIcon::wxIcon(const wxString& icon_file, long flags,
     int desiredWidth, int desiredHeight)
 


@@ -94,24 +102,32 @@ bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
        Str255 theName ;
        short theId ;
        OSType theType ;
        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 ) ;
        
        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 ;
        }
        return FALSE ;

-}
\ No newline at end of file
+}