guaranteeing autorelease pools for overridden OnRun on OSX

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

diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp
index 704608f33ed209b70c0848f2788a04907daa9892..a28dc190908a84e498159de6f998d7085b67f4bf 100644 (file)
--- a/src/osx/carbon/icon.cpp
+++ b/src/osx/carbon/icon.cpp
@@ -203,6 +203,10 @@ bool wxIcon::LoadFile(
         {
             theId = kGenericDocumentIcon ;
         }
+        else if ( filename == wxT("wxICON_EXECUTABLE_FILE") )
+        {
+            theId = kGenericApplicationIcon ;
+        }
         else if ( filename == wxT("wxICON_CDROM") )
         {
             theId = kGenericCDROMIcon ;
@@ -221,7 +225,7 @@ bool wxIcon::LoadFile(
         }
         else if ( filename == wxT("wxICON_DELETE") )
         {
-            theId = kTrashIcon ;
+            theId = kToolbarDeleteIcon ;
         }
         else if ( filename == wxT("wxICON_GO_BACK") )
         {
@@ -233,11 +237,7 @@ bool wxIcon::LoadFile(
         }
         else if ( filename == wxT("wxICON_GO_HOME") )
         {
-            theId = kUserFolderIcon ;
-        }
-        else if ( filename == wxT("wxICON_HELP_FOLDER") )
-        {
-            theId = kHelpFolderIcon ;
+            theId = kToolbarHomeIcon ;
         }
         else if ( filename == wxT("wxICON_HELP_SETTINGS") )
         {
@@ -247,10 +247,6 @@ bool wxIcon::LoadFile(
         {
             theId = kGenericDocumentIcon ;
         }
-        else if ( filename == wxT("wxICON_PRINT") )
-        {
-            theId = kPrintMonitorFolderIcon ;
-        }
         else
         {
             IconRef iconRef = NULL ;