X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..c5ce3dfb1efd5346682809f3d2702fd9c4edd52d:/include/wx/imagbmp.h diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h index 581dbb55c0..d452670793 100644 --- a/include/wx/imagbmp.h +++ b/include/wx/imagbmp.h @@ -61,9 +61,9 @@ public: #if wxUSE_STREAMS virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); - virtual bool DoCanRead( wxInputStream& stream ); protected: + virtual bool DoCanRead( wxInputStream& stream ); bool SaveDib(wxImage *image, wxOutputStream& stream, bool verbose, bool IsBmp, bool IsMask); bool DoLoadDib(wxImage *image, int width, int height, int bpp, int ncolors, @@ -96,8 +96,9 @@ public: virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); virtual bool DoLoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index ); - virtual bool DoCanRead( wxInputStream& stream ); virtual int GetImageCount( wxInputStream& stream ); +protected: + virtual bool DoCanRead( wxInputStream& stream ); #endif // wxUSE_STREAMS private: @@ -124,6 +125,7 @@ public: // formats are almost identical), but we hide this fact at // the API level, since it is a mere implementation detail. +protected: #if wxUSE_STREAMS virtual bool DoCanRead( wxInputStream& stream ); #endif // wxUSE_STREAMS @@ -150,8 +152,9 @@ public: #if wxUSE_STREAMS virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ){return false ;}; virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); - virtual bool DoCanRead( wxInputStream& stream ); virtual int GetImageCount( wxInputStream& stream ); +protected: + virtual bool DoCanRead( wxInputStream& stream ); #endif // wxUSE_STREAMS private: