always let the multiline text control process the Enter key presses

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

diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index 8ac4cdd554310ccdf7c48d602970a3d6063da807..2b64bfb8bb6d3265246e928599c1dd8fb4c82d7b 100644 (file)
--- a/include/wx/imagxpm.h
+++ b/include/wx/imagxpm.h
@@ -21,7 +21,6 @@
 // wxXPMHandler
 //-----------------------------------------------------------------------------
 
 // wxXPMHandler
 //-----------------------------------------------------------------------------
 

-#if wxUSE_XPM

 class WXDLLEXPORT wxXPMHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxXPMHandler)
 class WXDLLEXPORT wxXPMHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxXPMHandler)


@@ -37,12 +36,11 @@ public:
   };
 
 #if wxUSE_STREAMS
   };
 
 #if wxUSE_STREAMS

-  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
+  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
 };
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
   virtual bool DoCanRead( wxInputStream& stream );
 #endif
 };

-#endif // wxUSE_XPM

 
 
 #endif
 
 
 #endif