diff options
author | Owen Taylor <otaylor@redhat.com> | 2002-03-05 21:04:09 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-05 21:04:09 +0000 |
commit | ec09f3ab15ad4c797367363a40ac489d7ec64e8f (patch) | |
tree | 8728429b4dfed1802fa139b45f79aa337ee49a8a /docs | |
parent | 049771c5f6eb927d5a65b4461bdd8e3b29aff163 (diff) | |
download | gtk+-ec09f3ab15ad4c797367363a40ac489d7ec64e8f.tar.gz |
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.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/reference/ChangeLog | 4 | ||||
-rw-r--r-- | docs/reference/gdk-pixbuf/Makefile.am | 10 | ||||
-rw-r--r-- | docs/reference/gtk/Makefile.am | 8 | ||||
-rw-r--r-- | docs/reference/gtk/compiling.sgml | 2 | ||||
-rw-r--r-- | docs/reference/gtk/tmpl/gtk-unused.sgml | 8 | ||||
-rw-r--r-- | docs/reference/gtk/tmpl/gtkentry.sgml | 6 | ||||
-rw-r--r-- | docs/reference/gtk/tmpl/gtkmenubar.sgml | 8 | ||||
-rw-r--r-- | docs/reference/gtk/tmpl/gtkmenushell.sgml | 8 |
8 files changed, 33 insertions, 21 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 37a660e4af..159b6ac352 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,7 @@ +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" diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am index a47279e241..d93f8dffa3 100644 --- a/docs/reference/gdk-pixbuf/Makefile.am +++ b/docs/reference/gdk-pixbuf/Makefile.am @@ -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) diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 22abcc8753..d2b8972eca 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -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) diff --git a/docs/reference/gtk/compiling.sgml b/docs/reference/gtk/compiling.sgml index 445b7e0ef0..609bc0c775 100644 --- a/docs/reference/gtk/compiling.sgml +++ b/docs/reference/gtk/compiling.sgml @@ -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> diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 456bfeb3dd..2494ad670b 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -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 diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml index a99e0a15d9..a0990a19c9 100644 --- a/docs/reference/gtk/tmpl/gtkentry.sgml +++ b/docs/reference/gtk/tmpl/gtkentry.sgml @@ -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 ##### --> diff --git a/docs/reference/gtk/tmpl/gtkmenubar.sgml b/docs/reference/gtk/tmpl/gtkmenubar.sgml index 5c85311713..3b22a5872f 100644 --- a/docs/reference/gtk/tmpl/gtkmenubar.sgml +++ b/docs/reference/gtk/tmpl/gtkmenubar.sgml @@ -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: - diff --git a/docs/reference/gtk/tmpl/gtkmenushell.sgml b/docs/reference/gtk/tmpl/gtkmenushell.sgml index fc64ef33df..bd5c539eb6 100644 --- a/docs/reference/gtk/tmpl/gtkmenushell.sgml +++ b/docs/reference/gtk/tmpl/gtkmenushell.sgml @@ -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. |