Include wx/stream.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index 0d9dfd3546fa248360a2deac55d3a3c89b0ff304..35f10467b9182d37502393e2fe3f7ca807337593 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -20,12 +20,6 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #if WXWIN_COMPATIBILITY_2_2
-        #include "wx/app.h"
-    #endif
-#endif
-
 #include "wx/artprov.h"
 #include "wx/image.h"
 
@@ -147,7 +141,8 @@ protected:
 #include "../../art/copy.xpm"
 #include "../../art/cut.xpm"
 #include "../../art/paste.xpm"
-#include "../../art/delete_.xpm"
+#include "../../art/delete.xpm"
+#include "../../art/new.xpm"
 #include "../../art/undo.xpm"
 #include "../../art/redo.xpm"
 #include "../../art/quit.xpm"
@@ -201,18 +196,20 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
     ART(wxART_TICK_MARK,                           tick)
     ART(wxART_CROSS_MARK,                          cross)
 
-    ART(wxART_FILE_SAVE,                           filesave)  
-    ART(wxART_FILE_SAVE_AS,                        filesaveas)        
+    ART(wxART_FILE_SAVE,                           filesave)
+    ART(wxART_FILE_SAVE_AS,                        filesaveas)
     ART(wxART_COPY,                                copy)
     ART(wxART_CUT,                                 cut)
     ART(wxART_PASTE,                               paste)
-    ART(wxART_DELETE,                              delete_)
+    ART(wxART_DELETE,                              delete)
     ART(wxART_UNDO,                                undo)
     ART(wxART_REDO,                                redo)
     ART(wxART_QUIT,                                quit)
     ART(wxART_FIND,                                find)
     ART(wxART_FIND_AND_REPLACE,                    findrepl)
-        
+    ART(wxART_NEW,                                 new)
+
+
     return wxNullBitmap;
 }
 
@@ -226,7 +223,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& 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
@@ -249,6 +246,9 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
             }
         }
     }
+#else
+    wxUnusedVar(client);
+    wxUnusedVar(reqSize);
 #endif // wxUSE_IMAGE
 
     return bmp;