X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b941f2d3143c1205fc7c5b01bd254781db728b3..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/imagbmp.h diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h index 42e0c2ce42..1bcebe1d18 100644 --- a/include/wx/imagbmp.h +++ b/include/wx/imagbmp.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagbmp.h -// Purpose: wxImage BMP, ICO and CUR handlers +// Name: wx/imagbmp.h +// Purpose: wxImage BMP, ICO, CUR and ANI handlers // Author: Robert Roebling, Chris Elliott // RCS-ID: $Id$ // Copyright: (c) Robert Roebling, Chris Elliott @@ -10,10 +10,6 @@ #ifndef _WX_IMAGBMP_H_ #define _WX_IMAGBMP_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "imagbmp.h" -#endif - #include "wx/image.h" // defines for saving the BMP file in different formats, Bits Per Pixel @@ -25,13 +21,6 @@ #define wxIMAGE_OPTION_CUR_HOTSPOT_X wxT("HotSpotX") #define wxIMAGE_OPTION_CUR_HOTSPOT_Y wxT("HotSpotY") -#if WXWIN_COMPATIBILITY_2_4 - // Do not use these macros, they are deprecated - #define wxBMP_FORMAT wxIMAGE_OPTION_BMP_FORMAT - #define wxCUR_HOTSPOT_X wxIMAGE_OPTION_CUR_HOTSPOT_X - #define wxCUR_HOTSPOT_Y wxIMAGE_OPTION_CUR_HOTSPOT_Y -#endif - enum { @@ -51,7 +40,7 @@ enum // wxBMPHandler // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBMPHandler : public wxImageHandler +class WXDLLIMPEXP_CORE wxBMPHandler : public wxImageHandler { public: wxBMPHandler() @@ -60,14 +49,14 @@ public: m_extension = _T("bmp"); m_type = wxBITMAP_TYPE_BMP; m_mime = _T("image/x-bmp"); - }; + } #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, @@ -85,7 +74,7 @@ private: // wxICOHandler // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxICOHandler : public wxBMPHandler +class WXDLLIMPEXP_CORE wxICOHandler : public wxBMPHandler { public: wxICOHandler() @@ -94,14 +83,15 @@ public: m_extension = _T("ico"); m_type = wxBITMAP_TYPE_ICO; m_mime = _T("image/x-ico"); - }; + } #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 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: @@ -113,7 +103,7 @@ private: // wxCURHandler // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCURHandler : public wxICOHandler +class WXDLLIMPEXP_CORE wxCURHandler : public wxICOHandler { public: wxCURHandler() @@ -122,12 +112,13 @@ public: m_extension = _T("cur"); m_type = wxBITMAP_TYPE_CUR; m_mime = _T("image/x-cur"); - }; + } // VS: This handler's meat is implemented inside wxICOHandler (the two // 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 @@ -139,7 +130,7 @@ private: // wxANIHandler // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxANIHandler : public wxCURHandler +class WXDLLIMPEXP_CORE wxANIHandler : public wxCURHandler { public: wxANIHandler() @@ -148,14 +139,15 @@ public: m_extension = _T("ani"); m_type = wxBITMAP_TYPE_ANI; m_mime = _T("image/x-ani"); - }; + } #if wxUSE_STREAMS - virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ){return false ;}; + 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: