Test whether GTK+ is 2.18 or newer in configure.

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

diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp
index 44691cd6e61cfef849443c6b3b23577673ee684e..04acf5caf43f6a83b97fae5d2611ebd97c4af206 100644 (file)
--- a/src/osx/artmac.cpp
+++ b/src/osx/artmac.cpp
@@ -34,8 +34,6 @@
 class wxMacArtProvider : public wxArtProvider
 {
 protected:
-    virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
-                                  const wxSize& size);
     virtual wxIconBundle CreateIconBundle(const wxArtID& id,
                                           const wxArtClient& client);
 };
@@ -51,7 +49,7 @@ protected:
 
 #define CREATE_STD_ICON(iconId, xpmRc) \
     { \
-        wxIconBundle icon(_T(iconId), wxBITMAP_TYPE_ICON_RESOURCE); \
+        wxIconBundle icon(wxT(iconId), wxBITMAP_TYPE_ICON_RESOURCE); \
         return icon; \
     }
 
@@ -72,24 +70,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)
 
-    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_FOLDER, wxICON_HELP_FOLDER, htmfoldr) 
-    ART_MSGBOX(wxART_HELP_PAGE,   wxICON_HELP_PAGE,   htmpage) 
-        
-    ART_MSGBOX(wxART_PRINT,       wxICON_PRINT,       print) 
-       
     return wxNullIconBundle;
 }
 
@@ -107,24 +103,6 @@ wxIconBundle wxMacArtProvider::CreateIconBundle(const wxArtID& id, const wxArtCl
     return wxMacArtProvider_CreateIconBundle(id);
 }
 
-// ----------------------------------------------------------------------------
-// CreateBitmap
-// ----------------------------------------------------------------------------
-
-wxBitmap wxMacArtProvider::CreateBitmap(const wxArtID& id,
-                                        const wxArtClient& client,
-                                        const wxSize& reqSize)
-{
-    wxIconBundle ic(CreateIconBundle(id, client));
-    if (ic.IsOk())
-    {
-        wxIcon theIcon(ic.GetIcon(reqSize));
-        return wxBitmap(theIcon);
-    }
-
-    return wxNullBitmap;
-}
-
 
 // ----------------------------------------------------------------------------
 // wxArtProvider::GetNativeSizeHint()
@@ -139,6 +117,14 @@ wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client)
         // "32 x 32 pixels is the recommended size"
         return wxSize(32, 32);
     }
+    else if ( client == wxART_BUTTON || client == wxART_MENU )
+    {
+        // Mac UI doesn't use any images in neither buttons nor menus in
+        // general but the code using wxArtProvider can use wxART_BUTTON to
+        // find the icons of a roughly appropriate size for the buttons and
+        // 16x16 seems to be the best choice for this kind of use
+        return wxSize(16, 16);
+    }
 
     return wxDefaultSize;
 }