From 2d49bbb044de4ad315ba22f7a32a1342ab8c425d Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Wed, 17 Mar 1999 02:43:20 +0000 Subject: [PATCH] build gtkcompat.h from gtkcompat.h.in instead of gtkfeatures.h from Wed Mar 17 02:49:32 1999 Tim Janik * configure.in: build gtkcompat.h from gtkcompat.h.in instead of gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0. * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this file. strongly deprecated the GTK_HAVE_* macros, we provide GTK_CHECK_VERSION() for people that need to check for certain Gtk+ versions. * gtk/gtkcompat.h: removed this from CVS. * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad idea right from the start, it just didn't seem like that back then. --- ChangeLog | 14 +++ ChangeLog.pre-2-0 | 14 +++ ChangeLog.pre-2-10 | 14 +++ ChangeLog.pre-2-2 | 14 +++ ChangeLog.pre-2-4 | 14 +++ ChangeLog.pre-2-6 | 14 +++ ChangeLog.pre-2-8 | 14 +++ configure.in | 6 +- gtk/.cvsignore | 2 +- gtk/Makefile.am | 5 +- gtk/gtk.h | 1 - gtk/gtkcompat.h | 65 -------------- gtk/{gtkfeatures.h.in => gtkcompat.h.in} | 106 ++++++++++------------- gtk/gtkmain.c | 2 +- 14 files changed, 149 insertions(+), 136 deletions(-) delete mode 100644 gtk/gtkcompat.h rename gtk/{gtkfeatures.h.in => gtkcompat.h.in} (55%) diff --git a/ChangeLog b/ChangeLog index 3e96e67fa9..c5a301ecdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Wed Mar 17 02:49:32 1999 Tim Janik + + * configure.in: build gtkcompat.h from gtkcompat.h.in instead of + gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0. + + * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this + file. strongly deprecated the GTK_HAVE_* macros, we provide + GTK_CHECK_VERSION() for people that need to check for certain + Gtk+ versions. + + * gtk/gtkcompat.h: removed this from CVS. + * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad + idea right from the start, it just didn't seem like that back then. + Wed Mar 17 01:46:28 1999 Tim Janik * merges from gtk-1-2: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3e96e67fa9..c5a301ecdb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,17 @@ +Wed Mar 17 02:49:32 1999 Tim Janik + + * configure.in: build gtkcompat.h from gtkcompat.h.in instead of + gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0. + + * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this + file. strongly deprecated the GTK_HAVE_* macros, we provide + GTK_CHECK_VERSION() for people that need to check for certain + Gtk+ versions. + + * gtk/gtkcompat.h: removed this from CVS. + * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad + idea right from the start, it just didn't seem like that back then. + Wed Mar 17 01:46:28 1999 Tim Janik * merges from gtk-1-2: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3e96e67fa9..c5a301ecdb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +Wed Mar 17 02:49:32 1999 Tim Janik + + * configure.in: build gtkcompat.h from gtkcompat.h.in instead of + gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0. + + * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this + file. strongly deprecated the GTK_HAVE_* macros, we provide + GTK_CHECK_VERSION() for people that need to check for certain + Gtk+ versions. + + * gtk/gtkcompat.h: removed this from CVS. + * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad + idea right from the start, it just didn't seem like that back then. + Wed Mar 17 01:46:28 1999 Tim Janik * merges from gtk-1-2: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3e96e67fa9..c5a301ecdb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,17 @@ +Wed Mar 17 02:49:32 1999 Tim Janik + + * configure.in: build gtkcompat.h from gtkcompat.h.in instead of + gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0. + + * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this + file. strongly deprecated the GTK_HAVE_* macros, we provide + GTK_CHECK_VERSION() for people that need to check for certain + Gtk+ versions. + + * gtk/gtkcompat.h: removed this from CVS. + * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad + idea right from the start, it just didn't seem like that back then. + Wed Mar 17 01:46:28 1999 Tim Janik * merges from gtk-1-2: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3e96e67fa9..c5a301ecdb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +Wed Mar 17 02:49:32 1999 Tim Janik + + * configure.in: build gtkcompat.h from gtkcompat.h.in instead of + gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0. + + * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this + file. strongly deprecated the GTK_HAVE_* macros, we provide + GTK_CHECK_VERSION() for people that need to check for certain + Gtk+ versions. + + * gtk/gtkcompat.h: removed this from CVS. + * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad + idea right from the start, it just didn't seem like that back then. + Wed Mar 17 01:46:28 1999 Tim Janik * merges from gtk-1-2: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3e96e67fa9..c5a301ecdb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +Wed Mar 17 02:49:32 1999 Tim Janik + + * configure.in: build gtkcompat.h from gtkcompat.h.in instead of + gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0. + + * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this + file. strongly deprecated the GTK_HAVE_* macros, we provide + GTK_CHECK_VERSION() for people that need to check for certain + Gtk+ versions. + + * gtk/gtkcompat.h: removed this from CVS. + * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad + idea right from the start, it just didn't seem like that back then. + Wed Mar 17 01:46:28 1999 Tim Janik * merges from gtk-1-2: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3e96e67fa9..c5a301ecdb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +Wed Mar 17 02:49:32 1999 Tim Janik + + * configure.in: build gtkcompat.h from gtkcompat.h.in instead of + gtkfeatures.h from gtkfeatures.h.in, require GLib 1.3.0. + + * gtk/gtkcompat.h.in: combined gtkcompat.h and gtkfeatures.in in this + file. strongly deprecated the GTK_HAVE_* macros, we provide + GTK_CHECK_VERSION() for people that need to check for certain + Gtk+ versions. + + * gtk/gtkcompat.h: removed this from CVS. + * gtk/gtkfeatures.h.in: removed this from CVS, gtkfeatures.h was a bad + idea right from the start, it just didn't seem like that back then. + Wed Mar 17 01:46:28 1999 Tim Janik * merges from gtk-1-2: diff --git a/configure.in b/configure.in index dfbd6d33ab..c34744c10c 100644 --- a/configure.in +++ b/configure.in @@ -216,9 +216,9 @@ fi if test x$with_glib = x ; then # Look for separately installed glib - AM_PATH_GLIB(1.2.0,, + AM_PATH_GLIB(1.3.0,, AC_MSG_ERROR([ -*** GLIB 1.2.0 or better is required. The latest version of GLIB +*** GLIB 1.3.0 or better is required. The latest version of GLIB *** is always available from ftp://ftp.gtk.org/.]), gmodule gthread) @@ -588,5 +588,5 @@ po/Makefile.in docs/Makefile gdk/Makefile gtk/Makefile -gtk/gtkfeatures.h +gtk/gtkcompat.h ], [chmod +x gtk-config]) diff --git a/gtk/.cvsignore b/gtk/.cvsignore index 5d15fd6a40..3a9bb5a07f 100644 --- a/gtk/.cvsignore +++ b/gtk/.cvsignore @@ -11,7 +11,7 @@ testselection testrgb simple testtree -gtkfeatures.h +gtkcompat.h testthreads libgtk.la gtkmarshal.h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index c4b61a9f46..ddcebbc0eb 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -138,7 +138,6 @@ source_headers = \ gtkclist.h \ gtkcolorsel.h \ gtkcombo.h \ - gtkcompat.h \ gtkcontainer.h \ gtkctree.h \ gtkcurve.h \ @@ -231,7 +230,7 @@ source_headers = \ gtkinclude_HEADERS = \ $(source_headers) \ - gtkfeatures.h \ + gtkcompat.h \ gtkmarshal.h \ gtktypebuiltins.h @@ -333,7 +332,7 @@ EXTRA_DIST = \ testgtk.1 \ testgtkrc \ testgtkrc2 \ - gtkfeatures.h.in \ + gtkcompat.h.in \ makeenums.pl \ makeenums.awk \ maketypes.awk \ diff --git a/gtk/gtk.h b/gtk/gtk.h index e4a6f24744..e9cecef88a 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include diff --git a/gtk/gtkcompat.h b/gtk/gtkcompat.h deleted file mode 100644 index 613455731b..0000000000 --- a/gtk/gtkcompat.h +++ /dev/null @@ -1,65 +0,0 @@ -/* 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 Library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library 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 */ - - -/* this file contains aliases that have to be kept for historical - * reasons, because a wide code base depends on them. - */ - -#ifndef GTK_DISABLE_COMPAT_H - -#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_packer_configure gtk_packer_set_child_packing -#define gtk_paned_gutter_size gtk_paned_set_gutter_size -#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 - -/* strongly deprecated: */ -#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,TRUE,st,a,x,y,w,h) - -#endif /* GTK_DISABLE_COMPAT_H */ - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GTK_COMPAT_H__ */ diff --git a/gtk/gtkfeatures.h.in b/gtk/gtkcompat.h.in similarity index 55% rename from gtk/gtkfeatures.h.in rename to gtk/gtkcompat.h.in index 9fee280166..cbd603d27c 100644 --- a/gtk/gtkfeatures.h.in +++ b/gtk/gtkcompat.h.in @@ -16,8 +16,16 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#ifndef __GTK_FEATURES_H__ -#define __GTK_FEATURES_H__ + +/* + * 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 @@ -32,6 +40,10 @@ extern "C" { #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)) || \ @@ -39,85 +51,55 @@ extern "C" { GTK_MICRO_VERSION >= (micro))) -/* new gtk_container_set_focus_[hv]adjustment() +/* 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_packer_configure gtk_packer_set_child_packing +#define gtk_paned_gutter_size gtk_paned_set_gutter_size +#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 + + +/* 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 - -/* newly exported gtk_signal_init() - * new gtk_signal_n_emissions*() - * "signal-name" is now an alias for "signal_name" - * new gtk_signal_emitv*() - */ #define GTK_HAVE_SIGNAL_INIT 1-0-2 - -/* Gtk+ 1.1.0 version tag. - * - new gtk_rc_set_image_loader () to install custom image loaders for rc - * files. - * - GtkAccel groups replaced GtkAcceleratorTables - * - Gdk supports full crossing event now. - * - Buttons featur relief styles now. - * - gdk_rgb_*() functions are in place. - * - stringified enum values can be queried for enum types now. - * - new key binding system is in place (GtkBindingSet). - * - simple algorithm for pattern matching is exported now (GtkPatternSpec). - */ #define GTK_HAVE_FEATURES_1_1_0 1-1-0 - -/* Gtk+ 1.1.2 version tag - * - ctree function name changes - */ #define GTK_HAVE_FEATURES_1_1_2 1-1-2 - -/* Gtk+ 1.1.4 version tag - * - clist v/hscrollbar -> v/hadjustment changes - */ #define GTK_HAVE_FEATURES_1_1_4 1-1-4 - -/* Gtk+ 1.1.5 version tag - */ #define GTK_HAVE_FEATURES_1_1_5 1-1-5 - -/* Gtk+ 1.1.6 version tag - */ #define GTK_HAVE_FEATURES_1_1_6 1-1-6 - -/* Gtk+ 1.1.7 version tag - */ #define GTK_HAVE_FEATURES_1_1_7 1-1-7 - -/* Gtk+ 1.1.8 version tag - */ #define GTK_HAVE_FEATURES_1_1_8 1-1-8 - -/* Gtk+ 1.1.9 version tag - */ #define GTK_HAVE_FEATURES_1_1_9 1-1-9 - -/* Gtk+ 1.1.10 version tag - */ #define GTK_HAVE_FEATURES_1_1_10 1-1-10 - -/* Gtk+ 1.1.11 version tag - */ #define GTK_HAVE_FEATURES_1_1_11 1-1-11 - -/* Gtk+ 1.1.12 version tag - */ #define GTK_HAVE_FEATURES_1_1_12 1-1-12 - -/* Gtk+ 1.1.13 version tag - * gtk_toggle_button_set_state name changes - */ #define GTK_HAVE_FEATURES_1_1_13 1-1-13 - -/* Gtk+ 1.1.14 version tag - * working gtk layout, etc - */ #define GTK_HAVE_FEATURES_1_1_14 1-1-14 + +#endif /* GTK_DISABLE_COMPAT_H */ + + + #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GTK_FEATURES_H__ */ +#endif /* __GTK_COMPAT_H__ */ diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index aa6ba38f58..5fad38afde 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -37,7 +37,7 @@ #include #include "gtkbutton.h" #include "gtkdnd.h" -#include "gtkfeatures.h" +#include "gtkcompat.h" #include "gtkhscrollbar.h" #include "gtkhseparator.h" #include "gtkmain.h"