Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp
index f391772e7574a505bec129d9dec02cb17c4fc4a1..5afbf3c67b09f839c73dd774bdfbef547f03fcfe 100644 (file)
--- a/src/osx/carbon/icon.cpp
+++ b/src/osx/carbon/icon.cpp
@@ -137,21 +137,21 @@ wxIcon::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const
 
 WXHICON wxIcon::GetHICON() const
 {
 
 WXHICON wxIcon::GetHICON() const
 {

-    wxASSERT( Ok() ) ;
+    wxASSERT( IsOk() ) ;

 
     return (WXHICON) ((wxIconRefData*)m_refData)->GetHICON() ;
 }
 
 int wxIcon::GetWidth() const
 {
 
     return (WXHICON) ((wxIconRefData*)m_refData)->GetHICON() ;
 }
 
 int wxIcon::GetWidth() const
 {

-   wxCHECK_MSG( Ok(), -1, wxT("invalid icon") );
+   wxCHECK_MSG( IsOk(), -1, wxT("invalid icon") );

 
    return M_ICONDATA->GetWidth();
 }
 
 int wxIcon::GetHeight() const
 {
 
    return M_ICONDATA->GetWidth();
 }
 
 int wxIcon::GetHeight() const
 {

-   wxCHECK_MSG( Ok(), -1, wxT("invalid icon") );
+   wxCHECK_MSG( IsOk(), -1, wxT("invalid icon") );

 
    return M_ICONDATA->GetHeight();
 }
 
    return M_ICONDATA->GetHeight();
 }


@@ -321,6 +321,26 @@ bool wxIcon::LoadIconFromBundleResource(const wxString& resourceName, int desire
             ReleaseResource( resHandle ) ;
         }
     }
             ReleaseResource( resHandle ) ;
         }
     }

+    if ( iconRef == NULL )
+    {
+        wxCFStringRef name(resourceName);
+        FSRef iconFSRef;
+        
+        wxCFRef<CFURLRef> iconURL(CFBundleCopyResourceURL(CFBundleGetMainBundle(), name, CFSTR("icns"), NULL));
+
+        if (CFURLGetFSRef(iconURL, &iconFSRef))
+        {
+            // Get a handle on the icon family
+            IconFamilyHandle iconFamily;
+            OSStatus err = ReadIconFromFSRef( &iconFSRef, &iconFamily );
+            
+            if ( err == noErr )
+            {
+                err = GetIconRefFromIconFamilyPtr( *iconFamily, GetHandleSize((Handle) iconFamily), &iconRef );
+            }
+            ReleaseResource( (Handle) iconFamily );
+        }
+    }

 
     if ( iconRef )
     {
 
     if ( iconRef )
     {


@@ -394,7 +414,7 @@ bool wxIcon::LoadIconAsBitmap(const wxString& filename, wxBitmapType type, int d
     else
     {
         wxImage loadimage( filename, type );
     else
     {
         wxImage loadimage( filename, type );

-        if (loadimage.Ok())
+        if (loadimage.IsOk())

         {
             if ( desiredWidth == -1 )
                 desiredWidth = loadimage.GetWidth() ;
         {
             if ( desiredWidth == -1 )
                 desiredWidth = loadimage.GetWidth() ;


@@ -420,8 +440,21 @@ void wxIcon::CopyFromBitmap( const wxBitmap& bmp )
     UnRef() ;
 
     // as the bitmap owns that ref, we have to acquire it as well
     UnRef() ;
 
     // as the bitmap owns that ref, we have to acquire it as well

-    IconRef iconRef = bmp.CreateIconRef() ;
-    m_refData = new wxIconRefData( (WXHICON) iconRef, bmp.GetWidth(), bmp.GetHeight()  ) ;
+    
+    int w = bmp.GetWidth() ;
+    int h = bmp.GetHeight() ;
+    int sz = wxMax( w , h ) ;
+
+    if ( sz == 24 || sz == 64 )
+    {
+        wxBitmap scaleBmp( bmp.ConvertToImage().Scale( w * 2 , h * 2 ) ) ;
+        m_refData = new wxIconRefData( (WXHICON) scaleBmp.CreateIconRef(), bmp.GetWidth(), bmp.GetHeight()  ) ;
+    }
+    else 
+    {
+        m_refData = new wxIconRefData( (WXHICON) bmp.CreateIconRef() , bmp.GetWidth(), bmp.GetHeight()  ) ;
+    }
+

 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)


@@ -434,7 +467,7 @@ bool  wxICONResourceHandler::LoadFile(
     if ( icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) )
     {
         bitmap->CopyFromIcon( icon ) ;
     if ( icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) )
     {
         bitmap->CopyFromIcon( icon ) ;

-        return bitmap->Ok() ;
+        return bitmap->IsOk() ;

     }
     return false;
 }
     }
     return false;
 }