X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9a3fd3614ebd51dbba27d75bb745bba3ec74e..3508c1432884472f0d24f0f98c0dc75ed35df297:/include/wx/image.h?ds=sidebyside diff --git a/include/wx/image.h b/include/wx/image.h index 40b17b20e1..fd76956841 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -36,6 +36,9 @@ #define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(_T("ResolutionUnit")) +#define wxIMAGE_OPTION_MAX_WIDTH wxString(_T("MaxWidth")) +#define wxIMAGE_OPTION_MAX_HEIGHT wxString(_T("MaxHeight")) + // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT // // NB: don't change these values, they correspond to libjpeg constants @@ -233,10 +236,13 @@ public: bool Create( const char* const* xpmData ); #ifdef __BORLANDC__ // needed for Borland 5.5 - wxImage( char** xpmData ) { Create(wx_const_cast(const char* const*, xpmData)); } - bool Create( char** xpmData ) { return Create(wx_const_cast(const char* const*, xpmData)); } + wxImage( char** xpmData ) { Create(const_cast(xpmData)); } + bool Create( char** xpmData ) { return Create(const_cast(xpmData)); } #endif void Destroy(); + + // initialize the image data with zeroes + void Clear(unsigned char value = 0); // creates an identical copy of the image (the = operator // just raises the ref count) @@ -358,6 +364,9 @@ public: int GetWidth() const; int GetHeight() const; + wxSize GetSize() const + { return wxSize(GetWidth(), GetHeight()); } + // Gets the type of image found by LoadFile or specified with SaveFile wxBitmapType GetType() const; @@ -440,18 +449,16 @@ public: static RGBValue HSVtoRGB(const HSVValue& hsv); #if WXWIN_COMPATIBILITY_2_8 - // explicitly specifying inline allows gcc < 3.4 to - // handle the deprecation attribute even in the constructor. - wxDEPRECATED( - inline wxImage(const wxString& name, long type, int index = -1) + wxDEPRECATED_CONSTRUCTOR( + wxImage(const wxString& name, long type, int index = -1) { LoadFile(name, (wxBitmapType)type, index); } ) #if wxUSE_STREAMS - wxDEPRECATED( - inline wxImage(wxInputStream& stream, long type, int index = -1) + wxDEPRECATED_CONSTRUCTOR( + wxImage(wxInputStream& stream, long type, int index = -1) { LoadFile(stream, (wxBitmapType)type, index); }