added ability to set tool alignment (#10174)

[wxWidgets.git] / src / osx / artmac.cpp

diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp
index 37a2f3e2027a5cbd9705c355ef8ca70b78c8b113..2777353262ee41502b361445e30cb390aefbdd63 100644 (file)
--- a/src/osx/artmac.cpp
+++ b/src/osx/artmac.cpp
@@ -25,7 +25,7 @@
     #include "wx/image.h"
 #endif
 
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON
 
 // ----------------------------------------------------------------------------
 // wxMacArtProvider
@@ -72,7 +72,22 @@ static wxIconBundle wxMacArtProvider_CreateIconBundle(const wxArtID& id)
     ART_MSGBOX(wxART_FOLDER,      wxICON_FOLDER,      folder)
     ART_MSGBOX(wxART_FOLDER_OPEN, wxICON_FOLDER_OPEN, folder_open)
     ART_MSGBOX(wxART_NORMAL_FILE, wxICON_NORMAL_FILE, deffile)
-
+    ART_MSGBOX(wxART_EXECUTABLE_FILE, wxICON_EXECUTABLE_FILE, exefile)
+
+    ART_MSGBOX(wxART_CDROM,       wxICON_CDROM,       cdrom) 
+    ART_MSGBOX(wxART_FLOPPY,      wxICON_FLOPPY,      floppy) 
+    ART_MSGBOX(wxART_HARDDISK,    wxICON_HARDDISK,    harddisk) 
+    ART_MSGBOX(wxART_REMOVABLE,   wxICON_REMOVABLE,   removable) 
+ 
+    ART_MSGBOX(wxART_DELETE,      wxICON_DELETE,      delete) 
+ 
+    ART_MSGBOX(wxART_GO_BACK,     wxICON_GO_BACK,     back) 
+    ART_MSGBOX(wxART_GO_FORWARD,  wxICON_GO_FORWARD,  forward) 
+    ART_MSGBOX(wxART_GO_HOME,     wxICON_GO_HOME,     home) 
+
+    ART_MSGBOX(wxART_HELP_SETTINGS, wxICON_HELP_SETTINGS, htmoptns) 
+    ART_MSGBOX(wxART_HELP_PAGE,   wxICON_HELP_PAGE,   htmpage) 
+       
     return wxNullIconBundle;
 }
 
@@ -126,4 +141,4 @@ wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client)
     return wxDefaultSize;
 }
 
-#endif // wxOSX_USE_CARBON
+#endif // wxOSX_USE_COCOA_CARBON