Commit ec09f3ab authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor
Browse files

Update version to 2.0.0

Tue Mar  5 15:47:54 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in test/makefile.msc **.pc.in **/*.am:
	Update version to 2.0.0

        * gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp
        files.

        * configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0,
        Pango, Atk, 1.0.0.

        * m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum
        version.
parent 049771c5
Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com>
* configure.in test/makefile.msc **.pc.in **/*.am:
Update version to 2.0.0
* gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp
files.
* configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0,
Pango, Atk, 1.0.0.
* m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum
version.
2002-03-05 Havoc Pennington <hp@redhat.com>
 
* gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign
......
Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com>
* configure.in test/makefile.msc **.pc.in **/*.am:
Update version to 2.0.0
* gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp
files.
* configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0,
Pango, Atk, 1.0.0.
* m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum
version.
2002-03-05 Havoc Pennington <hp@redhat.com>
 
* gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign
......
Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com>
* configure.in test/makefile.msc **.pc.in **/*.am:
Update version to 2.0.0
* gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp
files.
* configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0,
Pango, Atk, 1.0.0.
* m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum
version.
2002-03-05 Havoc Pennington <hp@redhat.com>
 
* gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign
......
Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com>
* configure.in test/makefile.msc **.pc.in **/*.am:
Update version to 2.0.0
* gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp
files.
* configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0,
Pango, Atk, 1.0.0.
* m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum
version.
2002-03-05 Havoc Pennington <hp@redhat.com>
 
* gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign
......
Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com>
* configure.in test/makefile.msc **.pc.in **/*.am:
Update version to 2.0.0
* gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp
files.
* configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0,
Pango, Atk, 1.0.0.
* m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum
version.
2002-03-05 Havoc Pennington <hp@redhat.com>
 
* gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign
......
Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com>
* configure.in test/makefile.msc **.pc.in **/*.am:
Update version to 2.0.0
* gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp
files.
* configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0,
Pango, Atk, 1.0.0.
* m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum
version.
2002-03-05 Havoc Pennington <hp@redhat.com>
 
* gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign
......
Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com>
* configure.in test/makefile.msc **.pc.in **/*.am:
Update version to 2.0.0
* gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp
files.
* configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0,
Pango, Atk, 1.0.0.
* m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum
version.
2002-03-05 Havoc Pennington <hp@redhat.com>
 
* gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign
......
......@@ -12,11 +12,6 @@ AC_INIT(gdk/gdktypes.h)
# foo_DEP_CFLAGS: All cflags this module requires
## We could have pkg-config uniquify the ldflags and cflags by calling
## it once with both the GLib and Pango package names, but we don't,
## someone should fix that.
# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}
......@@ -32,13 +27,14 @@ GLIB_AC_DIVERT_BEFORE_HELP([
# if backwards compatibility has been broken,
# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
#
GTK_MAJOR_VERSION=1
GTK_MINOR_VERSION=3
GTK_MICRO_VERSION=15
GTK_MAJOR_VERSION=2
GTK_MINOR_VERSION=0
GTK_MICRO_VERSION=0
GTK_INTERFACE_AGE=0
GTK_BINARY_AGE=0
GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
dnl
dnl This is the X.Y used in -lgtk-FOO-X.Y
GTK_API_VERSION=2.0
])dnl
AC_SUBST(GTK_MAJOR_VERSION)
......@@ -46,6 +42,7 @@ AC_SUBST(GTK_MINOR_VERSION)
AC_SUBST(GTK_MICRO_VERSION)
AC_SUBST(GTK_INTERFACE_AGE)
AC_SUBST(GTK_BINARY_AGE)
AC_SUBST(GTK_API_VERSION)
AC_SUBST(GTK_VERSION)
# libtool versioning
......@@ -80,9 +77,9 @@ AC_SUBST(GDK_PIXBUF_MICRO)
AC_SUBST(GDK_PIXBUF_VERSION)
## Versions of dependencies
GLIB_REQUIRED_VERSION=1.3.15
PANGO_REQUIRED_VERSION=0.26
ATK_REQUIRED_VERSION=0.13
GLIB_REQUIRED_VERSION=2.0.0
PANGO_REQUIRED_VERSION=1.0.0
ATK_REQUIRED_VERSION=1.0.0
# For automake.
VERSION=$GTK_VERSION
......@@ -193,8 +190,8 @@ case $gdktarget in
*) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb or win32.]);;
esac
gdktargetlib=libgdk-$gdktarget-1.3.la
gtktargetlib=libgtk-$gdktarget-1.3.la
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
AC_SUBST(gdktargetlib)
AC_SUBST(gtktargetlib)
......@@ -1270,7 +1267,7 @@ fi
if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
:
else
AC_CHECK_LIB(atk, atk_object_get_type, : , AC_MSG_ERROR([
AC_CHECK_LIB(atk-1.0, atk_object_get_type, : , AC_MSG_ERROR([
*** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
*** to build GTK+]), $ATK_LIBS $GLIB_LIBS)
fi
......
lib_LTLIBRARIES=libgdk_pixbuf_xlib-1.3.la
lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) -I$(top_builddir) \
......@@ -11,11 +11,11 @@ LDADDS = @STRIP_BEGIN@ \
@GDK_PIXBUF_XLIB_DEP_LIBS@ \
@STRIP_END@
libgdk_pixbuf_xlib_1_3_la_LDFLAGS = \
libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \
-export-dynamic \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libgdk_pixbuf_xlib_1_3_la_SOURCES = \
libgdk_pixbuf_xlib_2_0_la_SOURCES = \
gdk-pixbuf-xlib-private.h \
gdk-pixbuf-xlib.c \
gdk-pixbuf-xlib-render.c \
......
......@@ -7,5 +7,5 @@ Name: GdkPixbuf Xlib
Description: GdkPixbuf rendering for Xlib
Version: @VERSION@
Requires: gobject-2.0,gmodule-2.0,gdk-pixbuf-2.0
Libs: -L${libdir} -lgdk_pixbuf_xlib-1.3
Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
Cflags: -I${includedir}
......@@ -14,14 +14,14 @@ INCLUDES = @STRIP_BEGIN@ \
@STRIP_END@
DEPS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@
LDADDS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
LDADDS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@STRIP_END@
noinst_PROGRAMS = \
......
......@@ -36,14 +36,14 @@ INCLUDES = @STRIP_BEGIN@ \
@STRIP_END@
DEPS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@
LDADDS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
LDADDS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@STRIP_END@
bin_PROGRAMS = gtk-demo
......
Tue Mar 5 14:28:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/compiling.sgml: Update version numbers in example.
2002-03-04 Matthias Clasen <maclas@gmx.de>
* gtk/gtk-docs.sgml: Move GtkOldEditable to the "Deprecated"
......
......@@ -58,11 +58,11 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
GTKDOC_LIBS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@GTK_DEP_LIBS@ \
GTKDOC_LIBS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@GTK_DEP_LIBS@ \
@STRIP_END@
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
......
......@@ -154,10 +154,10 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@ \
@GTK_DEP_CFLAGS@ \
@STRIP_END@
GTKDOC_LIBS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
GTKDOC_LIBS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/@gdktargetlib@ \
$(top_builddir)/gtk/@gtktargetlib@ \
@STRIP_END@
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
......
......@@ -27,7 +27,7 @@ The following interactive shell session demonstrates how
$ pkg-config --cflags gtk+-2.0
-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/atk-1.0
$ pkg-config --libs gtk+-2.0
-L/usr/lib -L/usr/X11R6/lib -lgtk-x11-1.3 -lgdk-x11-1.3 -lXi -lgdk_pixbuf-1.3 -lm -lpangox -lpangoxft -lXft -lXrender -lXext -lX11 -lfreetype -lpango -latk -lgobject-1.3 -lgmodule-1.3 -ldl -lglib-1.3
-L/usr/lib -L/usr/X11R6/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -lXi -lgdk_pixbuf-2.0 -lm -lpangox -lpangoxft -lXft -lXrender -lXext -lX11 -lfreetype -lpango -latk -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
</programlisting>
</para>
<para>
......
......@@ -908,6 +908,14 @@ a RC file.
</para>
<!-- ##### SIGNAL GtkMenuBar::cycle-focus ##### -->
<para>
</para>
@menubar: the object which received the signal.
@arg1:
<!-- ##### ARG GtkObject:object-signal ##### -->
<para>
Setting this with a GtkType of GTK_TYPE_SIGNAL connects
......
......@@ -43,7 +43,7 @@ Creates a new #GtkEntry widget.
<para>
</para>
@max:
@max:
@Returns:
......@@ -165,8 +165,8 @@ use gtk_editable_set_editable() instead.
<para>
</para>
@entry:
@max:
@entry:
@max:
<!-- ##### FUNCTION gtk_entry_get_activates_default ##### -->
......
......@@ -64,11 +64,3 @@ Adds a new #GtkMenuItem to the GtkMenuBar at the position defined by @position
@position: the position in the item list where the @child is added.
<!-- ##### SIGNAL GtkMenuBar::cycle-focus ##### -->
<para>
</para>
@menubar: the object which received the signal.
@arg1:
......@@ -161,6 +161,14 @@ Causes the GtkMenuShell::selection-done signal to be emitted.
@menushell: the object which received the signal.
<!-- ##### SIGNAL GtkMenuShell::cycle-focus ##### -->
<para>
</para>
@menushell: the object which received the signal.
@arg1:
<!-- ##### SIGNAL GtkMenuShell::deactivate ##### -->
<para>
This signal is emitted when a menu shell is deactivated.
......
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