making method properly const

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

diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp
index a68ca813464b2fc5ae61815472560421a0439503..f5e459009d45b138bd43e091690e09a2369ee00b 100644 (file)
--- a/src/osx/artmac.cpp
+++ b/src/osx/artmac.cpp
@@ -19,14 +19,13 @@
     #pragma hdrstop
 #endif
 
+#include "wx/artprov.h"
+
 #ifndef WX_PRECOMP
     #include "wx/image.h"
 #endif
 
-#if !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
-
-#include "wx/artprov.h"
-#include "wx/image.h"
+#if wxOSX_USE_COCOA_OR_CARBON
 
 // ----------------------------------------------------------------------------
 // wxMacArtProvider
@@ -74,6 +73,20 @@ static wxIconBundle wxMacArtProvider_CreateIconBundle(const wxArtID& id)
     ART_MSGBOX(wxART_FOLDER_OPEN, wxICON_FOLDER_OPEN, folder_open)
     ART_MSGBOX(wxART_NORMAL_FILE, wxICON_NORMAL_FILE, deffile)
 
+    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;
 }
 
@@ -109,6 +122,22 @@ wxBitmap wxMacArtProvider::CreateBitmap(const wxArtID& id,
     return wxNullBitmap;
 }
 
-#endif // !defined(__WXUNIVERSAL__)
 
+// ----------------------------------------------------------------------------
+// wxArtProvider::GetNativeSizeHint()
+// ----------------------------------------------------------------------------
+
+/*static*/
+wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client)
+{
+    if ( client == wxART_TOOLBAR )
+    {
+        // See http://developer.apple.com/documentation/UserExperience/Conceptual/AppleHIGuidelines/XHIGIcons/chapter_15_section_9.html:
+        // "32 x 32 pixels is the recommended size"
+        return wxSize(32, 32);
+    }
+
+    return wxDefaultSize;
+}
 
+#endif // wxOSX_USE_COCOA_CARBON