Commit a2d60d44 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

[ 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.
parent 34852377
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> Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
......
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> Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
......
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> Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
......
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> Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
......
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> Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
......
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> Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
......
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> Wed Aug 22 19:03:27 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
......
...@@ -1158,7 +1158,7 @@ gdk/linux-fb/Makefile ...@@ -1158,7 +1158,7 @@ gdk/linux-fb/Makefile
gtk/Makefile gtk/Makefile
gtk/makefile.mingw gtk/makefile.mingw
gtk/makefile.msc gtk/makefile.msc
gtk/gtkcompat.h gtk/gtkversion.h
gtk/gtk-win32.rc gtk/gtk-win32.rc
gtk/stock-icons/Makefile gtk/stock-icons/Makefile
modules/Makefile modules/Makefile
......
...@@ -5,7 +5,8 @@ SUBDIRS = gtk-demo ...@@ -5,7 +5,8 @@ SUBDIRS = gtk-demo
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-DGTK_DISABLE_COMPAT_H \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \ @GTK_DEBUG_FLAGS@ \
@GTK_DEP_CFLAGS@ \ @GTK_DEP_CFLAGS@ \
......
...@@ -25,9 +25,7 @@ INCLUDES = @STRIP_BEGIN@ \ ...@@ -25,9 +25,7 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_COMPAT_H \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_COMPAT_H \
-DGTK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \ @GTK_DEBUG_FLAGS@ \
@GTK_DEP_CFLAGS@ \ @GTK_DEP_CFLAGS@ \
......
...@@ -202,7 +202,6 @@ main (int argc, char **argv) ...@@ -202,7 +202,6 @@ main (int argc, char **argv)
pixbuf_init (); pixbuf_init ();
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
gdk_rgb_init ();
if (!load_pixbufs ()) { if (!load_pixbufs ()) {
g_message ("main(): Could not load all the pixbufs!"); g_message ("main(): Could not load all the pixbufs!");
......
...@@ -86,9 +86,8 @@ int main(int argc, char **argv) ...@@ -86,9 +86,8 @@ int main(int argc, char **argv)
gtk_init(&argc, &argv); gtk_init(&argc, &argv);
gdk_rgb_set_verbose(TRUE); 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(); root = GDK_ROOT_PARENT();
pixbuf = gdk_pixbuf_get_from_drawable(NULL, root, NULL, pixbuf = gdk_pixbuf_get_from_drawable(NULL, root, NULL,
......
...@@ -126,7 +126,7 @@ main (int argc, char **argv) ...@@ -126,7 +126,7 @@ main (int argc, char **argv)
gtk_init (&argc, &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 (); root = GDK_ROOT_PARENT ();
pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL, pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
......
...@@ -68,7 +68,6 @@ main(int argc, char **argv) ...@@ -68,7 +68,6 @@ main(int argc, char **argv)
pixbuf_init (); pixbuf_init ();
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
gdk_rgb_init ();
if (argc != 2) { if (argc != 2) {
fprintf (stderr, "Usage: testpixbuf-scale FILE\n"); fprintf (stderr, "Usage: testpixbuf-scale FILE\n");
......
...@@ -520,9 +520,7 @@ main (int argc, char **argv) ...@@ -520,9 +520,7 @@ main (int argc, char **argv)
gdk_rgb_set_verbose (TRUE); gdk_rgb_set_verbose (TRUE);
gdk_rgb_init (); gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
{ {
char *tbf_readlen = getenv("TBF_READLEN"); char *tbf_readlen = getenv("TBF_READLEN");
......
...@@ -52,7 +52,6 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@ \ ...@@ -52,7 +52,6 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-DGTK_DISABLE_COMPAT_H \
@GTK_DEBUG_FLAGS@ \ @GTK_DEBUG_FLAGS@ \
@GTK_DEP_CFLAGS@ \ @GTK_DEP_CFLAGS@ \
@STRIP_END@ @STRIP_END@
......
...@@ -3244,22 +3244,6 @@ GTK_MICRO_VERSION ...@@ -3244,22 +3244,6 @@ GTK_MICRO_VERSION
GTK_BINARY_AGE GTK_BINARY_AGE
GTK_INTERFACE_AGE GTK_INTERFACE_AGE
GTK_CHECK_VERSION 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> </SECTION>
......
...@@ -1613,6 +1613,13 @@ Get the type of GtkIdentifier. ...@@ -1613,6 +1613,13 @@ Get the type of GtkIdentifier.
@menu: @menu:
@Returns: @Returns:
<!-- ##### MACRO gtk_notebook_set_page ##### -->
<para>
</para>
@notebook:
@page_num:
<!-- ##### FUNCTION gtk_object_arg_get ##### --> <!-- ##### FUNCTION gtk_object_arg_get ##### -->
<para> <para>
Private function to get an argument and argument info from an object. Private function to get an argument and argument info from an object.
......
...@@ -118,7 +118,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook. ...@@ -118,7 +118,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
<!-- ##### MACRO gtk_notebook_current_page ##### --> <!-- ##### MACRO gtk_notebook_current_page ##### -->
<para> <para>
Compatibility macro; in gtkcompat.h. Deprecated compatibility macro.
</para> </para>
...@@ -132,15 +132,6 @@ Compatibility macro; in gtkcompat.h. ...@@ -132,15 +132,6 @@ Compatibility macro; in gtkcompat.h.
@Returns: @Returns:
<!-- ##### MACRO gtk_notebook_set_page ##### -->
<para>
</para>
<!-- # Unused Parameters # -->
@notebook:
@page_num:
<!-- ##### FUNCTION gtk_notebook_next_page ##### --> <!-- ##### FUNCTION gtk_notebook_next_page ##### -->
<para> <para>
</para> </para>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "../gtk/gtkcompat.h" /* versioning */ #include "../gtk/gtkversion.h" /* versioning */
#include "gdk-pixbuf.h" #include "gdk-pixbuf.h"
#include "gdk-pixdata.h" #include "gdk-pixdata.h"
#include <stdio.h> #include <stdio.h>
......
...@@ -46,7 +46,6 @@ LDFLAGS = @STRIP_BEGIN@ \ ...@@ -46,7 +46,6 @@ LDFLAGS = @STRIP_BEGIN@ \
gdk_public_h_sources = @STRIP_BEGIN@ \ gdk_public_h_sources = @STRIP_BEGIN@ \
gdk.h \ gdk.h \
gdkcolor.h \ gdkcolor.h \
gdkcompat.h \
gdkcursor.h \ gdkcursor.h \
gdkcursors.h \ gdkcursors.h \
gdkdnd.h \ gdkdnd.h \
......
...@@ -49,8 +49,6 @@ ...@@ -49,8 +49,6 @@
#include <gdk/gdkvisual.h> #include <gdk/gdkvisual.h>
#include <gdk/gdkwindow.h> #include <gdk/gdkwindow.h>
#include <gdk/gdkcompat.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
......
...@@ -39,6 +39,10 @@ GdkCursor* gdk_cursor_new_from_pixmap (GdkPixmap *source, ...@@ -39,6 +39,10 @@ GdkCursor* gdk_cursor_new_from_pixmap (GdkPixmap *source,
GdkCursor* gdk_cursor_ref (GdkCursor *cursor); GdkCursor* gdk_cursor_ref (GdkCursor *cursor);
void gdk_cursor_unref (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 #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
......
...@@ -274,6 +274,11 @@ void gdk_draw_layout_with_colors (GdkDrawable *drawable, ...@@ -274,6 +274,11 @@ void gdk_draw_layout_with_colors (GdkDrawable *drawable,
GdkColor *foreground, GdkColor *foreground,
GdkColor *background); 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, GdkImage* gdk_drawable_get_image (GdkDrawable *drawable,
gint x, gint x,
gint y, gint y,
......
...@@ -252,6 +252,10 @@ void gdk_gc_set_rgb_fg_color (GdkGC *gc, ...@@ -252,6 +252,10 @@ void gdk_gc_set_rgb_fg_color (GdkGC *gc,
void gdk_gc_set_rgb_bg_color (GdkGC *gc, void gdk_gc_set_rgb_bg_color (GdkGC *gc,
GdkColor *color); GdkColor *color);
#ifndef GDK_DISABLE_DEPRECATED
#define gdk_gc_destroy gdk_gc_unref
#endif /* GDK_DISABLE_DEPRECATED */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
......
...@@ -95,6 +95,10 @@ GdkImage* gdk_image_new_bitmap (GdkVisual *visual, ...@@ -95,6 +95,10 @@ GdkImage* gdk_image_new_bitmap (GdkVisual *visual,
gint height); gint height);
#endif /* GDK_ENABLE_BROKEN */ #endif /* GDK_ENABLE_BROKEN */
#ifndef GDK_DISABLE_DEPRECATED
#define gdk_image_destroy gdk_image_unref
#endif /* GDK_DISABLE_DEPRECATED */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
......
...@@ -73,6 +73,13 @@ GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkWindow *window, ...@@ -73,6 +73,13 @@ GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkWindow *window,
GdkColor *transparent_color, GdkColor *transparent_color,
gchar **data); 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 #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
......
...@@ -51,6 +51,7 @@ void gdk_rgb_gc_set_foreground (GdkGC *gc, ...@@ -51,6 +51,7 @@ void gdk_rgb_gc_set_foreground (GdkGC *gc,
guint32 rgb); guint32 rgb);
void gdk_rgb_gc_set_background (GdkGC *gc, void gdk_rgb_gc_set_background (GdkGC *gc,
guint32 rgb); guint32 rgb);
#define gdk_rgb_get_cmap gdk_rgb_get_colormap
#endif /* GDK_DISABLE_DEPRECATED */ #endif /* GDK_DISABLE_DEPRECATED */
void gdk_rgb_find_color (GdkColormap *colormap, void gdk_rgb_find_color (GdkColormap *colormap,
......
...@@ -516,6 +516,20 @@ void gdk_window_get_internal_paint_info (GdkWindow *window, ...@@ -516,6 +516,20 @@ void gdk_window_get_internal_paint_info (GdkWindow *window,
GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks); 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 #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
......
...@@ -85,7 +85,6 @@ gdk_OBJECTS = \ ...@@ -85,7 +85,6 @@ gdk_OBJECTS = \
gdk_public_h_sources = \ gdk_public_h_sources = \
gdk.h \ gdk.h \
gdkcolor.h \ gdkcolor.h \
gdkcompat.h \
gdkcursor.h \ gdkcursor.h \
gdkcursors.h \ gdkcursors.h \
gdkdnd.h \ gdkdnd.h \
......
...@@ -7,7 +7,7 @@ makefile.msc ...@@ -7,7 +7,7 @@ makefile.msc
_libs _libs
.libs .libs
libgtk-*.la libgtk-*.la
gtkcompat.h gtkversion.h
libgtk.la libgtk.la
gtkfeatures.h gtkfeatures.h
gtkmarshal.h gtkmarshal.h
......
...@@ -4,7 +4,6 @@ SUBDIRS=stock-icons ...@@ -4,7 +4,6 @@ SUBDIRS=stock-icons
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-DG_LOG_DOMAIN=\"Gtk\" \ -DG_LOG_DOMAIN=\"Gtk\" \
-DGTK_DISABLE_COMPAT_H \
-DGTK_LIBDIR=\"$(libdir)\" \ -DGTK_LIBDIR=\"$(libdir)\" \
-DGTK_DATA_PREFIX=\"$(prefix)\" \ -DGTK_DATA_PREFIX=\"$(prefix)\" \
-DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
...@@ -388,7 +387,7 @@ gtk_built_sources = @STRIP_BEGIN@ \ ...@@ -388,7 +387,7 @@ gtk_built_sources = @STRIP_BEGIN@ \
# that don't serve as direct make target sources, i.e. they don't have # 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 # their own .lo rules and don't get publically installed
gtk_extra_sources = @STRIP_BEGIN@ \ gtk_extra_sources = @STRIP_BEGIN@ \
gtkcompat.h.in \ gtkversion.h.in \
maketypes.awk \ maketypes.awk \
makeenums.h \ makeenums.h \
gtk-boxed.defs \ gtk-boxed.defs \
...@@ -399,7 +398,7 @@ gtk_extra_sources = @STRIP_BEGIN@ \ ...@@ -399,7 +398,7 @@ gtk_extra_sources = @STRIP_BEGIN@ \
# #
# setup GTK+ sources and their dependancies # 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) gtk_target_sources = $(gtk_c_sources) $(gtk_plug_c_sources)
MAINTAINERCLEANFILES += $(gtk_built_sources) MAINTAINERCLEANFILES += $(gtk_built_sources)
EXTRA_HEADERS += EXTRA_HEADERS +=
......
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
#include <gtk/gtkcolorsel.h> #include <gtk/gtkcolorsel.h>
#include <gtk/gtkcolorseldialog.h> #include <gtk/gtkcolorseldialog.h>
#include <gtk/gtkcombo.h> #include <gtk/gtkcombo.h>
#include <gtk/gtkcompat.h>
#include <gtk/gtkcontainer.h> #include <gtk/gtkcontainer.h>
#include <gtk/gtkctree.h> #include <gtk/gtkctree.h>
#include <gtk/gtkcurve.h> #include <gtk/gtkcurve.h>
...@@ -150,6 +149,7 @@ ...@@ -150,6 +149,7 @@
#include <gtk/gtktypeutils.h> #include <gtk/gtktypeutils.h>
#include <gtk/gtkvbox.h> #include <gtk/gtkvbox.h>
#include <gtk/gtkvbbox.h> #include <gtk/gtkvbbox.h>
#include <gtk/gtkversion.h>
#include <gtk/gtkviewport.h> #include <gtk/gtkviewport.h>
#include <gtk/gtkvpaned.h> #include <gtk/gtkvpaned.h>
#include <gtk/gtkvruler.h> #include <gtk/gtkvruler.h>
......
...@@ -75,6 +75,9 @@ struct _GtkAccelLabelClass ...@@ -75,6 +75,9 @@ struct _GtkAccelLabelClass
guint latin1_to_char : 1; 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; GtkType gtk_accel_label_get_type (void) G_GNUC_CONST;
GtkWidget *gtk_accel_label_new (const gchar *string); GtkWidget *gtk_accel_label_new (const gchar *string);
......
...@@ -83,6 +83,7 @@ gboolean gtk_check_menu_item_get_inconsistent (GtkCheckMenuItem *check_menu_i ...@@ -83,6 +83,7 @@ gboolean gtk_check_menu_item_get_inconsistent (GtkCheckMenuItem *check_menu_i
#ifndef GTK_DISABLE_DEPRECATED #ifndef GTK_DISABLE_DEPRECATED
void gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item, void gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
gboolean always); gboolean always);
#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -206,6 +206,10 @@ gchar* gtk_container_child_composite_name (GtkContainer *container, ...@@ -206,6 +206,10 @@ gchar* gtk_container_child_composite_name (GtkContainer *container,
GtkWidget *child); GtkWidget *child);
void _gtk_container_dequeue_resize_handler (GtkContainer *container); 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 #ifdef __cplusplus
} }