From ec0b40c343d3819b8d780b0d4e482c3e684d7b13 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 30 Nov 2004 21:13:42 +0000 Subject: [PATCH] * sample/GtkDemo/DemoImages.cs: Fix some crashers discovered while trying to use this as a test case to figure out whether or not I'd broken Gtk#. Sigh. :) svn path=/trunk/gtk-sharp/; revision=36863 --- ChangeLog | 6 ++++++ sample/GtkDemo/DemoImages.cs | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d636d94e..4945eb52a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-11-30 Dan Winship + + * sample/GtkDemo/DemoImages.cs: Fix some crashers discovered while + trying to use this as a test case to figure out whether or not I'd + broken Gtk#. Sigh. :) + 2004-11-30 Mike Kestner * glib/glue/value.c : add back some code lost in the merge of diff --git a/sample/GtkDemo/DemoImages.cs b/sample/GtkDemo/DemoImages.cs index cc17475f2..056431f7d 100644 --- a/sample/GtkDemo/DemoImages.cs +++ b/sample/GtkDemo/DemoImages.cs @@ -36,7 +36,7 @@ namespace GtkDemo { public class DemoImages : Gtk.Window { - private static Gtk.Image progressiveImage; + private Gtk.Image progressiveImage; private VBox vbox; BinaryReader imageStream; @@ -138,7 +138,7 @@ namespace GtkDemo timeout_id = GLib.Timeout.Add (150, new GLib.TimeoutHandler (ProgressiveTimeout)); } - static Gdk.PixbufLoader pixbufLoader; + Gdk.PixbufLoader pixbufLoader; // TODO: Decide if we want to perform crazy error handling private bool ProgressiveTimeout () @@ -162,14 +162,14 @@ namespace GtkDemo } } - static void ProgressivePreparedCallback (object obj, EventArgs args) + void ProgressivePreparedCallback (object obj, EventArgs args) { Gdk.Pixbuf pixbuf = pixbufLoader.Pixbuf; pixbuf.Fill (0xaaaaaaff); progressiveImage.FromPixbuf = pixbuf; } - static void ProgressiveUpdatedCallback (object obj, AreaUpdatedArgs args) + void ProgressiveUpdatedCallback (object obj, AreaUpdatedArgs args) { progressiveImage.QueueDraw (); }