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 | |
| 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.
53 files changed, 238 insertions, 64 deletions
@@ -1,3 +1,22 @@ +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. + Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 84eb13d4b0..6c164c0ad9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,22 @@ +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. + Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 84eb13d4b0..6c164c0ad9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,22 @@ +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. + Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 84eb13d4b0..6c164c0ad9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,22 @@ +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. + Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 84eb13d4b0..6c164c0ad9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,22 @@ +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. + Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 84eb13d4b0..6c164c0ad9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,22 @@ +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. + Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 84eb13d4b0..6c164c0ad9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,22 @@ +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. + Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection diff --git a/configure.in b/configure.in index 76dc6fda6d..9a0fc098ad 100644 --- a/configure.in +++ b/configure.in @@ -1158,7 +1158,7 @@ gdk/linux-fb/Makefile gtk/Makefile gtk/makefile.mingw gtk/makefile.msc -gtk/gtkcompat.h +gtk/gtkversion.h gtk/gtk-win32.rc gtk/stock-icons/Makefile modules/Makefile 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"); diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am index 5c2dc329f5..39dd8e4858 100644 --- a/docs/reference/gdk-pixbuf/Makefile.am +++ b/docs/reference/gdk-pixbuf/Makefile.am @@ -52,7 +52,6 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@ \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_builddir)/gdk \ - -DGTK_DISABLE_COMPAT_H \ @GTK_DEBUG_FLAGS@ \ @GTK_DEP_CFLAGS@ \ @STRIP_END@ diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 5d953b45a0..2ae6bc7fc1 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -3244,22 +3244,6 @@ GTK_MICRO_VERSION GTK_BINARY_AGE GTK_INTERFACE_AGE GTK_CHECK_VERSION -<SUBSECTION Private> -GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS -GTK_HAVE_SIGNAL_INIT -GTK_HAVE_FEATURES_1_1_0 -GTK_HAVE_FEATURES_1_1_2 -GTK_HAVE_FEATURES_1_1_4 -GTK_HAVE_FEATURES_1_1_5 -GTK_HAVE_FEATURES_1_1_6 -GTK_HAVE_FEATURES_1_1_7 -GTK_HAVE_FEATURES_1_1_8 -GTK_HAVE_FEATURES_1_1_9 -GTK_HAVE_FEATURES_1_1_10 -GTK_HAVE_FEATURES_1_1_11 -GTK_HAVE_FEATURES_1_1_12 -GTK_HAVE_FEATURES_1_1_13 -GTK_HAVE_FEATURES_1_1_14 </SECTION> diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 3c9c63eebe..ddd6912d4c 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -1613,6 +1613,13 @@ Get the type of GtkIdentifier. @menu: @Returns: +<!-- ##### MACRO gtk_notebook_set_page ##### --> +<para> +</para> + +@notebook: +@page_num: + <!-- ##### FUNCTION gtk_object_arg_get ##### --> <para> Private function to get an argument and argument info from an object. diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml index 13ec1fa9f1..5ed3d8534c 100644 --- a/docs/reference/gtk/tmpl/gtknotebook.sgml +++ b/docs/reference/gtk/tmpl/gtknotebook.sgml @@ -118,7 +118,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook. <!-- ##### MACRO gtk_notebook_current_page ##### --> <para> -Compatibility macro; in gtkcompat.h. +Deprecated compatibility macro. </para> @@ -132,15 +132,6 @@ Compatibility macro; in gtkcompat.h. @Returns: -<!-- ##### MACRO gtk_notebook_set_page ##### --> -<para> -</para> - -<!-- # Unused Parameters # --> -@notebook: -@page_num: - - <!-- ##### FUNCTION gtk_notebook_next_page ##### --> <para> </para> diff --git a/gdk-pixbuf/gdk-pixbuf-csource.c b/gdk-pixbuf/gdk-pixbuf-csource.c index e64df4fcb3..ea56798b47 100644 --- a/gdk-pixbuf/gdk-pixbuf-csource.c +++ b/gdk-pixbuf/gdk-pixbuf-csource.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "../gtk/gtkcompat.h" /* versioning */ +#include "../gtk/gtkversion.h" /* versioning */ #include "gdk-pixbuf.h" #include "gdk-pixdata.h" #include <stdio.h> diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 2e2c19b5db..ecfb04ed9c 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -46,7 +46,6 @@ LDFLAGS = @STRIP_BEGIN@ \ gdk_public_h_sources = @STRIP_BEGIN@ \ gdk.h \ gdkcolor.h \ - gdkcompat.h \ gdkcursor.h \ gdkcursors.h \ gdkdnd.h \ @@ -49,8 +49,6 @@ #include <gdk/gdkvisual.h> #include <gdk/gdkwindow.h> -#include <gdk/gdkcompat.h> - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h index 3c676f7772..be2778c3fa 100644 --- a/gdk/gdkcursor.h +++ b/gdk/gdkcursor.h @@ -39,6 +39,10 @@ GdkCursor* gdk_cursor_new_from_pixmap (GdkPixmap *source, GdkCursor* gdk_cursor_ref (GdkCursor *cursor); void gdk_cursor_unref (GdkCursor *cursor); +#ifndef GDK_DISABLE_DEPRECATED +#define gdk_cursor_destroy gdk_cursor_unref +#endif /* GDK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h index 47b09adeb4..06d79e2452 100644 --- a/gdk/gdkdrawable.h +++ b/gdk/gdkdrawable.h @@ -274,6 +274,11 @@ void gdk_draw_layout_with_colors (GdkDrawable *drawable, GdkColor *foreground, GdkColor *background); +#ifndef GDK_DISABLE_DEPRECATED +#define gdk_draw_pixmap gdk_draw_drawable +#define gdk_draw_bitmap gdk_draw_drawable +#endif /* GDK_DISABLE_DEPRECATED */ + GdkImage* gdk_drawable_get_image (GdkDrawable *drawable, gint x, gint y, diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h index e55a41e0ea..997809fc9a 100644 --- a/gdk/gdkgc.h +++ b/gdk/gdkgc.h @@ -252,6 +252,10 @@ void gdk_gc_set_rgb_fg_color (GdkGC *gc, void gdk_gc_set_rgb_bg_color (GdkGC *gc, GdkColor *color); +#ifndef GDK_DISABLE_DEPRECATED +#define gdk_gc_destroy gdk_gc_unref +#endif /* GDK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/gdk/gdkimage.h b/gdk/gdkimage.h index 3812db988a..81e4679dd6 100644 --- a/gdk/gdkimage.h +++ b/gdk/gdkimage.h @@ -95,6 +95,10 @@ GdkImage* gdk_image_new_bitmap (GdkVisual *visual, gint height); #endif /* GDK_ENABLE_BROKEN */ +#ifndef GDK_DISABLE_DEPRECATED +#define gdk_image_destroy gdk_image_unref +#endif /* GDK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/gdk/gdkpixmap.h b/gdk/gdkpixmap.h index abb044fd79..e02aa634d2 100644 --- a/gdk/gdkpixmap.h +++ b/gdk/gdkpixmap.h @@ -73,6 +73,13 @@ GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkWindow *window, GdkColor *transparent_color, gchar **data); +#ifndef GDK_DISABLE_DEPRECATED +#define gdk_bitmap_ref gdk_drawable_ref +#define gdk_bitmap_unref gdk_drawable_unref +#define gdk_pixmap_ref gdk_drawable_ref +#define gdk_pixmap_unref gdk_drawable_unref +#endif /* GDK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/gdk/gdkrgb.h b/gdk/gdkrgb.h index 5a41b3f63b..7b1a1c60ab 100644 --- a/gdk/gdkrgb.h +++ b/gdk/gdkrgb.h @@ -51,6 +51,7 @@ void gdk_rgb_gc_set_foreground (GdkGC *gc, guint32 rgb); void gdk_rgb_gc_set_background (GdkGC *gc, guint32 rgb); +#define gdk_rgb_get_cmap gdk_rgb_get_colormap #endif /* GDK_DISABLE_DEPRECATED */ void gdk_rgb_find_color (GdkColormap *colormap, diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index 425cfe871d..e6f6bf5a7d 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -516,6 +516,20 @@ void gdk_window_get_internal_paint_info (GdkWindow *window, GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks); + +#ifndef GDK_DISABLE_DEPRECATED +#define gdk_window_get_size gdk_drawable_get_size +#define gdk_window_get_type gdk_window_get_window_type +#define gdk_window_get_colormap gdk_drawable_get_colormap +#define gdk_window_set_colormap gdk_drawable_set_colormap +#define gdk_window_get_visual gdk_drawable_get_visual +#define gdk_window_ref gdk_drawable_ref +#define gdk_window_unref gdk_drawable_unref + +#define gdk_window_copy_area(drawable,gc,x,y,source_drawable,source_x,source_y,width,height) \ + gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height) +#endif /* GDK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/gdk/makefile.msc b/gdk/makefile.msc index dd6c377fc6..ecfa223377 100644 --- a/gdk/makefile.msc +++ b/gdk/makefile.msc @@ -85,7 +85,6 @@ gdk_OBJECTS = \ gdk_public_h_sources = \ gdk.h \ gdkcolor.h \ - gdkcompat.h \ gdkcursor.h \ gdkcursors.h \ gdkdnd.h \ diff --git a/gtk/.cvsignore b/gtk/.cvsignore index 3a84e3c073..461b0f27d8 100644 --- a/gtk/.cvsignore +++ b/gtk/.cvsignore @@ -7,7 +7,7 @@ makefile.msc _libs .libs libgtk-*.la -gtkcompat.h +gtkversion.h libgtk.la gtkfeatures.h gtkmarshal.h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 0ea53da902..b4124e6a64 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -4,7 +4,6 @@ SUBDIRS=stock-icons INCLUDES = @STRIP_BEGIN@ \ -DG_LOG_DOMAIN=\"Gtk\" \ - -DGTK_DISABLE_COMPAT_H \ -DGTK_LIBDIR=\"$(libdir)\" \ -DGTK_DATA_PREFIX=\"$(prefix)\" \ -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ @@ -388,7 +387,7 @@ gtk_built_sources = @STRIP_BEGIN@ \ # that don't serve as direct make target sources, i.e. they don't have # their own .lo rules and don't get publically installed gtk_extra_sources = @STRIP_BEGIN@ \ - gtkcompat.h.in \ + gtkversion.h.in \ maketypes.awk \ makeenums.h \ gtk-boxed.defs \ @@ -399,7 +398,7 @@ gtk_extra_sources = @STRIP_BEGIN@ \ # # setup GTK+ sources and their dependancies # -gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkcompat.h +gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkversion.h gtk_target_sources = $(gtk_c_sources) $(gtk_plug_c_sources) MAINTAINERCLEANFILES += $(gtk_built_sources) EXTRA_HEADERS += @@ -54,7 +54,6 @@ #include <gtk/gtkcolorsel.h> #include <gtk/gtkcolorseldialog.h> #include <gtk/gtkcombo.h> -#include <gtk/gtkcompat.h> #include <gtk/gtkcontainer.h> #include <gtk/gtkctree.h> #include <gtk/gtkcurve.h> @@ -150,6 +149,7 @@ #include <gtk/gtktypeutils.h> #include <gtk/gtkvbox.h> #include <gtk/gtkvbbox.h> +#include <gtk/gtkversion.h> #include <gtk/gtkviewport.h> #include <gtk/gtkvpaned.h> #include <gtk/gtkvruler.h> diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h index 65dc533bda..5a9b779aac 100644 --- a/gtk/gtkaccellabel.h +++ b/gtk/gtkaccellabel.h @@ -75,6 +75,9 @@ struct _GtkAccelLabelClass guint latin1_to_char : 1; }; +#ifndef GTK_DISABLE_DEPRECATED +#define gtk_accel_label_accelerator_width gtk_accel_label_get_accel_width +#endif /* GTK_DISABLE_DEPRECATED */ GtkType gtk_accel_label_get_type (void) G_GNUC_CONST; GtkWidget *gtk_accel_label_new (const gchar *string); diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h index 3e3fabc979..bfa2a090b2 100644 --- a/gtk/gtkcheckmenuitem.h +++ b/gtk/gtkcheckmenuitem.h @@ -83,6 +83,7 @@ gboolean gtk_check_menu_item_get_inconsistent (GtkCheckMenuItem *check_menu_i #ifndef GTK_DISABLE_DEPRECATED void gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item, gboolean always); +#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active #endif #ifdef __cplusplus diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index 34f0b07f83..a4651c0aa7 100644 --- a/gtk/gtkcontainer.h +++ b/gtk/gtkcontainer.h @@ -206,6 +206,10 @@ gchar* gtk_container_child_composite_name (GtkContainer *container, GtkWidget *child); void _gtk_container_dequeue_resize_handler (GtkContainer *container); +#ifndef GTK_DISABLE_DEPRECATED +#define gtk_container_border_width gtk_container_set_border_width +#endif /* GTK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h index 5276bf2d89..6763ea9f1e 100644 --- a/gtk/gtkctree.h +++ b/gtk/gtkctree.h @@ -430,6 +430,7 @@ void gtk_ctree_sort_recursive (GtkCTree *ctree, GtkCTreeNode *node); +#define gtk_ctree_set_reorderable(t,r) gtk_clist_set_reorderable((GtkCList*) (t),(r)) #ifdef __cplusplus } diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 5ba51e54fe..03524a3b28 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -133,12 +133,9 @@ void gtk_label_get_layout_offsets (GtkLabel *label, gint *y); -#ifndef GTK_DISABLE_COMPAT_H -# define gtk_label_set gtk_label_set_text -#endif /* GTK_DISABLE_COMPAT_H */ - #ifndef GTK_DISABLE_DEPRECATED -/* Deprecated */ + +#define gtk_label_set gtk_label_set_text void gtk_label_get (GtkLabel *label, char **str); diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 7cbb69974d..c4b40b0951 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -40,7 +40,7 @@ #include <unistd.h> #endif #include "gtkdnd.h" -#include "gtkcompat.h" +#include "gtkversion.h" #include "gtkmain.h" #include "gtkrc.h" #include "gtkselection.h" diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h index 75f51c2a8c..9acfb410b0 100644 --- a/gtk/gtkmenu.h +++ b/gtk/gtkmenu.h @@ -178,6 +178,12 @@ void gtk_menu_reorder_child (GtkMenu *menu, GtkWidget *child, gint position); +#ifndef GTK_DISABLE_DEPRECATED +#define gtk_menu_append gtk_menu_shell_append +#define gtk_menu_prepend gtk_menu_shell_prepend +#define gtk_menu_insert gtk_menu_shell_insert +#endif /* GTK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index 651db4534b..cead604b3b 100644 --- a/gtk/gtknotebook.h +++ b/gtk/gtknotebook.h @@ -222,6 +222,10 @@ void gtk_notebook_reorder_child (GtkNotebook *notebook, GtkWidget *child, gint position); +#ifndef GTK_DISABLE_DEPRECATED +#define gtk_notebook_current_page gtk_notebook_get_current_page +#endif /* GTK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/gtk/gtkpacker.h b/gtk/gtkpacker.h index bceefef690..4c30a934d2 100644 --- a/gtk/gtkpacker.h +++ b/gtk/gtkpacker.h @@ -123,6 +123,7 @@ void gtk_packer_set_child_packing (GtkPacker *packer, guint pad_y, guint i_pad_x, guint i_pad_y); +#define gtk_packer_configure gtk_packer_set_child_packing void gtk_packer_reorder_child (GtkPacker *packer, GtkWidget *child, gint position); diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h index a52db32589..673c5b69d6 100644 --- a/gtk/gtkpaned.h +++ b/gtk/gtkpaned.h @@ -105,6 +105,13 @@ void gtk_paned_compute_position (GtkPaned *paned, gint allocation, gint child1_req, gint child2_req); + +#ifndef GTK_DISABLE_DEPRECATED +#define gtk_paned_gutter_size(p,s) (void) 0 +#define gtk_paned_set_gutter_size(p,s) (void) 0 +#define gtk_paned_handle_size gtk_paned_set_handle_size +#endif /* GTK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index b454d2051c..eaed57f151 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -47,7 +47,7 @@ #include <glib.h> #include "gdkconfig.h" -#include "gtkcompat.h" +#include "gtkversion.h" #include "gtkrc.h" #include "gtkbindings.h" #include "gtkthemes.h" diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index bfb099ef1b..b6a8e212cc 100644 --- a/gtk/gtkscale.h +++ b/gtk/gtkscale.h @@ -86,6 +86,10 @@ void _gtk_scale_get_value_size (GtkScale *scale, gchar *_gtk_scale_format_value (GtkScale *scale, gdouble value); +#ifndef GTK_DISABLE_DEPRECATED +#define gtk_scale_value_width gtk_scale_get_value_width +#endif /* GTK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index 291dfdc392..4335e0bb87 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -841,6 +841,7 @@ const GValue* _gtk_style_peek_property_value (GtkStyle *style, /* depprecated */ #ifndef GTK_DISABLE_DEPRECATED +#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) gtk_style_apply_default_background (s,gw,1,st,a,x,y,w,h) void gtk_draw_string (GtkStyle *style, GdkWindow *window, GtkStateType state_type, diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h index c9f8226ada..abc4e6f1fc 100644 --- a/gtk/gtktogglebutton.h +++ b/gtk/gtktogglebutton.h @@ -84,6 +84,10 @@ void gtk_toggle_button_set_inconsistent (GtkToggleButton *toggle_button, gboolean gtk_toggle_button_get_inconsistent (GtkToggleButton *toggle_button); +#ifndef GTK_DISABLE_DEPRECATED +#define gtk_toggle_button_set_state gtk_toggle_button_set_active +#endif /* GTK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h index 3f13ab9d46..4eed3dbac4 100644 --- a/gtk/gtktypeutils.h +++ b/gtk/gtktypeutils.h @@ -72,10 +72,10 @@ typedef enum /*< skip >*/ /* outdated macros that really shouldn't e used anymore, * use the GLib type system instead */ -#ifndef GTK_DISABLE_COMPAT_H +#ifndef GTK_DISABLE_DEPRECATED #define GTK_TYPE_FUNDAMENTAL_LAST (G_TYPE_LAST_RESERVED_FUNDAMENTAL - 1) #define GTK_TYPE_FUNDAMENTAL_MAX (G_TYPE_FUNDAMENTAL_MAX) -#endif /* GTK_DISABLE_COMPAT_H */ +#endif /* GTK_DISABLE_DEPRECATED */ /* glib macro wrappers (compatibility) */ #define GTK_STRUCT_OFFSET G_STRUCT_OFFSET diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 7753d02dd6..457fbdb514 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -250,7 +250,8 @@ void gtk_window_set_policy (GtkWindow *window, gint allow_shrink, gint allow_grow, gint auto_shrink); -#endif +#define gtk_window_position gtk_window_set_position +#endif /* GTK_DISABLE_DEPRECATED */ /* Set initial default size of the window (does not constrain user * resize operations) diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in index 85891a00de..6501bee21d 100644 --- a/gtk/makefile.mingw.in +++ b/gtk/makefile.mingw.in @@ -34,7 +34,7 @@ AWK = awk INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) -DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DGTK_VERSION=\"@GTK_VERSION@\" +DEFINES = -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DGTK_VERSION=\"@GTK_VERSION@\" GLIB_GENMARSHAL = $(GLIB)/gobject/glib-genmarshal.exe diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index cec02d5c45..80c451ec1e 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -29,7 +29,7 @@ DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(A LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG) # Some files use near as an identifier # Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only -DEFINES = -DG_ENABLE_DEBUG -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\" +DEFINES = -DG_ENABLE_DEBUG -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\" TOUCH = copy makefile.msc+nul @@ -341,7 +341,7 @@ gtk_public_h_sources = \ # these aren't use here, but listed for reference gtk_extra_sources = \ - gtkcompat.h \ + gtkversion.h \ maketypes.awk \ makeenums.h \ gtk-boxed.defs \ diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index e5c31b4950..06e3be983d 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -4,7 +4,6 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -I$(top_builddir)/gdk \ - -DGTK_DISABLE_COMPAT_H \ -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 47ac8b8096..bf71bb654a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,7 +4,6 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -I$(top_srcdir)/gdk \ - -DGTK_DISABLE_COMPAT_H \ @GTK_DEBUG_FLAGS@ \ @GTK_DEP_CFLAGS@ \ @STRIP_END@ |