X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/574c939ef1c1b835a8bc65c0fe724548fa04ec49..d11e8786ed13b72766eea18cb577cc00f9f08f41:/include/wx/imagbmp.h?ds=sidebyside diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h index d687121f67..42e0c2ce42 100644 --- a/include/wx/imagbmp.h +++ b/include/wx/imagbmp.h @@ -10,15 +10,28 @@ #ifndef _WX_IMAGBMP_H_ #define _WX_IMAGBMP_H_ -#ifdef __GNUG__ +#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 -// 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") + +#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 { @@ -50,15 +63,15 @@ 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 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: 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 @@ -84,8 +97,8 @@ 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 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 ); @@ -100,11 +113,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: @@ -144,8 +152,8 @@ 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 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 ); #endif // wxUSE_STREAMS