X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48889bca6f8b2504f78c0f47b32f5e95c64d915d..fef6a2f1a0be4518affee2ffe64c836a8237bae2:/include/wx/image.h diff --git a/include/wx/image.h b/include/wx/image.h index 20fb50f5f6..03c1ea2210 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -28,17 +28,17 @@ // which breaks the compilation below #undef index -#define wxIMAGE_OPTION_QUALITY wxString(_T("quality")) -#define wxIMAGE_OPTION_FILENAME wxString(_T("FileName")) +#define wxIMAGE_OPTION_QUALITY wxString(wxT("quality")) +#define wxIMAGE_OPTION_FILENAME wxString(wxT("FileName")) -#define wxIMAGE_OPTION_RESOLUTION wxString(_T("Resolution")) -#define wxIMAGE_OPTION_RESOLUTIONX wxString(_T("ResolutionX")) -#define wxIMAGE_OPTION_RESOLUTIONY wxString(_T("ResolutionY")) +#define wxIMAGE_OPTION_RESOLUTION wxString(wxT("Resolution")) +#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxT("ResolutionX")) +#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxT("ResolutionY")) -#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(_T("ResolutionUnit")) +#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxT("ResolutionUnit")) -#define wxIMAGE_OPTION_MAX_WIDTH wxString(_T("MaxWidth")) -#define wxIMAGE_OPTION_MAX_HEIGHT wxString(_T("MaxHeight")) +#define wxIMAGE_OPTION_MAX_WIDTH wxString(wxT("MaxWidth")) +#define wxIMAGE_OPTION_MAX_HEIGHT wxString(wxT("MaxHeight")) // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT // @@ -100,10 +100,10 @@ public: #if wxUSE_STREAMS // NOTE: LoadFile and SaveFile are not pure virtuals to allow derived classes // to implement only one of the two - virtual bool LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), + virtual bool LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose)=true, int WXUNUSED(index)=-1 ) { return false; } - virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), + virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose)=true ) { return false; } @@ -135,9 +135,9 @@ protected: #if wxUSE_STREAMS // NOTE: this function is allowed to change the current stream position // since GetImageCount() will take care of restoring it later - virtual int DoGetImageCount( wxInputStream& WXUNUSED(stream) ) + virtual int DoGetImageCount( wxInputStream& WXUNUSED(stream) ) { return 1; } // default return value is 1 image - + // NOTE: this function is allowed to change the current stream position // since CallDoCanRead() will take care of restoring it later virtual bool DoCanRead( wxInputStream& stream ) = 0; @@ -275,7 +275,7 @@ public: bool Create( int width, int height, bool clear = true ); bool Create( int width, int height, unsigned char* data, bool static_data = false ); bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false ); - + // Create() variants using wxSize: bool Create( const wxSize& sz, bool clear = true ) { return Create(sz.GetWidth(), sz.GetHeight(), clear); } @@ -285,7 +285,7 @@ public: { return Create(sz.GetWidth(), sz.GetHeight(), data, alpha, static_data); } void Destroy(); - + // initialize the image data with zeroes void Clear(unsigned char value = 0);