X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/831b64f32f204d1424e248d100c109974aa4238c..f4ef4722ac03de4c4695a1d464a9cb4a1acb95ea:/include/wx/image.h

diff --git a/include/wx/image.h b/include/wx/image.h
index b2edab0779..40b17b20e1 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -361,6 +361,11 @@ public:
     // Gets the type of image found by LoadFile or specified with SaveFile
     wxBitmapType GetType() const;
 
+    // Set the image type, this is normally only called if the image is being
+    // created from data in the given format but not using LoadFile() (e.g.
+    // wxGIFDecoder uses this)
+    void SetType(wxBitmapType type);
+
     // these functions provide fastest access to wxImage data but should be
     // used carefully as no checks are done
     unsigned char *GetData() const;
@@ -435,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);
         }
@@ -444,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);
         }