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 f5e459009d45b138bd43e091690e09a2369ee00b..8320c6f6a2e247e03a9dcafc3b1a5d5c191239f5 100644 (file)
--- a/src/osx/artmac.cpp
+++ b/src/osx/artmac.cpp
@@ -34,8 +34,6 @@
 class wxMacArtProvider : public wxArtProvider
 {
 protected:
 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);
 };
     virtual wxIconBundle CreateIconBundle(const wxArtID& id,
                                           const wxArtClient& client);
 };


@@ -51,7 +49,7 @@ protected:
 
 #define CREATE_STD_ICON(iconId, xpmRc) \
     { \
 
 #define CREATE_STD_ICON(iconId, xpmRc) \
     { \

-        wxIconBundle icon(_T(iconId), wxBITMAP_TYPE_ICON_RESOURCE); \
+        wxIconBundle icon(wxT(iconId), wxBITMAP_TYPE_ICON_RESOURCE); \

         return icon; \
     }
 
         return icon; \
     }
 


@@ -72,6 +70,7 @@ 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_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_CDROM,       wxICON_CDROM,       cdrom) 
     ART_MSGBOX(wxART_FLOPPY,      wxICON_FLOPPY,      floppy) 


@@ -104,24 +103,6 @@ wxIconBundle wxMacArtProvider::CreateIconBundle(const wxArtID& id, const wxArtCl
     return wxMacArtProvider_CreateIconBundle(id);
 }
 
     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()
 
 // ----------------------------------------------------------------------------
 // wxArtProvider::GetNativeSizeHint()