Remove temporary files created by wxFileName unit test case.

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

diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp
index 04acf5caf43f6a83b97fae5d2611ebd97c4af206..8ca19064871e83053ce4ed4b8794a71a36acce93 100644 (file)
--- a/src/osx/artmac.cpp
+++ b/src/osx/artmac.cpp
@@ -25,7 +25,7 @@
     #include "wx/image.h"
 #endif
 
     #include "wx/image.h"
 #endif
 

-#if wxOSX_USE_COCOA_OR_CARBON
+#include "wx/osx/private.h"

 
 // ----------------------------------------------------------------------------
 // wxMacArtProvider
 
 // ----------------------------------------------------------------------------
 // wxMacArtProvider


@@ -34,15 +34,27 @@
 class wxMacArtProvider : public wxArtProvider
 {
 protected:
 class wxMacArtProvider : public wxArtProvider
 {
 protected:

+#if wxOSX_USE_COCOA_OR_CARBON

     virtual wxIconBundle CreateIconBundle(const wxArtID& id,
                                           const wxArtClient& client);
     virtual wxIconBundle CreateIconBundle(const wxArtID& id,
                                           const wxArtClient& client);

+#endif
+#if wxOSX_USE_COCOA_OR_IPHONE
+    virtual wxBitmap CreateBitmap(const wxArtID& id,
+                                  const wxArtClient& client,
+                                  const wxSize& size)
+    {
+        return wxOSXCreateSystemBitmap(id, client, size);
+    }
+#endif

 };
 
 /* static */ void wxArtProvider::InitNativeProvider()
 {
 };
 
 /* static */ void wxArtProvider::InitNativeProvider()
 {

-    wxArtProvider::Push(new wxMacArtProvider);
+    PushBack(new wxMacArtProvider);

 }
 
 }
 

+#if wxOSX_USE_COCOA_OR_CARBON
+

 // ----------------------------------------------------------------------------
 // helper macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // helper macros
 // ----------------------------------------------------------------------------


@@ -103,6 +115,7 @@ wxIconBundle wxMacArtProvider::CreateIconBundle(const wxArtID& id, const wxArtCl
     return wxMacArtProvider_CreateIconBundle(id);
 }
 
     return wxMacArtProvider_CreateIconBundle(id);
 }
 

+#endif

 
 // ----------------------------------------------------------------------------
 // wxArtProvider::GetNativeSizeHint()
 
 // ----------------------------------------------------------------------------
 // wxArtProvider::GetNativeSizeHint()


@@ -129,4 +142,3 @@ wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client)
     return wxDefaultSize;
 }
 
     return wxDefaultSize;
 }
 

-#endif // wxOSX_USE_COCOA_CARBON