From: Stefan Csomor Date: Mon, 23 Mar 2009 17:44:58 +0000 (+0000) Subject: switching a few icons, removing OS9 folder icons X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/62e54750de89cf868a0fff690d75757d03041a24?ds=inline switching a few icons, removing OS9 folder icons git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp index 704608f33e..af4c06aa0a 100644 --- a/src/osx/carbon/icon.cpp +++ b/src/osx/carbon/icon.cpp @@ -221,7 +221,7 @@ bool wxIcon::LoadFile( } else if ( filename == wxT("wxICON_DELETE") ) { - theId = kTrashIcon ; + theId = kToolbarDeleteIcon ; } else if ( filename == wxT("wxICON_GO_BACK") ) { @@ -233,11 +233,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 +243,6 @@ bool wxIcon::LoadFile( { theId = kGenericDocumentIcon ; } - else if ( filename == wxT("wxICON_PRINT") ) - { - theId = kPrintMonitorFolderIcon ; - } else { IconRef iconRef = NULL ;