synchronize GTK2 minimum version in docs

[wxWidgets.git] / include / wx / imagxpm.h

diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index 658fa3d62232ca287969d7723502cfe3f5695e64..46903ea92127554e59702c927ac07ebbb9cb1340 100644 (file)
--- 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$
 // Purpose:     wxImage XPM handler
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -10,39 +10,36 @@
 #ifndef _WX_IMAGXPM_H_
 #define _WX_IMAGXPM_H_
 
 #ifndef _WX_IMAGXPM_H_
 #define _WX_IMAGXPM_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "imagxpm.h"
-#endif
-

 #include "wx/image.h"
 
 #include "wx/image.h"
 

+#if wxUSE_XPM

 
 //-----------------------------------------------------------------------------
 // wxXPMHandler
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxXPMHandler
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxXPMHandler : public wxImageHandler
+class WXDLLIMPEXP_CORE wxXPMHandler : public wxImageHandler

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxXPMHandler)
-

 public:
 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
 
 #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 );
+protected:
+    virtual bool DoCanRead( wxInputStream& stream );

 #endif
 #endif

-};

 
 

+private:
+    DECLARE_DYNAMIC_CLASS(wxXPMHandler)
+};

 
 

-#endif
-  // _WX_IMAGXPM_H_
+#endif // wxUSE_XPM

 
 

+#endif // _WX_IMAGXPM_H_