another 64 bit fix: make SendMsg() return wxIntPtr instead of long too

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 07fe116d72a1d97a3e6b88c3925a1186f9abe384..60aff69ce65c842f756782edbc6253b6f492fd5a 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -352,6 +352,9 @@ public:
     int GetWidth() const;
     int GetHeight() const;
 
     int GetWidth() const;
     int GetHeight() const;
 

+    // Gets the type of image found by LoadFile or specified with SaveFile
+    wxBitmapType GetType() const;
+

     // these functions provide fastest access to wxImage data but should be
     // used carefully as no checks are done
     unsigned char *GetData() const;
     // these functions provide fastest access to wxImage data but should be
     // used carefully as no checks are done
     unsigned char *GetData() const;


@@ -440,6 +443,16 @@ protected:
 private:
     friend class WXDLLIMPEXP_FWD_CORE wxImageHandler;
 
 private:
     friend class WXDLLIMPEXP_FWD_CORE wxImageHandler;
 

+#if wxUSE_STREAMS
+    // read the image from the specified stream updating image type if
+    // successful
+    bool DoLoad(wxImageHandler& handler, wxInputStream& stream, int index);
+
+    // write the image to the specified stream and also update the image type
+    // if successful
+    bool DoSave(wxImageHandler& handler, wxOutputStream& stream) const;
+#endif // wxUSE_STREAMS
+

     DECLARE_DYNAMIC_CLASS(wxImage)
 };
 
     DECLARE_DYNAMIC_CLASS(wxImage)
 };