Add RunScript and implement on all backends. Document and add a very simple unit...

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

diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index 10a12c62acf1acf800eea2a3d55e7c5c3168ed95..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,18 +10,15 @@
 #ifndef _WX_IMAGXPM_H_
 #define _WX_IMAGXPM_H_
 
 #ifndef _WX_IMAGXPM_H_
 #define _WX_IMAGXPM_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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

 {
 public:
     inline wxXPMHandler()
 {
 public:
     inline wxXPMHandler()


@@ -35,6 +32,7 @@ public:
 #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 );
 #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 );

+protected:

     virtual bool DoCanRead( wxInputStream& stream );
 #endif
 
     virtual bool DoCanRead( wxInputStream& stream );
 #endif
 


@@ -42,7 +40,6 @@ private:
     DECLARE_DYNAMIC_CLASS(wxXPMHandler)
 };
 
     DECLARE_DYNAMIC_CLASS(wxXPMHandler)
 };
 

+#endif // wxUSE_XPM

 
 

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