Implement wxRendererMac::DrawItemSelectionRect and move the generic wxTreeCtrl to...

[wxWidgets.git] / src / common / artstd.cpp

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index fbd908ecab3f7d997283bd70ad1ac51062a6e439..c3e4fe994b110ace2d9cd26c0727d4a4a7e7bbc8 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        artstd.cpp
+// Name:        src/common/artstd.cpp

 // Purpose:     stock wxArtProvider instance with default wxWin art
 // Author:      Vaclav Slavik
 // Modified by:
 // Purpose:     stock wxArtProvider instance with default wxWin art
 // Author:      Vaclav Slavik
 // Modified by:


@@ -21,13 +21,10 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #if WXWIN_COMPATIBILITY_2_2
-        #include "wx/app.h"
-    #endif
+    #include "wx/image.h"

 #endif
 
 #include "wx/artprov.h"
 #endif
 
 #include "wx/artprov.h"

-#include "wx/image.h"

 
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider
 
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider


@@ -77,7 +74,7 @@ protected:
 
 /*static*/ void wxArtProvider::InitStdProvider()
 {
 
 /*static*/ void wxArtProvider::InitStdProvider()
 {

-    wxArtProvider::PushProvider(new wxDefaultArtProvider);
+    wxArtProvider::Push(new wxDefaultArtProvider);

 }
 
 #if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
 }
 
 #if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)


@@ -229,7 +226,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
 {
     wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id);
 
 {
     wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id);
 

-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)

     if (bmp.Ok())
     {
         // fit into transparent image with desired size hint from the client
     if (bmp.Ok())
     {
         // fit into transparent image with desired size hint from the client