VC6 compilation fix for native wxProgressDialog implementation.

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

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index c4e34e7912f550e06eba21f19d72e1563dde822d..716189ecfb4a7cab5db3d4733cd44485b7ba3144 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -117,6 +117,7 @@ protected:
 #include "../../art/new.xpm"
 #include "../../art/undo.xpm"
 #include "../../art/redo.xpm"
 #include "../../art/new.xpm"
 #include "../../art/undo.xpm"
 #include "../../art/redo.xpm"

+#include "../../art/close.xpm"

 #include "../../art/quit.xpm"
 #include "../../art/find.xpm"
 #include "../../art/findrepl.xpm"
 #include "../../art/quit.xpm"
 #include "../../art/find.xpm"
 #include "../../art/findrepl.xpm"


@@ -175,6 +176,7 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
     ART(wxART_DELETE,                              delete)
     ART(wxART_UNDO,                                undo)
     ART(wxART_REDO,                                redo)
     ART(wxART_DELETE,                              delete)
     ART(wxART_UNDO,                                undo)
     ART(wxART_REDO,                                redo)

+    ART(wxART_CLOSE,                               close)

     ART(wxART_QUIT,                                quit)
     ART(wxART_FIND,                                find)
     ART(wxART_FIND_AND_REPLACE,                    findrepl)
     ART(wxART_QUIT,                                quit)
     ART(wxART_FIND,                                find)
     ART(wxART_FIND_AND_REPLACE,                    findrepl)


@@ -209,7 +211,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
 
                 if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
                 {
 
                 if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
                 {

-                    // the caller wants default size, which is larger than 
+                    // the caller wants default size, which is larger than

                     // the image we have; to avoid degrading it visually by
                     // scaling it up, paste it into transparent image instead:
                     wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);
                     // the image we have; to avoid degrading it visually by
                     // scaling it up, paste it into transparent image instead:
                     wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);