X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..f4bb632cde9cc60fa89f173f0d33c5881794cc68:/src/common/artstd.cpp

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index 31b4355928..23bbfb7053 100644
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -28,9 +28,6 @@
 
 #include "wx/artprov.h"
 
-// For the purposes of forcing this module to link
-char g_ArtProviderModule = 0;
-
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider
 // ----------------------------------------------------------------------------
@@ -50,23 +47,6 @@ protected:
 #define ART(artId, xpmRc) \
     if ( id == artId ) return wxBitmap(xpmRc##_xpm);
 
-// Compatibility hack to use wxApp::GetStdIcon of overriden by the user
-#if WXWIN_COMPATIBILITY_2_2
-    #define GET_STD_ICON_FROM_APP(iconId) \
-        if ( client == wxART_MESSAGE_BOX ) \
-        { \
-            wxIcon icon = wxTheApp->GetStdIcon(iconId); \
-            if ( icon.Ok() ) \
-            { \
-                wxBitmap bmp; \
-                bmp.CopyFromIcon(icon); \
-                return bmp; \
-            } \
-        }
-#else
-    #define GET_STD_ICON_FROM_APP(iconId)
-#endif
-
 // There are two ways of getting the standard icon: either via XPMs or via
 // wxIcon ctor. This depends on the platform:
 #if defined(__WXUNIVERSAL__)
@@ -87,7 +67,6 @@ protected:
 #define ART_MSGBOX(artId, iconId, xpmRc) \
     if ( id == artId ) \
     { \
-        GET_STD_ICON_FROM_APP(iconId) \
         CREATE_STD_ICON(#iconId, xpmRc) \
     }
 
@@ -97,16 +76,15 @@ protected:
 
 /*static*/ void wxArtProvider::InitStdProvider()
 {
-    // NB: A few notes about this function:
-    //     (1) it is in artstd.cpp and not in artprov.cpp on purpose. I wanted
-    //         to avoid declaring wxDefaultArtProvider in any public header as
-    //         it is only an implementation detail
-    //     (2) other default art providers (e.g. GTK one) should NOT be added
-    //         here. Instead, add them in port-specific initialialization code
-
     wxArtProvider::PushProvider(new wxDefaultArtProvider);
 }
 
+#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
+/*static*/ void wxArtProvider::InitNativeProvider()
+{
+}
+#endif
+
 
 // ----------------------------------------------------------------------------
 // XPMs with the art
@@ -135,6 +113,7 @@ protected:
     #include "../../art/htmpage.xpm"
 #endif // wxUSE_HTML
 
+#include "../../art/missimg.xpm"
 #include "../../art/addbookm.xpm"
 #include "../../art/delbookm.xpm"
 #include "../../art/back.xpm"
@@ -150,7 +129,12 @@ protected:
 #include "../../art/repview.xpm"
 #include "../../art/listview.xpm"
 #include "../../art/new_dir.xpm"
+#include "../../art/harddisk.xpm"
+#include "../../art/cdrom.xpm"
+#include "../../art/floppy.xpm"
+#include "../../art/removable.xpm"
 #include "../../art/folder.xpm"
+#include "../../art/folder_open.xpm"
 #include "../../art/dir_up.xpm"
 #include "../../art/exefile.xpm"
 #include "../../art/deffile.xpm"
@@ -164,7 +148,7 @@ protected:
 // ----------------------------------------------------------------------------
 
 wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
-                                            const wxArtClient& client,
+                                            const wxArtClient& WXUNUSED(client),
                                             const wxSize& WXUNUSED(size))
 {
     // wxMessageBox icons:
@@ -181,6 +165,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
     ART(wxART_HELP_FOLDER,                         htmfoldr)
     ART(wxART_HELP_PAGE,                           htmpage)
 #endif // wxUSE_HTML
+    ART(wxART_MISSING_IMAGE,                       missimg)
     ART(wxART_ADD_BOOKMARK,                        addbookm)
     ART(wxART_DEL_BOOKMARK,                        delbookm)
     ART(wxART_GO_BACK,                             back)
@@ -196,7 +181,12 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
     ART(wxART_REPORT_VIEW,                         repview)
     ART(wxART_LIST_VIEW,                           listview)
     ART(wxART_NEW_DIR,                             new_dir)
+    ART(wxART_HARDDISK,                            harddisk)
+    ART(wxART_FLOPPY,                              floppy)
+    ART(wxART_CDROM,                               cdrom)
+    ART(wxART_REMOVABLE,                           removable)
     ART(wxART_FOLDER,                              folder)
+    ART(wxART_FOLDER_OPEN,                         folder_open)
     ART(wxART_GO_DIR_UP,                           dir_up)
     ART(wxART_EXECUTABLE_FILE,                     exefile)
     ART(wxART_NORMAL_FILE,                         deffile)