added macros to avoid code repetition when defining comparison operators; use them...

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

diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index 8ac4cdd554310ccdf7c48d602970a3d6063da807..e47c873e6329771108676c9c68340a57079c84c2 100644 (file)
--- a/include/wx/imagxpm.h
+++ b/include/wx/imagxpm.h
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGXPM_H_
 #define _WX_IMAGXPM_H_
 
 #ifndef _WX_IMAGXPM_H_
 #define _WX_IMAGXPM_H_
 

-#ifdef __GNUG__
-#pragma interface "imagxpm.h"
-#endif
-

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


@@ -21,28 +17,27 @@
 // wxXPMHandler
 //-----------------------------------------------------------------------------
 
 // wxXPMHandler
 //-----------------------------------------------------------------------------
 

-#if wxUSE_XPM

 class WXDLLEXPORT wxXPMHandler : public wxImageHandler
 {
 class WXDLLEXPORT 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=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

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxXPMHandler)

 };
 };

-#endif // wxUSE_XPM

 
 
 #endif
 
 
 #endif