diff --git a/ChangeLog b/ChangeLog index c97f0103ff..b9b3c8508e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Wed Mar 17 00:44:23 1999 Tim Janik + + * configure.in: bumped version number to Gtk+1.2.1, interface 0, + binary 1. + + * gtk/gtkfeatures.h.in: added GTK_CHECK_VERSION(major,minor,micro) + macro to test for specific gtk versions, e.g. + #if GTK_CHECK_VERSION (1,2,1) + gtk_menu_ensure_uline_accel_group (menu); + #endif /* Gtk+1.2.1 */ + this macro will return whether the Gtk+ header files are from version + major.minor.micro or _newer_, as opposed to gtk_check_version() which + requires an exact match for binary compatibility. + Tue Mar 16 17:43:33 1999 Tim Janik * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_string): ensure the diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c97f0103ff..b9b3c8508e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,17 @@ +Wed Mar 17 00:44:23 1999 Tim Janik + + * configure.in: bumped version number to Gtk+1.2.1, interface 0, + binary 1. + + * gtk/gtkfeatures.h.in: added GTK_CHECK_VERSION(major,minor,micro) + macro to test for specific gtk versions, e.g. + #if GTK_CHECK_VERSION (1,2,1) + gtk_menu_ensure_uline_accel_group (menu); + #endif /* Gtk+1.2.1 */ + this macro will return whether the Gtk+ header files are from version + major.minor.micro or _newer_, as opposed to gtk_check_version() which + requires an exact match for binary compatibility. + Tue Mar 16 17:43:33 1999 Tim Janik * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_string): ensure the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c97f0103ff..b9b3c8508e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +Wed Mar 17 00:44:23 1999 Tim Janik + + * configure.in: bumped version number to Gtk+1.2.1, interface 0, + binary 1. + + * gtk/gtkfeatures.h.in: added GTK_CHECK_VERSION(major,minor,micro) + macro to test for specific gtk versions, e.g. + #if GTK_CHECK_VERSION (1,2,1) + gtk_menu_ensure_uline_accel_group (menu); + #endif /* Gtk+1.2.1 */ + this macro will return whether the Gtk+ header files are from version + major.minor.micro or _newer_, as opposed to gtk_check_version() which + requires an exact match for binary compatibility. + Tue Mar 16 17:43:33 1999 Tim Janik * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_string): ensure the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c97f0103ff..b9b3c8508e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,17 @@ +Wed Mar 17 00:44:23 1999 Tim Janik + + * configure.in: bumped version number to Gtk+1.2.1, interface 0, + binary 1. + + * gtk/gtkfeatures.h.in: added GTK_CHECK_VERSION(major,minor,micro) + macro to test for specific gtk versions, e.g. + #if GTK_CHECK_VERSION (1,2,1) + gtk_menu_ensure_uline_accel_group (menu); + #endif /* Gtk+1.2.1 */ + this macro will return whether the Gtk+ header files are from version + major.minor.micro or _newer_, as opposed to gtk_check_version() which + requires an exact match for binary compatibility. + Tue Mar 16 17:43:33 1999 Tim Janik * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_string): ensure the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c97f0103ff..b9b3c8508e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +Wed Mar 17 00:44:23 1999 Tim Janik + + * configure.in: bumped version number to Gtk+1.2.1, interface 0, + binary 1. + + * gtk/gtkfeatures.h.in: added GTK_CHECK_VERSION(major,minor,micro) + macro to test for specific gtk versions, e.g. + #if GTK_CHECK_VERSION (1,2,1) + gtk_menu_ensure_uline_accel_group (menu); + #endif /* Gtk+1.2.1 */ + this macro will return whether the Gtk+ header files are from version + major.minor.micro or _newer_, as opposed to gtk_check_version() which + requires an exact match for binary compatibility. + Tue Mar 16 17:43:33 1999 Tim Janik * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_string): ensure the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c97f0103ff..b9b3c8508e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +Wed Mar 17 00:44:23 1999 Tim Janik + + * configure.in: bumped version number to Gtk+1.2.1, interface 0, + binary 1. + + * gtk/gtkfeatures.h.in: added GTK_CHECK_VERSION(major,minor,micro) + macro to test for specific gtk versions, e.g. + #if GTK_CHECK_VERSION (1,2,1) + gtk_menu_ensure_uline_accel_group (menu); + #endif /* Gtk+1.2.1 */ + this macro will return whether the Gtk+ header files are from version + major.minor.micro or _newer_, as opposed to gtk_check_version() which + requires an exact match for binary compatibility. + Tue Mar 16 17:43:33 1999 Tim Janik * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_string): ensure the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c97f0103ff..b9b3c8508e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +Wed Mar 17 00:44:23 1999 Tim Janik + + * configure.in: bumped version number to Gtk+1.2.1, interface 0, + binary 1. + + * gtk/gtkfeatures.h.in: added GTK_CHECK_VERSION(major,minor,micro) + macro to test for specific gtk versions, e.g. + #if GTK_CHECK_VERSION (1,2,1) + gtk_menu_ensure_uline_accel_group (menu); + #endif /* Gtk+1.2.1 */ + this macro will return whether the Gtk+ header files are from version + major.minor.micro or _newer_, as opposed to gtk_check_version() which + requires an exact match for binary compatibility. + Tue Mar 16 17:43:33 1999 Tim Janik * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_string): ensure the diff --git a/configure.in b/configure.in index e68a19996a..2eef644fb7 100644 --- a/configure.in +++ b/configure.in @@ -29,9 +29,9 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl # GTK_MAJOR_VERSION=1 GTK_MINOR_VERSION=2 -GTK_MICRO_VERSION=0 +GTK_MICRO_VERSION=1 GTK_INTERFACE_AGE=0 -GTK_BINARY_AGE=0 +GTK_BINARY_AGE=1 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION dnl AC_DIVERT_POP()dnl diff --git a/gtk/gtkfeatures.h.in b/gtk/gtkfeatures.h.in index 34ffbf37c4..9fee280166 100644 --- a/gtk/gtkfeatures.h.in +++ b/gtk/gtkfeatures.h.in @@ -32,6 +32,12 @@ extern "C" { #define GTK_MICRO_VERSION (@GTK_MICRO_VERSION@) #define GTK_BINARY_AGE (@GTK_BINARY_AGE@) #define GTK_INTERFACE_AGE (@GTK_INTERFACE_AGE@) +#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))) + /* new gtk_container_set_focus_[hv]adjustment() */