X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f49300284e2c91095ae3ebe62cb3a6d424eac21..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/imagpnm.h?ds=sidebyside diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h index a2f151785f..12f184f587 100644 --- a/include/wx/imagpnm.h +++ b/include/wx/imagpnm.h @@ -10,7 +10,7 @@ #ifndef _WX_IMAGPNM_H_ #define _WX_IMAGPNM_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "imagpnm.h" #endif @@ -23,23 +23,23 @@ #if wxUSE_PNM class WXDLLEXPORT wxPNMHandler : public wxImageHandler { - DECLARE_DYNAMIC_CLASS(wxPNMHandler) - public: - - inline wxPNMHandler() - { - m_name = "PNM file"; - m_extension = "pnm"; - m_type = wxBITMAP_TYPE_PNM; - m_mime = "image/pnm"; - }; + inline wxPNMHandler() + { + m_name = wxT("PNM file"); + m_extension = wxT("pnm"); + m_type = wxBITMAP_TYPE_PNM; + m_mime = wxT("image/pnm"); + } #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 ); - 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(wxPNMHandler) }; #endif