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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
......
......@@ -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
......
......@@ -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@ \
......
......@@ -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@ \
......
......@@ -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!");
......
......@@ -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,
......
......@@ -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,
......
......@@ -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");
......
......@@ -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");
......
......@@ -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@
......
......@@ -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>
......
......@@ -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.
......
......@@ -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>
......
......@@ -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>
......
......@@ -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 */
......
......@@ -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 */
......
......@@ -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,
......
......@@ -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 */
......
......@@ -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 */
......
......@@ -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 */
......
......@@ -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,
......
......@@ -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 */
......
......@@ -85,7 +85,6 @@ gdk_OBJECTS = \
gdk_public_h_sources = \
gdk.h \
gdkcolor.h \
gdkcompat.h \
gdkcursor.h \
gdkcursors.h \
gdkdnd.h \
......
......@@ -7,7 +7,7 @@ makefile.msc
_libs
.libs
libgtk-*.la
gtkcompat.h
gtkversion.h
libgtk.la
gtkfeatures.h
gtkmarshal.h
......
......@@ -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>
......
......@@ -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);
......
......@@ -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
......
......@@ -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 */
......
......@@ -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
}
......
......@@ -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);
......
......@@ -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"
......
......@@ -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 */
......
......@@ -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 */
......
......@@ -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);
......
......@@ -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 */
......
......@@ -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"
......
......@@ -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 */
......
......@@ -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,
......
......@@ -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 */
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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 \
......
......@@ -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@ \
......
......@@ -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@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment