#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
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<const char* const*>(xpmData)); }
+ bool Create( char** xpmData ) { return Create(const_cast<const char* const*>(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)
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;
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);
}