X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/910e9b3be4d63ae8901dad154af1b6b6bdf5e56b..8b7b1a57483e51e325017dcbf35f75b578ae775c:/src/osx/carbon/icon.cpp diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp index 704608f33e..a28dc19090 100644 --- 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 ;