X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/574c939ef1c1b835a8bc65c0fe724548fa04ec49..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/imagbmp.h?ds=sidebyside diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h index d687121f67..4e20146d70 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,15 +10,17 @@ #ifndef _WX_IMAGBMP_H_ #define _WX_IMAGBMP_H_ -#ifdef __GNUG__ -#pragma interface "imagbmp.h" -#endif - #include "wx/image.h" // defines for saving the BMP file in different formats, Bits Per Pixel -// USE: wximage.SetOption( wxBMP_FORMAT, wxBMP_xBPP ); -#define wxBMP_FORMAT wxString(_T("wxBMP_FORMAT")) +// USE: wximage.SetOption( wxIMAGE_OPTION_BMP_FORMAT, wxBMP_xBPP ); +#define wxIMAGE_OPTION_BMP_FORMAT wxString(_T("wxBMP_FORMAT")) + +// These two options are filled in upon reading CUR file and can (should) be +// specified when saving a CUR file - they define the hotspot of the cursor: +#define wxIMAGE_OPTION_CUR_HOTSPOT_X wxT("HotSpotX") +#define wxIMAGE_OPTION_CUR_HOTSPOT_Y wxT("HotSpotY") + enum { @@ -47,18 +49,18 @@ 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 ); + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); 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, - int comp, off_t bmpOffset, wxInputStream& stream, + int comp, wxFileOffset bmpOffset, wxInputStream& stream, bool verbose, bool IsBmp, bool hasPalette); bool LoadDib(wxImage *image, wxInputStream& stream, bool verbose, bool IsBmp); #endif // wxUSE_STREAMS @@ -81,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 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: @@ -100,11 +103,6 @@ private: // wxCURHandler // ---------------------------------------------------------------------------- -// These two options are filled in upon reading CUR file and can (should) be -// specified when saving a CUR file - they define the hotspot of the cursor: -#define wxCUR_HOTSPOT_X wxT("HotSpotX") -#define wxCUR_HOTSPOT_Y wxT("HotSpotY") - class WXDLLEXPORT wxCURHandler : public wxICOHandler { public: @@ -114,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 @@ -140,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 LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=-1 ); - virtual bool DoCanRead( wxInputStream& stream ); + 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 int GetImageCount( wxInputStream& stream ); +protected: + virtual bool DoCanRead( wxInputStream& stream ); #endif // wxUSE_STREAMS private: