merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -23,23 +23,23 @@
|
||||
|
||||
class WXDLLEXPORT wxXPMHandler : public wxImageHandler
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxXPMHandler)
|
||||
|
||||
public:
|
||||
|
||||
inline wxXPMHandler()
|
||||
{
|
||||
m_name = wxT("XPM file");
|
||||
m_extension = wxT("xpm");
|
||||
m_type = wxBITMAP_TYPE_XPM;
|
||||
m_mime = wxT("image/xpm");
|
||||
};
|
||||
inline wxXPMHandler()
|
||||
{
|
||||
m_name = wxT("XPM file");
|
||||
m_extension = wxT("xpm");
|
||||
m_type = wxBITMAP_TYPE_XPM;
|
||||
m_mime = wxT("image/xpm");
|
||||
}
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
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 DoCanRead( wxInputStream& stream );
|
||||
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 DoCanRead( wxInputStream& stream );
|
||||
#endif
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxXPMHandler)
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user