Removed wxFont::Set/GetNoAntiAliasing() implementations.

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

diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp
index af4c06aa0a786bc7b9f06eb9670c10ae0607883e..37c815e24d3e0d6047e63822b10194f88af0766b 100644 (file)
--- a/src/osx/carbon/icon.cpp
+++ b/src/osx/carbon/icon.cpp
@@ -203,6 +203,10 @@ bool wxIcon::LoadFile(
         {
             theId = kGenericDocumentIcon ;
         }
         {
             theId = kGenericDocumentIcon ;
         }

+        else if ( filename == wxT("wxICON_EXECUTABLE_FILE") )
+        {
+            theId = kGenericApplicationIcon ;
+        }

         else if ( filename == wxT("wxICON_CDROM") )
         {
             theId = kGenericCDROMIcon ;
         else if ( filename == wxT("wxICON_CDROM") )
         {
             theId = kGenericCDROMIcon ;


@@ -330,7 +334,7 @@ bool wxIcon::LoadFile(
 #endif
         }
     }
 #endif
         }
     }

-    return true ;
+    return false;

 }
 
 void wxIcon::CopyFromBitmap( const wxBitmap& bmp )
 }
 
 void wxIcon::CopyFromBitmap( const wxBitmap& bmp )


@@ -349,9 +353,11 @@ bool  wxICONResourceHandler::LoadFile(
     int desiredWidth, int desiredHeight )
 {
     wxIcon icon ;
     int desiredWidth, int desiredHeight )
 {
     wxIcon icon ;

-    icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) ;
-    bitmap->CopyFromIcon( icon ) ;
-
-    return bitmap->Ok() ;
+    if ( icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) )
+    {
+        bitmap->CopyFromIcon( icon ) ;
+        return bitmap->Ok() ;
+    }
+    return false;

 }
 
 }