Changes corresponding to patch #841324 from Ian Brown:

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

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index a2c7b2d2de49adb751c189f1e28e86212b39546c..7e8abec577b01cb1a37da149a48af16016cc0f43 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -50,23 +50,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__)


@@ -87,7 +70,6 @@ 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) \
     }
 


@@ -165,7 +147,7 @@ protected:
 // ----------------------------------------------------------------------------
 
 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: