Hardware defines spec.

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

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index 9a8e4f53eb476bf2ff70d0087c800df65e31b2d8..613b901d7e0a6f2ce289c53baee3af6ff89be730 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -27,10 +27,6 @@
 #endif
 
 #include "wx/artprov.h"
 #endif
 
 #include "wx/artprov.h"

-#include "wx/module.h"
-
-// For the purposes of forcing this module to link
-char g_ArtProviderModule = 0;

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


@@ -51,23 +47,6 @@ protected:
 #define ART(artId, xpmRc) \
     if ( id == artId ) return wxBitmap(xpmRc##_xpm);
 
 #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__)
 // There are two ways of getting the standard icon: either via XPMs or via
 // wxIcon ctor. This depends on the platform:
 #if defined(__WXUNIVERSAL__)


@@ -88,28 +67,23 @@ protected:
 #define ART_MSGBOX(artId, iconId, xpmRc) \
     if ( id == artId ) \
     { \
 #define ART_MSGBOX(artId, iconId, xpmRc) \
     if ( id == artId ) \
     { \

-        GET_STD_ICON_FROM_APP(iconId) \

         CREATE_STD_ICON(#iconId, xpmRc) \
     }
 
 // ----------------------------------------------------------------------------
         CREATE_STD_ICON(#iconId, xpmRc) \
     }
 
 // ----------------------------------------------------------------------------

-// wxDefaultArtProviderModule
+// wxArtProvider::InitStdProvider

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class wxDefaultArtProviderModule: public wxModule
+/*static*/ void wxArtProvider::InitStdProvider()

 {
 {

-public:
-    bool OnInit() 
-    {
-        wxArtProvider::PushProvider(new wxDefaultArtProvider);
-        return TRUE; 
-    }
-    void OnExit() {}
-
-    DECLARE_DYNAMIC_CLASS(wxDefaultArtProviderModule)
-};
+    wxArtProvider::PushProvider(new wxDefaultArtProvider);
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
+#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
+/*static*/ void wxArtProvider::InitNativeProvider()
+{
+}
+#endif

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -139,6 +113,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
     #include "../../art/htmpage.xpm"
 #endif // wxUSE_HTML
 
     #include "../../art/htmpage.xpm"
 #endif // wxUSE_HTML
 

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

 #include "../../art/addbookm.xpm"
 #include "../../art/delbookm.xpm"
 #include "../../art/back.xpm"
 #include "../../art/addbookm.xpm"
 #include "../../art/delbookm.xpm"
 #include "../../art/back.xpm"


@@ -168,7 +143,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
 // ----------------------------------------------------------------------------
 
 wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
 // ----------------------------------------------------------------------------
 
 wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,

-                                            const wxArtClient& client,
+                                            const wxArtClient& WXUNUSED(client),

                                             const wxSize& WXUNUSED(size))
 {
     // wxMessageBox icons:
                                             const wxSize& WXUNUSED(size))
 {
     // wxMessageBox icons:


@@ -185,6 +160,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
     ART(wxART_HELP_FOLDER,                         htmfoldr)
     ART(wxART_HELP_PAGE,                           htmpage)
 #endif // wxUSE_HTML
     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)
     ART(wxART_ADD_BOOKMARK,                        addbookm)
     ART(wxART_DEL_BOOKMARK,                        delbookm)
     ART(wxART_GO_BACK,                             back)