fix the definition of many static functions marked as 'const' or functions which...

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

diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp
index 206b36180e8722212c535f81c2730e3a704885df..8cf11f0e999f2976add54e7d3581a5894c48ab35 100644 (file)
--- a/src/gtk/animate.cpp
+++ b/src/gtk/animate.cpp
@@ -23,6 +23,7 @@
 #endif
 
 #include "wx/wfstream.h"
 #endif
 
 #include "wx/wfstream.h"

+

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


@@ -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;
     }
 


@@ -134,7 +136,7 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
         if (!gdk_pixbuf_loader_write(loader, buf, stream.LastRead(), &error))
         {
             gdk_pixbuf_loader_close(loader, &error);
         if (!gdk_pixbuf_loader_write(loader, buf, stream.LastRead(), &error))
         {
             gdk_pixbuf_loader_close(loader, &error);

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

             return false;
         }
     }
             return false;
         }
     }


@@ -142,7 +144,7 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
     // 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;
     }
 
         return false;
     }
 


@@ -210,6 +212,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 );


@@ -235,6 +238,8 @@ wxAnimationCtrl::~wxAnimationCtrl()
 bool wxAnimationCtrl::LoadFile(const wxString &filename, wxAnimationType type)
 {
     wxFileInputStream fis(filename);
 bool wxAnimationCtrl::LoadFile(const wxString &filename, wxAnimationType type)
 {
     wxFileInputStream fis(filename);

+    if (!fis.IsOk())
+        return false;

     return Load(fis, type);
 }
 
     return Load(fis, type);
 }