Split utility functions into base (in utilsexc_base.cpp) and gui (src/osx/carbon...

[wxWidgets.git] / include / wx / image.h

diff --git a/include/wx/image.h b/include/wx/image.h
index a813e888409145a7d156e1203ca1932cb359aabf..40b17b20e16e8f879882200b3f117c7ace8171f1 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -112,7 +112,7 @@ public:
     wxBitmapType GetType() const { return m_type; }
     const wxString& GetMimeType() const { return m_mime; }
 
-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED(
         void SetType(long type) { SetType((wxBitmapType)type); }
     )
@@ -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;
@@ -434,9 +439,11 @@ public:
     static HSVValue RGBtoHSV(const RGBValue& rgb);
     static RGBValue HSVtoRGB(const HSVValue& hsv);
 
-#ifdef WXWIN_COMPATIBILITY_2_8
+#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);
         }