Workaround for bug in gcc-3.1 through gcc-3.3 in handling deprecation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index e7db074bad1bcd5c14ad390883a9632a65c8b09c..75aa51c653a53131bf3e11159644b90d06dd3766 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -79,8 +79,9 @@ public:
             AddIcon(file, (wxBitmapType)type);
         }
     )
-
-    wxDEPRECATED( wxIconBundle(const wxString& file, long type)
+    // explicitly specifying inline allows gcc < 3.4 to
+    // handle the deprecation attribute even in the constructor.
+    wxDEPRECATED( inline wxIconBundle (const wxString& file, long type)
         {
             AddIcon(file, (wxBitmapType)type);
         }

diff --git a/include/wx/image.h b/include/wx/image.h
index 3a6b0fdee15d20dd6878cb033356c91574f9482a..40b17b20e16e8f879882200b3f117c7ace8171f1 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -440,8 +440,10 @@ public:
     static RGBValue HSVtoRGB(const HSVValue& hsv);
 
 #if WXWIN_COMPATIBILITY_2_8
+    // explicitly specifying inline allows gcc < 3.4 to
+    // handle the deprecation attribute even in the constructor.
     wxDEPRECATED(
-        wxImage(const wxString& name, long type, int index = -1)
+        inline wxImage(const wxString& name, long type, int index = -1)
         {
             LoadFile(name, (wxBitmapType)type, index);
         }
@@ -449,7 +451,7 @@ public:
 
 #if wxUSE_STREAMS
     wxDEPRECATED(
-        wxImage(wxInputStream& stream, long type, int index = -1)
+        inline wxImage(wxInputStream& stream, long type, int index = -1)
         {
             LoadFile(stream, (wxBitmapType)type, index);
         }