X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/775c6f0cd21023a0bcb409b25b57504abb4b6dc4..da8b1d4b3b535aba94d04494f5b6e2b3e47901ee:/include/wx/imagxpm.h?ds=sidebyside

diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index 8ac4cdd554..46903ea921 100644
--- a/include/wx/imagxpm.h
+++ b/include/wx/imagxpm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imaggif.h
+// Name:        wx/imagxpm.h
 // Purpose:     wxImage XPM handler
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -10,41 +10,36 @@
 #ifndef _WX_IMAGXPM_H_
 #define _WX_IMAGXPM_H_
 
-#ifdef __GNUG__
-#pragma interface "imagxpm.h"
-#endif
-
 #include "wx/image.h"
 
+#if wxUSE_XPM
 
 //-----------------------------------------------------------------------------
 // wxXPMHandler
 //-----------------------------------------------------------------------------
 
-#if wxUSE_XPM
-class WXDLLEXPORT wxXPMHandler : public wxImageHandler
+class WXDLLIMPEXP_CORE 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=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 );
+protected:
+    virtual bool DoCanRead( wxInputStream& stream );
 #endif
-};
-#endif // wxUSE_XPM
 
+private:
+    DECLARE_DYNAMIC_CLASS(wxXPMHandler)
+};
 
-#endif
-  // _WX_IMAGXPM_H_
+#endif // wxUSE_XPM
 
+#endif // _WX_IMAGXPM_H_