From 6cfae2d658f13d41cc6aaa6684573c5fcf9ebc80 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Nov 2015 03:52:15 +0100
Subject: [PATCH] Support wxICON_PRINT and wxICON_HELP_FOLDER in wxOSX art
 provider

Map them to the corresponding built-in constants.

Closes #8778.
---
 src/osx/artmac.cpp      | 2 ++
 src/osx/carbon/icon.cpp | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp
index 481280b63b..8b6b14079c 100644
--- a/src/osx/artmac.cpp
+++ b/src/osx/artmac.cpp
@@ -87,6 +87,7 @@ static wxIconBundle wxMacArtProvider_CreateIconBundle(const wxArtID& id)
     ART_MSGBOX(wxART_FLOPPY,      wxICON_FLOPPY,      floppy)
     ART_MSGBOX(wxART_HARDDISK,    wxICON_HARDDISK,    harddisk)
     ART_MSGBOX(wxART_REMOVABLE,   wxICON_REMOVABLE,   removable)
+    ART_MSGBOX(wxART_PRINT,       wxICON_PRINT,       print)
 
     ART_MSGBOX(wxART_DELETE,      wxICON_DELETE,      delete)
 
@@ -96,6 +97,7 @@ static wxIconBundle wxMacArtProvider_CreateIconBundle(const wxArtID& id)
 
     ART_MSGBOX(wxART_HELP_SETTINGS, wxICON_HELP_SETTINGS, htmoptns)
     ART_MSGBOX(wxART_HELP_PAGE,   wxICON_HELP_PAGE,   htmpage)
+    ART_MSGBOX(wxART_HELP_FOLDER,   wxICON_HELP_FOLDER,   htmlfoldr)
 
     return wxNullIconBundle;
 }
diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp
index 1137e89e96..d441c432cb 100644
--- a/src/osx/carbon/icon.cpp
+++ b/src/osx/carbon/icon.cpp
@@ -316,6 +316,14 @@ bool wxIcon::LoadIconFromSystemResource(const wxString& resourceName, int desire
     {
         theId = kGenericDocumentIcon ;
     }
+    else if ( resourceName == wxT( "wxICON_PRINT" ) )
+    {
+        theId = kPrintMonitorFolderIcon;
+    }
+    else if ( resourceName == wxT( "wxICON_HELP_FOLDER" ) )
+    {
+        theId = kHelpFolderIcon;
+    }
 
     if ( theId != 0 )
     {