Rebake from clean wx tree.

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

diff --git a/include/wx/animdecod.h b/include/wx/animdecod.h
index e803953fe24efcb6faafa8672756e3952e3cf13e..876c802520099430dab4c3ab33cb79aec36fb2cd 100644 (file)
--- a/include/wx/animdecod.h
+++ b/include/wx/animdecod.h
@@ -16,8 +16,9 @@
 
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
 #include "wx/colour.h"
 #include "wx/gdicmn.h"

+#include "wx/log.h"
+#include "wx/stream.h"

 
 

-class WXDLLIMPEXP_FWD_BASE wxInputStream;

 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 /*
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 /*


@@ -93,11 +94,11 @@ public:
     }
 
     virtual bool Load( wxInputStream& stream ) = 0;
     }
 
     virtual bool Load( wxInputStream& stream ) = 0;

-    
+

     bool CanRead( wxInputStream& stream ) const
     {
         // NOTE: this code is the same of wxImageHandler::CallDoCanRead
     bool CanRead( wxInputStream& stream ) const
     {
         // NOTE: this code is the same of wxImageHandler::CallDoCanRead

-        
+

         if ( !stream.IsSeekable() )
             return false;        // can't test unseekable stream
 
         if ( !stream.IsSeekable() )
             return false;        // can't test unseekable stream
 


@@ -107,7 +108,7 @@ public:
         // restore the old position to be able to test other formats and so on
         if ( stream.SeekI(posOld) == wxInvalidOffset )
         {
         // restore the old position to be able to test other formats and so on
         if ( stream.SeekI(posOld) == wxInvalidOffset )
         {

-            wxLogDebug(_T("Failed to rewind the stream in wxAnimationDecoder!"));
+            wxLogDebug(wxT("Failed to rewind the stream in wxAnimationDecoder!"));

 
             // reading would fail anyhow as we're not at the right position
             return false;
 
             // reading would fail anyhow as we're not at the right position
             return false;


@@ -155,7 +156,7 @@ protected:
     // this function should modify the stream current position without taking care
     // of restoring it since CanRead() will do it.
     virtual bool DoCanRead(wxInputStream& stream) const = 0;
     // this function should modify the stream current position without taking care
     // of restoring it since CanRead() will do it.
     virtual bool DoCanRead(wxInputStream& stream) const = 0;

-    
+

     wxSize m_szAnimation;
     unsigned int m_nFrames;
 
     wxSize m_szAnimation;
     unsigned int m_nFrames;