Commit d5b5427c authored by Sebastian Wilhelmi's avatar Sebastian Wilhelmi Committed by Sebastian Wilhelmi

Removed -DGTK_DISABLE_COMPAT_H.


2001-11-02  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* tests/makefile.msc, gtk/makefile.msc.in: Removed
	-DGTK_DISABLE_COMPAT_H.

	* docs/Changes-2.0.txt:
	s/GDK_DISABLE_COMPAT_H/GDK_DISABLE_DEPRECATED/

	* gtk/gtkcompat.h.in, gdk/gdkcompat.h: Removed from CVS.
parent ca21695f
2001-11-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* tests/makefile.msc, gtk/makefile.msc.in: Removed
-DGTK_DISABLE_COMPAT_H.
* docs/Changes-2.0.txt:
s/GDK_DISABLE_COMPAT_H/GDK_DISABLE_DEPRECATED/
* gtk/gtkcompat.h.in, gdk/gdkcompat.h: Removed from CVS.
Fri Nov 2 10:21:03 2001 Owen Taylor <otaylor@redhat.com>
* examples/**/Makefile.am: Convert to use pkg-config
......
2001-11-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* tests/makefile.msc, gtk/makefile.msc.in: Removed
-DGTK_DISABLE_COMPAT_H.
* docs/Changes-2.0.txt:
s/GDK_DISABLE_COMPAT_H/GDK_DISABLE_DEPRECATED/
* gtk/gtkcompat.h.in, gdk/gdkcompat.h: Removed from CVS.
Fri Nov 2 10:21:03 2001 Owen Taylor <otaylor@redhat.com>
* examples/**/Makefile.am: Convert to use pkg-config
......
2001-11-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* tests/makefile.msc, gtk/makefile.msc.in: Removed
-DGTK_DISABLE_COMPAT_H.
* docs/Changes-2.0.txt:
s/GDK_DISABLE_COMPAT_H/GDK_DISABLE_DEPRECATED/
* gtk/gtkcompat.h.in, gdk/gdkcompat.h: Removed from CVS.
Fri Nov 2 10:21:03 2001 Owen Taylor <otaylor@redhat.com>
* examples/**/Makefile.am: Convert to use pkg-config
......
2001-11-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* tests/makefile.msc, gtk/makefile.msc.in: Removed
-DGTK_DISABLE_COMPAT_H.
* docs/Changes-2.0.txt:
s/GDK_DISABLE_COMPAT_H/GDK_DISABLE_DEPRECATED/
* gtk/gtkcompat.h.in, gdk/gdkcompat.h: Removed from CVS.
Fri Nov 2 10:21:03 2001 Owen Taylor <otaylor@redhat.com>
* examples/**/Makefile.am: Convert to use pkg-config
......
2001-11-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* tests/makefile.msc, gtk/makefile.msc.in: Removed
-DGTK_DISABLE_COMPAT_H.
* docs/Changes-2.0.txt:
s/GDK_DISABLE_COMPAT_H/GDK_DISABLE_DEPRECATED/
* gtk/gtkcompat.h.in, gdk/gdkcompat.h: Removed from CVS.
Fri Nov 2 10:21:03 2001 Owen Taylor <otaylor@redhat.com>
* examples/**/Makefile.am: Convert to use pkg-config
......
2001-11-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* tests/makefile.msc, gtk/makefile.msc.in: Removed
-DGTK_DISABLE_COMPAT_H.
* docs/Changes-2.0.txt:
s/GDK_DISABLE_COMPAT_H/GDK_DISABLE_DEPRECATED/
* gtk/gtkcompat.h.in, gdk/gdkcompat.h: Removed from CVS.
Fri Nov 2 10:21:03 2001 Owen Taylor <otaylor@redhat.com>
* examples/**/Makefile.am: Convert to use pkg-config
......
2001-11-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* tests/makefile.msc, gtk/makefile.msc.in: Removed
-DGTK_DISABLE_COMPAT_H.
* docs/Changes-2.0.txt:
s/GDK_DISABLE_COMPAT_H/GDK_DISABLE_DEPRECATED/
* gtk/gtkcompat.h.in, gdk/gdkcompat.h: Removed from CVS.
Fri Nov 2 10:21:03 2001 Owen Taylor <otaylor@redhat.com>
* examples/**/Makefile.am: Convert to use pkg-config
......
......@@ -191,7 +191,7 @@ Incompatible Changes from GTK+-1.2 to GTK+-2.0:
* A number of functions in GDK have been renamed for consistency and
clarity. #defines to provide backwards compatibility have been
included, but can be disabled by defineing GDK_DISABLE_COMPAT_H.
included, but can be disabled by defineing GDK_DISABLE_DEPRECATED.
#define gdk_draw_pixmap gdk_draw_drawable
#define gdk_draw_bitmap gdk_draw_drawable
......
#ifndef __GDK_COMPAT_H__
#define __GDK_COMPAT_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* use -DGDK_DISABLE_COMPAT_H to compile your code and assure that it
* works with future GTK+ versions as well.
*/
#ifndef GDK_DISABLE_COMPAT_H
#define gdk_draw_pixmap gdk_draw_drawable
#define gdk_draw_bitmap gdk_draw_drawable
#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_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
#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)
#define gdk_gc_destroy gdk_gc_unref
#define gdk_image_destroy gdk_image_unref
#define gdk_cursor_destroy gdk_cursor_unref
#define gdk_rgb_get_cmap gdk_rgb_get_colormap
#endif /* GDK_DISABLE_COMPAT_H */
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GDK_COMPAT_H__ */
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_COMPAT_H__
#define __GTK_COMPAT_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* compile time version
*/
#define GTK_MAJOR_VERSION (@GTK_MAJOR_VERSION@)
#define GTK_MINOR_VERSION (@GTK_MINOR_VERSION@)
#define GTK_MICRO_VERSION (@GTK_MICRO_VERSION@)
#define GTK_BINARY_AGE (@GTK_BINARY_AGE@)
#define GTK_INTERFACE_AGE (@GTK_INTERFACE_AGE@)
/* check whether a Gtk+ version equal to or greater than
* major.minor.micro is present.
*/
#define GTK_CHECK_VERSION(major,minor,micro) \
(GTK_MAJOR_VERSION > (major) || \
(GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \
(GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \
GTK_MICRO_VERSION >= (micro)))
/* use -DGTK_DISABLE_COMPAT_H to compile your code and asure that it
* works with future Gtk+ versions as well.
*/
#ifndef GTK_DISABLE_COMPAT_H
/* the following are aliases that have to be kept for historical
* reasons, because a wide code base depends on them. it is not
* recommended to actually make use of these definitions.
*/
#define gtk_accel_label_accelerator_width gtk_accel_label_get_accel_width
#define gtk_container_border_width gtk_container_set_border_width
#define gtk_notebook_current_page gtk_notebook_get_current_page
#define gtk_notebook_set_page gtk_notebook_set_current_page
#define gtk_packer_configure gtk_packer_set_child_packing
#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
#define gtk_scale_value_width gtk_scale_get_value_width
#define gtk_window_position gtk_window_set_position
#define gtk_toggle_button_set_state gtk_toggle_button_set_active
#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active
#define gtk_menu_append gtk_menu_shell_append
#define gtk_menu_prepend gtk_menu_shell_prepend
#define gtk_menu_insert gtk_menu_shell_insert
#define GTK_TYPE_GDK_WINDOW_TYPE GDK_TYPE_WINDOW_TYPE
#define GTK_TYPE_GDK_WINDOW_CLASS GDK_TYPE_WINDOW_CLASS
#define GTK_TYPE_GDK_IMAGE_TYPE GDK_TYPE_IMAGE_TYPE
#define GTK_TYPE_GDK_VISUAL_TYPE GDK_TYPE_VISUAL_TYPE
#define GTK_TYPE_GDK_FONT_TYPE GDK_TYPE_FONT_TYPE
#define GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE GDK_TYPE_WINDOW_ATTRIBUTES_TYPE
#define GTK_TYPE_GDK_WINDOW_HINTS GDK_TYPE_WINDOW_HINTS
#define GTK_TYPE_GDK_FUNCTION GDK_TYPE_FUNCTION
#define GTK_TYPE_GDK_FILL GDK_TYPE_FILL
#define GTK_TYPE_GDK_FILL_RULE GDK_TYPE_FILL_RULE
#define GTK_TYPE_GDK_LINE_STYLE GDK_TYPE_LINE_STYLE
#define GTK_TYPE_GDK_CAP_STYLE GDK_TYPE_CAP_STYLE
#define GTK_TYPE_GDK_JOIN_STYLE GDK_TYPE_JOIN_STYLE
#define GTK_TYPE_GDK_CURSOR_TYPE GDK_TYPE_CURSOR_TYPE
#define GTK_TYPE_GDK_FILTER_RETURN GDK_TYPE_FILTER_RETURN
#define GTK_TYPE_GDK_VISIBILITY_STATE GDK_TYPE_VISIBILITY_STATE
#define GTK_TYPE_GDK_EVENT_TYPE GDK_TYPE_EVENT_TYPE
#define GTK_TYPE_GDK_EVENT_MASK GDK_TYPE_EVENT_MASK
#define GTK_TYPE_GDK_NOTIFY_TYPE GDK_TYPE_NOTIFY_TYPE
#define GTK_TYPE_GDK_CROSSING_MODE GDK_TYPE_CROSSING_MODE
#define GTK_TYPE_GDK_MODIFIER_TYPE GDK_TYPE_MODIFIER_TYPE
#define GTK_TYPE_GDK_SUBWINDOW_MODE GDK_TYPE_SUBWINDOW_MODE
#define GTK_TYPE_GDK_INPUT_CONDITION GDK_TYPE_INPUT_CONDITION
#define GTK_TYPE_GDK_STATUS GDK_TYPE_STATUS
#define GTK_TYPE_GDK_BYTE_ORDER GDK_TYPE_BYTE_ORDER
#define GTK_TYPE_GDK_GC_VALUES_MASK GDK_TYPE_GC_VALUES_MASK
#define GTK_TYPE_GDK_SELECTION GDK_TYPE_SELECTION
#define GTK_TYPE_GDK_PROPERTY_STATE GDK_TYPE_PROPERTY_STATE
#define GTK_TYPE_GDK_PROP_MODE GDK_TYPE_PROP_MODE
#define GTK_TYPE_GDK_INPUT_SOURCE GDK_TYPE_INPUT_SOURCE
#define GTK_TYPE_GDK_INPUT_MODE GDK_TYPE_INPUT_MODE
#define GTK_TYPE_GDK_AXIS_USE GDK_TYPE_AXIS_USE
#define GTK_TYPE_GDK_TARGET GDK_TYPE_TARGET
#define GTK_TYPE_GDK_SELECTION_TYPE GDK_TYPE_SELECTION_TYPE
#define GTK_TYPE_GDK_EXTENSION_MODE GDK_TYPE_EXTENSION_MODE
#define GTK_TYPE_GDK_WM_DECORATION GDK_TYPE_WM_DECORATION
#define GTK_TYPE_GDK_WM_FUNCTION GDK_TYPE_WM_FUNCTION
#define GTK_TYPE_GDK_OVERLAP_TYPE GDK_TYPE_OVERLAP_TYPE
#define GTK_TYPE_GDK_DRAG_ACTION GDK_TYPE_DRAG_ACTION
#define GTK_TYPE_GDK_DRAG_PROTOCOL GDK_TYPE_DRAG_PROTOCOL
#define GTK_TYPE_GDK_RGB_DITHER GDK_TYPE_RGB_DITHER
#define GTK_TYPE_GDK_COLORMAP GDK_TYPE_COLORMAP
#define GTK_TYPE_GDK_VISUAL GDK_TYPE_VISUAL
#define GTK_TYPE_GDK_FONT GDK_TYPE_FONT
#define GTK_TYPE_GDK_WINDOW GDK_TYPE_WINDOW
#define GTK_TYPE_GDK_DRAG_CONTEXT GDK_TYPE_DRAG_CONTEXT
#define GTK_TYPE_GDK_EVENT GDK_TYPE_EVENT
#define GTK_TYPE_GDK_COLOR GDK_TYPE_COLOR
/* strongly deprecated, very likely to be removed in the future:
*/
#define gtk_ctree_set_reorderable(t,r) gtk_clist_set_reorderable((GtkCList*) (t),(r))
#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)
#define GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS 1-0-1
#define GTK_HAVE_SIGNAL_INIT 1-0-2
#define GTK_HAVE_FEATURES_1_1_0 1-1-0
#define GTK_HAVE_FEATURES_1_1_2 1-1-2
#define GTK_HAVE_FEATURES_1_1_4 1-1-4
#define GTK_HAVE_FEATURES_1_1_5 1-1-5
#define GTK_HAVE_FEATURES_1_1_6 1-1-6
#define GTK_HAVE_FEATURES_1_1_7 1-1-7
#define GTK_HAVE_FEATURES_1_1_8 1-1-8
#define GTK_HAVE_FEATURES_1_1_9 1-1-9
#define GTK_HAVE_FEATURES_1_1_10 1-1-10
#define GTK_HAVE_FEATURES_1_1_11 1-1-11
#define GTK_HAVE_FEATURES_1_1_12 1-1-12
#define GTK_HAVE_FEATURES_1_1_13 1-1-13
#define GTK_HAVE_FEATURES_1_1_14 1-1-14
#endif /* GTK_DISABLE_COMPAT_H */
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GTK_COMPAT_H__ */
......@@ -30,7 +30,7 @@ DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \
LDFLAGS = $(ATK_LIBS) $(DIRENT_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 = $(G_DEBUGGING) -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\"
DEFINES = $(G_DEBUGGING) -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\"
TOUCH = copy makefile.msc+nul
......
......@@ -21,7 +21,7 @@ GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf -I ../gtk
DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS)
LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
DEFINES = -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"GtkTest\" -DGTK_VERSION=\"$(GTK_VER)\"
DEFINES = -DG_LOG_DOMAIN=\"GtkTest\" -DGTK_VERSION=\"$(GTK_VER)\"
TOUCH = copy makefile.msc+nul
......@@ -71,4 +71,4 @@ $(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).dll $(TESTAPP).obj
$(TESTAPP).obj : $(TESTAPP).c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(TESTAPP)\" $(TESTAPP).c
!ENDIF
\ No newline at end of file
!ENDIF
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