Made wxWindow::HasScrollbar() do what it says.

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

diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp
index 92e7cbee4e516253350ef9bd852a05e9a6f526d3..8320c6f6a2e247e03a9dcafc3b1a5d5c191239f5 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,7 +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) 
+       
     return wxNullIconBundle;
 }
 
@@ -90,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()