Work with srcdir != builddir.

* demos/testanimation.c: Don't include "gdk-pixbuf.h".  Use
<gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
* demos/testpixbuf.c: Likewise.
* demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
* demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h".  Use
<gdk/x11/gdkx.h>.
* demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h".  Don't include
"gdk-pixbuf.h".
* demos/Makefile.am (INCLUDES): Remove unneeded directories.
This commit is contained in:
Raja R Harinath 2000-06-22 00:05:44 +00:00
parent 8a7664a1ae
commit 30bd71e2ae
13 changed files with 102 additions and 18 deletions

View File

@ -1,3 +1,16 @@
2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
Work with srcdir != builddir.
* demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
<gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
* demos/testpixbuf.c: Likewise.
* demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
* demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
<gdk/x11/gdkx.h>.
* demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
"gdk-pixbuf.h".
* demos/Makefile.am (INCLUDES): Remove unneeded directories.
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

View File

@ -1,3 +1,16 @@
2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
Work with srcdir != builddir.
* demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
<gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
* demos/testpixbuf.c: Likewise.
* demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
* demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
<gdk/x11/gdkx.h>.
* demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
"gdk-pixbuf.h".
* demos/Makefile.am (INCLUDES): Remove unneeded directories.
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

View File

@ -1,3 +1,16 @@
2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
Work with srcdir != builddir.
* demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
<gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
* demos/testpixbuf.c: Likewise.
* demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
* demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
<gdk/x11/gdkx.h>.
* demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
"gdk-pixbuf.h".
* demos/Makefile.am (INCLUDES): Remove unneeded directories.
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

View File

@ -1,3 +1,16 @@
2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
Work with srcdir != builddir.
* demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
<gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
* demos/testpixbuf.c: Likewise.
* demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
* demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
<gdk/x11/gdkx.h>.
* demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
"gdk-pixbuf.h".
* demos/Makefile.am (INCLUDES): Remove unneeded directories.
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

View File

@ -1,3 +1,16 @@
2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
Work with srcdir != builddir.
* demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
<gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
* demos/testpixbuf.c: Likewise.
* demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
* demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
<gdk/x11/gdkx.h>.
* demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
"gdk-pixbuf.h".
* demos/Makefile.am (INCLUDES): Remove unneeded directories.
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

View File

@ -1,3 +1,16 @@
2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
Work with srcdir != builddir.
* demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
<gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
* demos/testpixbuf.c: Likewise.
* demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
* demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
<gdk/x11/gdkx.h>.
* demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
"gdk-pixbuf.h".
* demos/Makefile.am (INCLUDES): Remove unneeded directories.
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

View File

@ -1,3 +1,16 @@
2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
Work with srcdir != builddir.
* demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
<gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
* demos/testpixbuf.c: Likewise.
* demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
* demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
<gdk/x11/gdkx.h>.
* demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
"gdk-pixbuf.h".
* demos/Makefile.am (INCLUDES): Remove unneeded directories.
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
* gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

View File

@ -2,9 +2,7 @@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_builddir)/gdk-pixbuf \
-I$(top_builddir)/gdk \
-I$(top_builddir)/gtk \
-DGTK_DISABLE_COMPAT_H \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \

View File

@ -22,8 +22,7 @@
#include <config.h>
#include <stdlib.h>
#include "gtk.h"
#include "gdk-pixbuf.h"
#include <gtk/gtk.h>
#include <math.h>

View File

@ -24,8 +24,7 @@
#include <unistd.h>
#include <string.h>
#include <gtk/gtk.h>
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-loader.h"
#include <gtk/gdk-pixbuf-loader.h>
typedef struct {
FILE *imagefile;

View File

@ -1,7 +1,6 @@
#include <config.h>
#include <gtk/gtk.h>
#include "x11/gdkx.h"
#include "gdk-pixbuf.h"
#include <gdk/x11/gdkx.h>
int close_app(GtkWidget *widget, gpointer data)
{

View File

@ -1,5 +1,4 @@
#include <gtk/gtk.h>
#include "gdk-pixbuf.h"
#include <stdio.h>

View File

@ -23,8 +23,7 @@
#include <unistd.h>
#include <string.h>
#include <gtk/gtk.h>
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-loader.h"
#include <gtk/gdk-pixbuf-loader.h>
typedef struct {
FILE *imagefile;