Typo fix, and add some missing methods.

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

diff --git a/interface/wx/image.h b/interface/wx/image.h
index de1676a55fbbcd597a4d6cfcae2cd1c58b46951d..864624d1dd7de7c0a95d0981b64064c6cda22f55 100644 (file)
--- a/interface/wx/image.h
+++ b/interface/wx/image.h
@@ -335,6 +335,24 @@ public:
         @since 2.9.2
      */
      static wxVersionInfo GetLibraryVersionInfo();
         @since 2.9.2
      */
      static wxVersionInfo GetLibraryVersionInfo();

+
+protected:
+    /**
+       Called to get the number of images available in a multi-image file
+       type, if supported.
+       
+       NOTE: this function is allowed to change the current stream position
+             since GetImageCount() will take care of restoring it later
+    */
+    virtual int DoGetImageCount( wxInputStream& stream );
+
+    /**
+       Called to test if this handler can read an image from the given stream.
+       
+       NOTE: this function is allowed to change the current stream position
+             since CallDoCanRead() will take care of restoring it later
+    */
+    virtual bool DoCanRead( wxInputStream& stream ) = 0;

 };
 
 
 };
 
 


@@ -1077,7 +1095,7 @@ public:
         This is most often used when doing direct image manipulation.
         The return value points to an array of characters in RGBRGBRGB... format
         in the top-to-bottom, left-to-right order, that is the first RGB triplet
         This is most often used when doing direct image manipulation.
         The return value points to an array of characters in RGBRGBRGB... format
         in the top-to-bottom, left-to-right order, that is the first RGB triplet

-        corresponds to the pixel first pixel of the first row, the second one ---
+        corresponds to the first pixel of the first row, the second one ---

         to the second pixel of the first row and so on until the end of the first
         row, with second row following after it and so on.
 
         to the second pixel of the first row and so on until the end of the first
         row, with second row following after it and so on.