A little clarification

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

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index ef4526a6705916e0a4a04c720f8287c3701a074f..bd1937bc2a45dba54274849335887c399a7832f3 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -83,19 +83,19 @@ bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
                                       int desiredWidth, int desiredHeight)
 {
     short theId = -1 ;
                                       int desiredWidth, int desiredHeight)
 {
     short theId = -1 ;

-    if ( name == "wxICON_INFORMATION" )
+    if ( name == wxT("wxICON_INFORMATION") )

     {
         theId = kNoteIcon ;
     }
     {
         theId = kNoteIcon ;
     }

-    else if ( name == "wxICON_QUESTION" )
+    else if ( name == wxT("wxICON_QUESTION") )

     {
         theId = kCautionIcon ;
     }
     {
         theId = kCautionIcon ;
     }

-    else if ( name == "wxICON_WARNING" )
+    else if ( name == wxT("wxICON_WARNING") )

     {
         theId = kCautionIcon ;
     }
     {
         theId = kCautionIcon ;
     }

-    else if ( name == "wxICON_ERROR" )
+    else if ( name == wxT("wxICON_ERROR") )

     {
         theId = kStopIcon ;
     }
     {
         theId = kStopIcon ;
     }


@@ -103,13 +103,7 @@ bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
     {
         Str255 theName ;
         OSType theType ;
     {
         Str255 theName ;
         OSType theType ;

-        
-#if TARGET_CARBON
-        c2pstrcpy( (StringPtr) theName , name ) ;
-#else
-        strcpy( (char *) theName , name ) ;
-        c2pstr( (char *) theName ) ;
-#endif
+        wxMacStringToPascal( name , theName ) ;

         
         Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
         if ( resHandle != 0L )
         
         Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
         if ( resHandle != 0L )