made wxList methods return compatibility_iterator instead of Node * to further reduce...

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 4657066f9952b0232c05ea8401945b19bfb61009..2e8a1df31c826bb25ec9e3c0e6cd249d3f0a3b59 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -13,10 +13,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "artprov.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -42,7 +38,7 @@
 
 #include "wx/listimpl.cpp"
 WX_DECLARE_LIST(wxArtProvider, wxArtProvidersList);
 
 #include "wx/listimpl.cpp"
 WX_DECLARE_LIST(wxArtProvider, wxArtProvidersList);

-WX_DEFINE_LIST(wxArtProvidersList);
+WX_DEFINE_LIST(wxArtProvidersList)

 
 // ----------------------------------------------------------------------------
 // Cache class - stores already requested bitmaps
 
 // ----------------------------------------------------------------------------
 // Cache class - stores already requested bitmaps


@@ -169,7 +165,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )
             {
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )
             {

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

                 if ( size != wxDefaultSize &&
                      (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
                 {
                 if ( size != wxDefaultSize &&
                      (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
                 {


@@ -204,7 +200,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
 }
 
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
 }
 
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)

-    #include <gtk/gtk.h>
+    #include "wx/gtk/private.h"

     extern GtkIconSize wxArtClientToIconSize(const wxArtClient& client);
 #endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
 
     extern GtkIconSize wxArtClientToIconSize(const wxArtClient& client);
 #endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)