/////////////////////////////////////////////////////////////////////////////
-// Name: xpmdecod.h
+// Name: wx/xpmdecod.h
// Purpose: wxXPMDecoder, XPM reader for wxImage and wxBitmap
// Author: Vaclav Slavik
// CVS-ID: $Id$
#ifndef _WX_XPMDECOD_H_
#define _WX_XPMDECOD_H_
-#ifdef __GNUG__
-#pragma interface "xpmdecod.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"
+#if wxUSE_IMAGE && wxUSE_XPM
-class WXDLLEXPORT wxImage;
-class WXDLLEXPORT wxInputStream;
+class WXDLLIMPEXP_CORE wxImage;
+class WXDLLIMPEXP_BASE wxInputStream;
// --------------------------------------------------------------------------
// wxXPMDecoder class
wxImage ReadFile(wxInputStream& stream);
#endif
// Read directly from XPM data (as passed to wxBitmap ctor):
- wxImage ReadData(const char **xpm_data);
+ wxImage ReadData(const char* const* xpm_data);
+#ifdef __BORLANDC__
+ // needed for Borland 5.5
+ wxImage ReadData(char** xpm_data) { return ReadData(wx_const_cast(const char* const*, xpm_data)); }
+#endif
};
+#endif // wxUSE_IMAGE && wxUSE_XPM
-#endif // _WX_GIFDECOD_H_
-
+#endif // _WX_XPM_H_