Removed redundant wx<Control>NameStr declarations.

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

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "imagxpm.h"
 #endif
 
 #pragma interface "imagxpm.h"
 #endif
 


@@ -21,28 +21,26 @@
 // 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 );
+    virtual bool DoCanRead( wxInputStream& stream );

 #endif
 #endif

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxXPMHandler)

 };
 };

-#endif // wxUSE_XPM

 
 
 #endif
 
 
 #endif