diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index f01293ca75..29a00000b5 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -84,6 +84,20 @@ public: // check if we have any icons at all bool IsEmpty() const { return GetIconCount() == 0; } +#ifdef WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED( void AddIcon(const wxString& file, long type) + { + AddIcon(file, (long)type); + } + ) + + wxDEPRECATED( wxIconBundle(const wxString& file, long type) + { + AddIcon(file, (wxBitmapType)type); + } + ) +#endif // WXWIN_COMPATIBILITY_2_8 + protected: virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; diff --git a/include/wx/image.h b/include/wx/image.h index 11e835c312..a813e88840 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -112,6 +112,12 @@ public: wxBitmapType GetType() const { return m_type; } const wxString& GetMimeType() const { return m_mime; } +#ifdef WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED( + void SetType(long type) { SetType((wxBitmapType)type); } + ) +#endif // WXWIN_COMPATIBILITY_2_8 + protected: #if wxUSE_STREAMS virtual bool DoCanRead( wxInputStream& stream ) = 0; @@ -429,6 +435,36 @@ public: static RGBValue HSVtoRGB(const HSVValue& hsv); #ifdef WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED( + wxImage(const wxString& name, long type, int index = -1) + { + LoadFile(name, (wxBitmapType)type, index); + } + ) + +#if wxUSE_STREAMS + wxDEPRECATED( + wxImage(wxInputStream& stream, long type, int index = -1) + { + LoadFile(stream, (wxBitmapType)type, index); + } + ) + + wxDEPRECATED( + bool LoadFile(wxInputStream& stream, long type, int index = -1) + { + return LoadFile(stream, (wxBitmapType)type, index); + } + ) + + wxDEPRECATED( + bool SaveFile(wxOutputStream& stream, long type) const + { + return SaveFile(stream, (wxBitmapType)type); + } + ) +#endif // wxUSE_STREAMS + wxDEPRECATED( bool LoadFile(const wxString& name, long type, int index = -1) { @@ -436,6 +472,20 @@ public: } ) + wxDEPRECATED( + bool SaveFile(const wxString& name, long type) const + { + return SaveFile(name, (wxBitmapType)type); + } + ) + + wxDEPRECATED( + static wxImageHandler *FindHandler(const wxString& ext, long type) + { + return FindHandler(ext, (wxBitmapType)type); + } + ) + wxDEPRECATED( static wxImageHandler *FindHandler(long imageType) { diff --git a/include/wx/position.h b/include/wx/position.h index 50d3987669..7b7cdbf38e 100644 --- a/include/wx/position.h +++ b/include/wx/position.h @@ -13,7 +13,7 @@ #include "wx/gdicmn.h" -class wxPosition +class WXDLLIMPEXP_CORE wxPosition { public: wxPosition() : m_row(0), m_column(0) {}