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 /gdk | |
| 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 'gdk')
| -rw-r--r-- | gdk/Makefile.am | 1 | ||||
| -rw-r--r-- | gdk/gdk.h | 2 | ||||
| -rw-r--r-- | gdk/gdkcursor.h | 4 | ||||
| -rw-r--r-- | gdk/gdkdrawable.h | 5 | ||||
| -rw-r--r-- | gdk/gdkgc.h | 4 | ||||
| -rw-r--r-- | gdk/gdkimage.h | 4 | ||||
| -rw-r--r-- | gdk/gdkpixmap.h | 7 | ||||
| -rw-r--r-- | gdk/gdkrgb.h | 1 | ||||
| -rw-r--r-- | gdk/gdkwindow.h | 14 | ||||
| -rw-r--r-- | gdk/makefile.msc | 1 |
10 files changed, 39 insertions, 4 deletions
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 \ |