Remove the size_prepared callback, to test incremental display.

2005-01-04  Matthias Clasen  <mclasen@redhat.com>

	* demos/testpixbuf.c (main): Remove the size_prepared callback,
	to test incremental display.
	(new_testrgb_window): Return the drawing area, not the window,
	since we want to queue draws on the drawing area.

diff --git a/ChangeLog b/ChangeLog
index 9effd207a3e185d9a053d0b6791c1138c757402f..2e30d3c45611eba285ab1a20d22b16feb135022a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * demos/testpixbuf.c (main): Remove the size_prepared callback,
+       to test incremental display.
+       (new_testrgb_window): Return the drawing area, not the window,
+       since we want to queue draws on the drawing area.
+
 2005-01-03  Matthias Clasen  <mclasen@redhat.com>
 
        * examples/*: Re-extract.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9effd207a3e185d9a053d0b6791c1138c757402f..2e30d3c45611eba285ab1a20d22b16feb135022a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-01-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * demos/testpixbuf.c (main): Remove the size_prepared callback,
+       to test incremental display.
+       (new_testrgb_window): Return the drawing area, not the window,
+       since we want to queue draws on the drawing area.
+
 2005-01-03  Matthias Clasen  <mclasen@redhat.com>
 
        * examples/*: Re-extract.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9effd207a3e185d9a053d0b6791c1138c757402f..2e30d3c45611eba285ab1a20d22b16feb135022a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2005-01-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * demos/testpixbuf.c (main): Remove the size_prepared callback,
+       to test incremental display.
+       (new_testrgb_window): Return the drawing area, not the window,
+       since we want to queue draws on the drawing area.
+
 2005-01-03  Matthias Clasen  <mclasen@redhat.com>
 
        * examples/*: Re-extract.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9effd207a3e185d9a053d0b6791c1138c757402f..2e30d3c45611eba285ab1a20d22b16feb135022a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2005-01-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * demos/testpixbuf.c (main): Remove the size_prepared callback,
+       to test incremental display.
+       (new_testrgb_window): Return the drawing area, not the window,
+       since we want to queue draws on the drawing area.
+
 2005-01-03  Matthias Clasen  <mclasen@redhat.com>
 
        * examples/*: Re-extract.

diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index 4088e344f3c02b78266d13d8e663e8972bdb3da1..5e211be74738b6d439b0d2b932a7da075444c815 100644 (file)
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -427,7 +427,7 @@ new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
 
        gtk_widget_show (window);
 
-        return window;
+        return drawing_area;
 }
 
 
@@ -508,7 +508,7 @@ extern void pixbuf_init ();
 
 void size_func (GdkPixbufLoader *loader, gint width, gint height, gpointer data)
 {
-  gdk_pixbuf_loader_set_size (loader, width*2, height*2);
+        gdk_pixbuf_loader_set_size (loader, width*2, height*2);
 }
 
 
@@ -525,7 +525,7 @@ main (int argc, char **argv)
 
        gtk_init (&argc, &argv);
 
-       gdk_rgb_set_verbose (TRUE);
+       //      gdk_rgb_set_verbose (TRUE);
 
        gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
 
@@ -611,8 +611,10 @@ main (int argc, char **argv)
 
                        status.buf = g_malloc (readlen);
 
+#if 0
                        g_signal_connect (pixbuf_loader, "size_prepared", 
                                          G_CALLBACK (size_func), NULL);
+#endif
 
                         g_signal_connect (pixbuf_loader, "area_prepared",
                                          G_CALLBACK (progressive_prepared_callback),