summaryrefslogtreecommitdiff
path: root/demos/testpixbuf-drawable.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-06-21 20:47:22 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-06-21 20:47:22 +0000
commit11056f564b04a956fd3428d7257c839a609fd53e (patch)
treef0ba80f60b9d46230d393b9d39ba132c518da0f0 /demos/testpixbuf-drawable.c
parent443e8c395e9f45d89f669c944366055eead5d021 (diff)
downloadgtk+-11056f564b04a956fd3428d7257c839a609fd53e.tar.gz
Welcome aboard, gdk-pixbuf.
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com> * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard, gdk-pixbuf. * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): fixups for GObject. * gdk/Makefile.am gdk/gdkpixbuf-render.[ch] gdk/gdkpixbuf.[ch]: Bits of gdk-pixbuf with GDK dependencies moved into GDK. * gtk/Makefile.am gtk/gdk-pixbuf-loader.[ch]: Temporarily move gdk-pixbuf-loader here until GObject has signals. * demos/: New directory of demos. Move demos from gdk-pixbuf here. * demos/pixbuf-init.c: Small bit of code to check for loaders in ../gdk-pixbuf/.libs/gdk-pixbuf, and if found, set GDK_PIXBUF_MODULEDIR appropriately. * gdk/gdkcompat.h: Remove GDK_DRAWABLE_PIXMAP compat define which no longer makes sense.
Diffstat (limited to 'demos/testpixbuf-drawable.c')
-rw-r--r--demos/testpixbuf-drawable.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c
index c250f2dfb3..e8cfeae0dc 100644
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -1,6 +1,6 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
+#include "x11/gdkx.h"
#include "gdk-pixbuf.h"
int close_app(GtkWidget *widget, gpointer data)
@@ -67,6 +67,8 @@ int configure_cb(GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
return FALSE;
}
+extern void pixbuf_init();
+
int main(int argc, char **argv)
{
GdkWindow *root;
@@ -75,6 +77,8 @@ int main(int argc, char **argv)
GtkWidget *drawing_area;
GdkPixbuf *pixbuf;
+ pixbuf_init ();
+
gtk_init(&argc, &argv);
gdk_rgb_set_verbose(TRUE);
gdk_rgb_init();