diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-08-23 15:26:49 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-08-23 15:26:49 +0000 |
| commit | a2d60d44b170d403f26444081113be8d60afe8a3 (patch) | |
| tree | da9506d74a6edba8c3fc4232b350eb3263df95b5 /demos | |
| parent | 34852377443196c3b2b6affd18e3ad7f5400cea8 (diff) | |
| download | gtk+-a2d60d44b170d403f26444081113be8d60afe8a3.tar.gz | |
[ Patch from Sebastian Wilhelmi, 52790 ]
Wed Aug 22 19:15:39 2001 Owen Taylor <otaylor@redhat.com>
[ Patch from Sebastian Wilhelmi, 52790 ]
* gtk/gtkversion.h.in gtk/gtk.h: New file replacing gtkcompat.h
* gdk/gdkcompat.h gdk/gdk*.h gtk/gtkcompat.h.in gtk/gtk*.h:
Move compatibility macros from g[dt]kcompat.h to within
#ifndef G[DT]K_DISABLE_DEPRECATED in each file.
* gdk/gdk-pixbuf-csource.c: Fix up include of gtkcompat.h.
* demos/Makefile.am demos/gtk-demo/Makefile.am
docs/reference/gdk-pixbuf/Makefile.am modules/input/Makefile.am
tests/Makefile.am: Remove references to -G[DT]K_DISABLE_DEPRECATED.
* demos/{pixbuf-demo.c,testpixbuf-drawable.c,testpixbuf-save.c,
testpixbuf.c}: Fix usages of deprecated functions.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/Makefile.am | 3 | ||||
| -rw-r--r-- | demos/gtk-demo/Makefile.am | 2 | ||||
| -rw-r--r-- | demos/pixbuf-demo.c | 1 | ||||
| -rw-r--r-- | demos/testpixbuf-drawable.c | 3 | ||||
| -rw-r--r-- | demos/testpixbuf-save.c | 2 | ||||
| -rw-r--r-- | demos/testpixbuf-scale.c | 1 | ||||
| -rw-r--r-- | demos/testpixbuf.c | 4 |
7 files changed, 5 insertions, 11 deletions
diff --git a/demos/Makefile.am b/demos/Makefile.am index 5bcf5023cb..28c0ef6d7c 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -5,7 +5,8 @@ SUBDIRS = gtk-demo INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ - -DGTK_DISABLE_COMPAT_H \ + -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ @GTK_DEBUG_FLAGS@ \ @GTK_DEP_CFLAGS@ \ diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 64b821d331..b1dc020598 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -25,9 +25,7 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_COMPAT_H \ -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_COMPAT_H \ -DGTK_DISABLE_DEPRECATED \ @GTK_DEBUG_FLAGS@ \ @GTK_DEP_CFLAGS@ \ diff --git a/demos/pixbuf-demo.c b/demos/pixbuf-demo.c index 722007ac71..2ecd6f1d77 100644 --- a/demos/pixbuf-demo.c +++ b/demos/pixbuf-demo.c @@ -202,7 +202,6 @@ main (int argc, char **argv) pixbuf_init (); gtk_init (&argc, &argv); - gdk_rgb_init (); if (!load_pixbufs ()) { g_message ("main(): Could not load all the pixbufs!"); diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c index be40573cbe..6581d47749 100644 --- a/demos/testpixbuf-drawable.c +++ b/demos/testpixbuf-drawable.c @@ -86,9 +86,8 @@ int main(int argc, char **argv) gtk_init(&argc, &argv); gdk_rgb_set_verbose(TRUE); - gdk_rgb_init(); - gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); + gtk_widget_set_default_colormap(gdk_rgb_get_colormap()); root = GDK_ROOT_PARENT(); pixbuf = gdk_pixbuf_get_from_drawable(NULL, root, NULL, diff --git a/demos/testpixbuf-save.c b/demos/testpixbuf-save.c index 071352ace5..9847d9c17f 100644 --- a/demos/testpixbuf-save.c +++ b/demos/testpixbuf-save.c @@ -126,7 +126,7 @@ main (int argc, char **argv) gtk_init (&argc, &argv); - gtk_widget_set_default_colormap (gdk_rgb_get_cmap ()); + gtk_widget_set_default_colormap (gdk_rgb_get_colormap ()); root = GDK_ROOT_PARENT (); pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL, diff --git a/demos/testpixbuf-scale.c b/demos/testpixbuf-scale.c index d2c318d2b2..fd6c801dca 100644 --- a/demos/testpixbuf-scale.c +++ b/demos/testpixbuf-scale.c @@ -68,7 +68,6 @@ main(int argc, char **argv) pixbuf_init (); gtk_init (&argc, &argv); - gdk_rgb_init (); if (argc != 2) { fprintf (stderr, "Usage: testpixbuf-scale FILE\n"); diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c index 707398f8df..a61491fdde 100644 --- a/demos/testpixbuf.c +++ b/demos/testpixbuf.c @@ -520,9 +520,7 @@ main (int argc, char **argv) gdk_rgb_set_verbose (TRUE); - gdk_rgb_init (); - - gtk_widget_set_default_colormap (gdk_rgb_get_cmap ()); + gtk_widget_set_default_colormap (gdk_rgb_get_colormap ()); { char *tbf_readlen = getenv("TBF_READLEN"); |