made wxImageHander's default values consistent with wxImage (doesn't matter, wxImage...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h
index 2fbccbf619f3c8a13fac9a52a6989a8d15f5b259..f2486514ff5cc96b7fdd1592b2671a10cf181174 100644 (file)
--- a/include/wx/imagbmp.h
+++ b/include/wx/imagbmp.h
@@ -51,7 +51,7 @@ public:
 
 #if wxUSE_STREAMS
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 
 #if wxUSE_STREAMS
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 00d190e5c1919e1655b8b0b535d432bd38c7ba97..6cd7e942dca0dc9cf48340cb2f6e7d2f8d23c417 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -43,7 +43,7 @@ public:
     wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 
 #if wxUSE_STREAMS
     wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 
 #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 int GetImageCount( wxInputStream& stream );
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 
     virtual int GetImageCount( wxInputStream& stream );

diff --git a/include/wx/imaggif.h b/include/wx/imaggif.h
index 14d31199a59f18070ae00c6d06f03e3e6f625651..f0cffd7fca900d4a5df477426d8d4470101a0e22 100644 (file)
--- a/include/wx/imaggif.h
+++ b/include/wx/imaggif.h
@@ -38,7 +38,7 @@ 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

diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index da25d5c7ec250757d5f5b11f7343103890272aae..999bc889cb1f57d64919724741bb330a69be7542 100644 (file)
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -36,7 +36,7 @@ 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

diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h
index f9c0dab41136315cef300932ffedee117c7486a0..1533483fff8227c8a93ff3945ffa6faf3a993703 100644 (file)
--- a/include/wx/imagpcx.h
+++ b/include/wx/imagpcx.h
@@ -37,7 +37,7 @@ 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 // wxUSE_STREAMS
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
   virtual bool DoCanRead( wxInputStream& stream );
 #endif // wxUSE_STREAMS

diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h
index caa8f2313383daa4cdc0719fdc58deeced743b69..87ff7f124b53d904d362b0380cfda45ba5bbdea8 100644 (file)
--- a/include/wx/imagpng.h
+++ b/include/wx/imagpng.h
@@ -36,7 +36,7 @@ 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

diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h
index a2f151785f58224c76f22bb8138f087e1c5acd6f..8af0200a29303ee5615c5332beb0ad057c507f3b 100644 (file)
--- a/include/wx/imagpnm.h
+++ b/include/wx/imagpnm.h
@@ -36,7 +36,7 @@ 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

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 55d3ff0689e6ca4d497efe0e5e8dfbb0e803f6f0..e6f80b3eba73b08bb495da62632b6c91772741c7 100644 (file)
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -37,7 +37,7 @@ 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 );
   virtual int GetImageCount( wxInputStream& stream );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
   virtual bool DoCanRead( wxInputStream& stream );
   virtual int GetImageCount( wxInputStream& stream );

diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index 7ffcaa926dd7d5acf706a199c7a14d23cc34bdcb..2b64bfb8bb6d3265246e928599c1dd8fb4c82d7b 100644 (file)
--- a/include/wx/imagxpm.h
+++ b/include/wx/imagxpm.h
@@ -36,7 +36,7 @@ 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