Last part from weak ref patch for event sink disconnection

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

diff --git a/include/wx/animdecod.h b/include/wx/animdecod.h
index 37655d549e17834ee642430be3e9133db2185f2a..5379c366a54a9700956169d5c3dc1bc1f20fab51 100644 (file)
--- a/include/wx/animdecod.h
+++ b/include/wx/animdecod.h
@@ -17,8 +17,8 @@
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 

-class WXDLLIMPEXP_BASE wxInputStream;
-class WXDLLIMPEXP_CORE wxImage;
+class WXDLLIMPEXP_FWD_BASE wxInputStream;
+class WXDLLIMPEXP_FWD_CORE wxImage;

 
 /*
 
 
 /*
 


@@ -84,16 +84,13 @@ enum wxAnimationType
 // wxAnimationDecoder class
 // --------------------------------------------------------------------------
 
 // wxAnimationDecoder class
 // --------------------------------------------------------------------------
 

-class WXDLLEXPORT wxAnimationDecoder : public wxObjectRefData
+class WXDLLIMPEXP_CORE wxAnimationDecoder : public wxObjectRefData

 {
 public:
     wxAnimationDecoder()
     {
 {
 public:
     wxAnimationDecoder()
     {

-        m_background = wxNullColour;

         m_nFrames = 0;
     }
         m_nFrames = 0;
     }

-    virtual ~wxAnimationDecoder() { }
-

 
     virtual bool Load( wxInputStream& stream ) = 0;
     virtual bool CanRead( wxInputStream& stream ) const = 0;
 
     virtual bool Load( wxInputStream& stream ) = 0;
     virtual bool CanRead( wxInputStream& stream ) const = 0;


@@ -140,7 +137,7 @@ protected:
     wxColour m_background;
 };
 
     wxColour m_background;
 };
 

+#endif  // wxUSE_STREAMS

 
 

-#endif  // wxUSE_STREAM

 #endif  // _WX_ANIMDECOD_H
 
 #endif  // _WX_ANIMDECOD_H