don't use wxVector<wxDataFormat> from wx/clipbrd.h as wxDataFormat definition is...

[wxWidgets.git] / src / gtk / animate.cpp

diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp
index 820536a56489d495fce5d8e1cca98665d91cc65c..02e2886873af7e874cb8423bb9d6d201f9c74509 100644 (file)
--- a/src/gtk/animate.cpp
+++ b/src/gtk/animate.cpp
@@ -22,6 +22,8 @@
     #include "wx/stream.h"
 #endif
 
     #include "wx/stream.h"
 #endif
 

+#include "wx/wfstream.h"
+

 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 
 


@@ -30,10 +32,10 @@
 // ============================================================================
 
 void gdk_pixbuf_area_updated(GdkPixbufLoader *loader,
 // ============================================================================
 
 void gdk_pixbuf_area_updated(GdkPixbufLoader *loader,

-                             gint             x,
-                             gint             y,
-                             gint             width,
-                             gint             height,
+                             gint             WXUNUSED(x),
+                             gint             WXUNUSED(y),
+                             gint             WXUNUSED(width),
+                             gint             WXUNUSED(height),

                              wxAnimation      *anim)
 {
     if (anim && anim->GetPixbuf() == NULL)
                              wxAnimation      *anim)
 {
     if (anim && anim->GetPixbuf() == NULL)


@@ -82,8 +84,7 @@ wxAnimation& wxAnimation::operator=(const wxAnimation& that)
 bool wxAnimation::LoadFile(const wxString &name, wxAnimationType WXUNUSED(type))
 {
     UnRef();
 bool wxAnimation::LoadFile(const wxString &name, wxAnimationType WXUNUSED(type))
 {
     UnRef();

-    m_pixbuf = gdk_pixbuf_animation_new_from_file(
-        wxConvFileName->cWX2MB(name), NULL);
+    m_pixbuf = gdk_pixbuf_animation_new_from_file(name.fn_str(), NULL);

     return IsOk();
 }
 
     return IsOk();
 }
 


@@ -117,7 +118,8 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
 
     if (!loader)
     {
 
     if (!loader)
     {

-        wxLogDebug(wxT("Could not create the loader for '%s' animation type"), anim_type);
+        wxLogDebug(wxT("Could not create the loader for '%s' animation type: %s"),
+                   anim_type, error->message);

         return false;
     }
 
         return false;
     }
 


@@ -125,6 +127,7 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
     g_signal_connect(loader, "area-updated", G_CALLBACK(gdk_pixbuf_area_updated), this);
 
     guchar buf[2048];
     g_signal_connect(loader, "area-updated", G_CALLBACK(gdk_pixbuf_area_updated), this);
 
     guchar buf[2048];

+    bool data_written = false;

     while (stream.IsOk())
     {
         // read a chunk of data
     while (stream.IsOk())
     {
         // read a chunk of data


@@ -133,21 +136,32 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
         // fetch all data into the loader
         if (!gdk_pixbuf_loader_write(loader, buf, stream.LastRead(), &error))
         {
         // fetch all data into the loader
         if (!gdk_pixbuf_loader_write(loader, buf, stream.LastRead(), &error))
         {

+            wxLogDebug(wxT("Could not write to the loader: %s"), error->message);
+
+            // gdk_pixbuf_loader_close wants the GError == NULL; reset it:
+            error = NULL;

             gdk_pixbuf_loader_close(loader, &error);
             gdk_pixbuf_loader_close(loader, &error);

-            wxLogDebug(wxT("Could not write to the loader"));

             return false;
         }
             return false;
         }

+
+        data_written = true;
+    }
+
+    if (!data_written)
+    {
+        wxLogDebug("Could not read data from the stream...");
+        return false;

     }
 
     // load complete
     if (!gdk_pixbuf_loader_close(loader, &error))
     {
     }
 
     // load complete
     if (!gdk_pixbuf_loader_close(loader, &error))
     {

-        wxLogDebug(wxT("Could not close the loader"));
+        wxLogDebug(wxT("Could not close the loader: %s"), error->message);

         return false;
     }
 
     // wait until we get the last area_updated signal
         return false;
     }
 
     // wait until we get the last area_updated signal

-    return true;
+    return data_written;

 }
 
 wxImage wxAnimation::GetFrame(unsigned int WXUNUSED(frame)) const
 }
 
 wxImage wxAnimation::GetFrame(unsigned int WXUNUSED(frame)) const


@@ -210,6 +224,7 @@ bool wxAnimationCtrl::Create( wxWindow *parent, wxWindowID id,
     SetWindowStyle(style);
 
     m_widget = gtk_image_new();
     SetWindowStyle(style);
 
     m_widget = gtk_image_new();

+    g_object_ref(m_widget);

     gtk_widget_show(m_widget);
 
     m_parent->DoAddChild( this );
     gtk_widget_show(m_widget);
 
     m_parent->DoAddChild( this );


@@ -233,9 +248,17 @@ wxAnimationCtrl::~wxAnimationCtrl()
 }
 
 bool wxAnimationCtrl::LoadFile(const wxString &filename, wxAnimationType type)
 }
 
 bool wxAnimationCtrl::LoadFile(const wxString &filename, wxAnimationType type)

+{
+    wxFileInputStream fis(filename);
+    if (!fis.IsOk())
+        return false;
+    return Load(fis, type);
+}
+
+bool wxAnimationCtrl::Load(wxInputStream& stream, wxAnimationType type)

 {
     wxAnimation anim;
 {
     wxAnimation anim;

-    if (!anim.LoadFile(filename, type))
+    if ( !anim.Load(stream, type) || !anim.IsOk() )

         return false;
 
     SetAnimation(anim);
         return false;
 
     SetAnimation(anim);


@@ -421,7 +444,7 @@ bool wxAnimationCtrl::SetBackgroundColour( const wxColour &colour )
 // wxAnimationCtrl - event handlers
 //-----------------------------------------------------------------------------
 
 // wxAnimationCtrl - event handlers
 //-----------------------------------------------------------------------------
 

-void wxAnimationCtrl::OnTimer(wxTimerEvent &ev)
+void wxAnimationCtrl::OnTimer(wxTimerEvent& WXUNUSED(ev))

 {
     wxASSERT(m_iter != NULL);
 
 {
     wxASSERT(m_iter != NULL);