Don't use focus if NULL

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

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index e886c1073ca51df91d7d384906f292e45b9e33b5..bd1937bc2a45dba54274849335887c399a7832f3 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        icon.cpp
 // Purpose:     wxIcon class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -31,24 +31,23 @@ wxIcon::wxIcon()
 }
 
 wxIcon::wxIcon(const char bits[], int width, int height) :
-    wxBitmap(bits,width,height )
+    wxBitmap(bits, width, height)
 {
     
 }
 
 wxIcon::wxIcon( const char **bits ) :
-    wxBitmap(bits  )
+    wxBitmap(bits)
 {
 }
 
 wxIcon::wxIcon( char **bits ) :
-    wxBitmap(bits )
+    wxBitmap(bits)
 {
 }
 
 wxIcon::wxIcon(const wxString& icon_file, int flags,
     int desiredWidth, int desiredHeight)
-
 {
     LoadFile(icon_file, (wxBitmapType) flags, desiredWidth, desiredHeight);
 }
@@ -60,16 +59,16 @@ wxIcon::~wxIcon()
 bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
     int desiredWidth, int desiredHeight)
 {
-  UnRef();
-
-  m_refData = new wxBitmapRefData;
-
-  wxBitmapHandler *handler = FindHandler((wxBitmapType)type);
-
-  if ( handler )
-       return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
-  else
-       return FALSE;
+    UnRef();
+    
+    m_refData = new wxBitmapRefData;
+    
+    wxBitmapHandler *handler = FindHandler((wxBitmapType)type);
+    
+    if ( handler )
+        return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
+    else
+        return FALSE;
 }
 
 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
@@ -81,59 +80,53 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
 
 bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-          int desiredWidth, int desiredHeight)
+                                      int desiredWidth, int desiredHeight)
 {
-       short theId = -1 ;
-    if ( name == "wxICON_INFORMATION" )
+    short theId = -1 ;
+    if ( name == wxT("wxICON_INFORMATION") )
     {
         theId = kNoteIcon ;
     }
-    else if ( name == "wxICON_QUESTION" )
+    else if ( name == wxT("wxICON_QUESTION") )
     {
         theId = kCautionIcon ;
     }
-    else if ( name == "wxICON_WARNING" )
+    else if ( name == wxT("wxICON_WARNING") )
     {
-         theId = kCautionIcon ;
-   }
-    else if ( name == "wxICON_ERROR" )
+        theId = kCautionIcon ;
+    }
+    else if ( name == wxT("wxICON_ERROR") )
     {
         theId = kStopIcon ;
     }
     else
     {
-       Str255 theName ;
-       OSType theType ;
-
-    #if TARGET_CARBON
-       c2pstrcpy( (StringPtr) theName , name ) ;
-    #else
-       strcpy( (char *) theName , name ) ;
-       c2pstr( (char *) theName ) ;
-    #endif
-       
-       Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
-       if ( resHandle != 0L )
-       {
-               GetResInfo( resHandle , &theId , &theType , theName ) ;
-               ReleaseResource( resHandle ) ;
-       }
+        Str255 theName ;
+        OSType theType ;
+        wxMacStringToPascal( name , theName ) ;
+        
+        Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
+        if ( resHandle != 0L )
+        {
+            GetResInfo( resHandle , &theId , &theType , theName ) ;
+            ReleaseResource( resHandle ) ;
+        }
+    }
+    if ( theId != -1 )
+    {
+        CIconHandle theIcon = (CIconHandle ) GetCIcon( theId ) ;
+        if ( theIcon )
+        {
+            M_BITMAPHANDLERDATA->m_hIcon = theIcon ;
+            M_BITMAPHANDLERDATA->m_width =  32 ;
+            M_BITMAPHANDLERDATA->m_height = 32 ;
+            
+            M_BITMAPHANDLERDATA->m_depth = 8 ;
+            M_BITMAPHANDLERDATA->m_ok = true ;
+            M_BITMAPHANDLERDATA->m_numColors = 256 ;
+            M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeIcon ;
+            return TRUE ;
+        }
     }
-       if ( theId != -1 )
-       {
-               CIconHandle theIcon = (CIconHandle ) GetCIcon( theId ) ;
-               if ( theIcon )
-               {
-                       M_BITMAPHANDLERDATA->m_hIcon = theIcon ;
-                       M_BITMAPHANDLERDATA->m_width =  32 ;
-                       M_BITMAPHANDLERDATA->m_height = 32 ;
-                       
-                       M_BITMAPHANDLERDATA->m_depth = 8 ;
-                       M_BITMAPHANDLERDATA->m_ok = true ;
-                       M_BITMAPHANDLERDATA->m_numColors = 256 ;
-                       M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeIcon ;
-                       return TRUE ;
-               }
-       }
-       return FALSE ;
+    return FALSE ;
 }