Commit 85b43351 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington
Browse files

add variables and checks for specific versions of dependencies. Previously

2001-09-20  Havoc Pennington  <hp@pobox.com>

	* configure.in (PANGO_REQUIRED_VERSION)
	(ATK_REQUIRED_VERSION): add variables and checks for specific
	versions of dependencies. Previously we didn't verify the
	Pango or ATk versions.

2001-09-09  Havoc Pennington  <hp@pobox.com>

	* gtk/gtktextiter.c: fool with indentation
	(gtk_text_iter_in_range): add g_return_if_fail
parent bd30ca18
2001-09-20 Havoc Pennington <hp@pobox.com>
* configure.in (PANGO_REQUIRED_VERSION)
(ATK_REQUIRED_VERSION): add variables and checks for specific
versions of dependencies. Previously we didn't verify the
Pango or ATk versions.
2001-09-09 Havoc Pennington <hp@pobox.com>
* gtk/gtktextiter.c: fool with indentation
(gtk_text_iter_in_range): add g_return_if_fail
Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com> Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix
......
2001-09-20 Havoc Pennington <hp@pobox.com>
* configure.in (PANGO_REQUIRED_VERSION)
(ATK_REQUIRED_VERSION): add variables and checks for specific
versions of dependencies. Previously we didn't verify the
Pango or ATk versions.
2001-09-09 Havoc Pennington <hp@pobox.com>
* gtk/gtktextiter.c: fool with indentation
(gtk_text_iter_in_range): add g_return_if_fail
Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com> Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix
......
2001-09-20 Havoc Pennington <hp@pobox.com>
* configure.in (PANGO_REQUIRED_VERSION)
(ATK_REQUIRED_VERSION): add variables and checks for specific
versions of dependencies. Previously we didn't verify the
Pango or ATk versions.
2001-09-09 Havoc Pennington <hp@pobox.com>
* gtk/gtktextiter.c: fool with indentation
(gtk_text_iter_in_range): add g_return_if_fail
Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com> Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix
......
2001-09-20 Havoc Pennington <hp@pobox.com>
* configure.in (PANGO_REQUIRED_VERSION)
(ATK_REQUIRED_VERSION): add variables and checks for specific
versions of dependencies. Previously we didn't verify the
Pango or ATk versions.
2001-09-09 Havoc Pennington <hp@pobox.com>
* gtk/gtktextiter.c: fool with indentation
(gtk_text_iter_in_range): add g_return_if_fail
Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com> Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix
......
2001-09-20 Havoc Pennington <hp@pobox.com>
* configure.in (PANGO_REQUIRED_VERSION)
(ATK_REQUIRED_VERSION): add variables and checks for specific
versions of dependencies. Previously we didn't verify the
Pango or ATk versions.
2001-09-09 Havoc Pennington <hp@pobox.com>
* gtk/gtktextiter.c: fool with indentation
(gtk_text_iter_in_range): add g_return_if_fail
Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com> Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix
......
2001-09-20 Havoc Pennington <hp@pobox.com>
* configure.in (PANGO_REQUIRED_VERSION)
(ATK_REQUIRED_VERSION): add variables and checks for specific
versions of dependencies. Previously we didn't verify the
Pango or ATk versions.
2001-09-09 Havoc Pennington <hp@pobox.com>
* gtk/gtktextiter.c: fool with indentation
(gtk_text_iter_in_range): add g_return_if_fail
Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com> Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix
......
2001-09-20 Havoc Pennington <hp@pobox.com>
* configure.in (PANGO_REQUIRED_VERSION)
(ATK_REQUIRED_VERSION): add variables and checks for specific
versions of dependencies. Previously we didn't verify the
Pango or ATk versions.
2001-09-09 Havoc Pennington <hp@pobox.com>
* gtk/gtktextiter.c: fool with indentation
(gtk_text_iter_in_range): add g_return_if_fail
Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com> Thu Sep 20 17:45:54 2001 Joshua N Pritikin <vishnu@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix * gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): Fix
......
...@@ -77,6 +77,11 @@ AC_SUBST(GDK_PIXBUF_MINOR) ...@@ -77,6 +77,11 @@ AC_SUBST(GDK_PIXBUF_MINOR)
AC_SUBST(GDK_PIXBUF_MICRO) AC_SUBST(GDK_PIXBUF_MICRO)
AC_SUBST(GDK_PIXBUF_VERSION) AC_SUBST(GDK_PIXBUF_VERSION)
## Versions of dependencies
GLIB_REQUIRED_VERSION=1.3.8
PANGO_REQUIRED_VERSION=0.19
ATK_REQUIRED_VERSION=0.4
# For automake. # For automake.
VERSION=$GTK_VERSION VERSION=$GTK_VERSION
PACKAGE=gtk+ PACKAGE=gtk+
...@@ -192,6 +197,14 @@ changequote([,])dnl ...@@ -192,6 +197,14 @@ changequote([,])dnl
# Honor aclocal flags # Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
## Initial sanity check, done here so that users get told they
## have the wrong dependencies as early in the process as possible.
## Later on we actually use the cflags/libs from separate pkg-config
## calls. Oh, also the later pkg-config calls don't include
## the version requirements since those make the module lists
## annoying to construct
PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION atk >= $ATK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION)
# libtool option to control which symbols are exported # libtool option to control which symbols are exported
# right now, symbols starting with _ are not exported # right now, symbols starting with _ are not exported
LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"' LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
...@@ -295,7 +308,6 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;], ...@@ -295,7 +308,6 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
# #
GLIB_PACKAGES="gobject-2.0 gmodule-2.0" GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
GLIB_REQUIRED_VERSION=1.3.8
AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :, AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
AC_MSG_ERROR([ AC_MSG_ERROR([
......
...@@ -225,12 +225,6 @@ has the focus. ...@@ -225,12 +225,6 @@ has the focus.
@clist: The #GtkCList widget to check. @clist: The #GtkCList widget to check.
<!-- ##### MACRO GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS ##### -->
<para>
</para>
<!-- ##### MACRO GTK_ICON_SIZE_BUTTON ##### --> <!-- ##### MACRO GTK_ICON_SIZE_BUTTON ##### -->
<para> <para>
...@@ -1799,13 +1793,6 @@ arrow. ...@@ -1799,13 +1793,6 @@ arrow.
@show_toggle_indicator: unused @show_toggle_indicator: unused
@show_submenu_indicator: whether to show the arrow or not @show_submenu_indicator: whether to show the arrow or not
<!-- ##### MACRO gtk_notebook_set_page ##### -->
<para>
</para>
@notebook:
@page_num:
<!-- ##### FUNCTION gtk_object_arg_get ##### --> <!-- ##### FUNCTION gtk_object_arg_get ##### -->
<para> <para>
Private function to get an argument and argument info from an object. Private function to get an argument and argument info from an object.
......
...@@ -38,6 +38,13 @@ GtkContainer ...@@ -38,6 +38,13 @@ GtkContainer
@pspec: @pspec:
<!-- ##### MACRO GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS ##### -->
<para>
</para>
<!-- ##### MACRO gtk_container_border_width ##### --> <!-- ##### MACRO gtk_container_border_width ##### -->
<para> <para>
......
...@@ -132,6 +132,15 @@ Deprecated compatibility macro. ...@@ -132,6 +132,15 @@ Deprecated compatibility macro.
@Returns: @Returns:
<!-- ##### MACRO gtk_notebook_set_page ##### -->
<para>
</para>
<!-- # Unused Parameters # -->
@notebook:
@page_num:
<!-- ##### FUNCTION gtk_notebook_next_page ##### --> <!-- ##### FUNCTION gtk_notebook_next_page ##### -->
<para> <para>
</para> </para>
......
...@@ -336,7 +336,7 @@ sized_icon_set_from_inline (const guchar *inline_data, ...@@ -336,7 +336,7 @@ sized_icon_set_from_inline (const guchar *inline_data,
set = gtk_icon_set_new (); set = gtk_icon_set_new ();
source.pixbuf = gdk_pixbuf_new_from_stream (-1, inline_data, FALSE, NULL); source.pixbuf = gdk_pixbuf_new_from_stream (-1, inline_data, FALSE, NULL);
g_assert (source.pixbuf); g_assert (source.pixbuf);
gtk_icon_set_add_source (set, &source); gtk_icon_set_add_source (set, &source);
......
...@@ -354,7 +354,7 @@ chars_changed (GtkTextBTree *tree) ...@@ -354,7 +354,7 @@ chars_changed (GtkTextBTree *tree)
GtkTextBTree* GtkTextBTree*
_gtk_text_btree_new (GtkTextTagTable *table, _gtk_text_btree_new (GtkTextTagTable *table,
GtkTextBuffer *buffer) GtkTextBuffer *buffer)
{ {
GtkTextBTree *tree; GtkTextBTree *tree;
GtkTextBTreeNode *root_node; GtkTextBTreeNode *root_node;
......
...@@ -4744,9 +4744,8 @@ gtk_text_iter_compare (const GtkTextIter *lhs, ...@@ -4744,9 +4744,8 @@ gtk_text_iter_compare (const GtkTextIter *lhs,
* @start: start of range * @start: start of range
* @end: end of range * @end: end of range
* *
* @start and @end must be in order, unlike most text buffer * Checks whether @iter falls in the range [@start, @end).
* functions, for efficiency reasons. The function returns %TRUE if * @start and @end must be in ascending order.
* @iter falls in the range [@start, @end).
* *
* Return value: %TRUE if @iter is in the range * Return value: %TRUE if @iter is in the range
**/ **/
...@@ -4755,6 +4754,11 @@ gtk_text_iter_in_range (const GtkTextIter *iter, ...@@ -4755,6 +4754,11 @@ gtk_text_iter_in_range (const GtkTextIter *iter,
const GtkTextIter *start, const GtkTextIter *start,
const GtkTextIter *end) const GtkTextIter *end)
{ {
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (start != NULL, FALSE);
g_return_val_if_fail (end != NULL, FALSE);
g_return_val_if_fail (gtk_text_iter_compare (start, end) <= 0, FALSE);
return gtk_text_iter_compare (iter, start) >= 0 && return gtk_text_iter_compare (iter, start) >= 0 &&
gtk_text_iter_compare (iter, end) < 0; gtk_text_iter_compare (iter, end) < 0;
} }
...@@ -4879,8 +4883,8 @@ _gtk_text_btree_get_iter_at_line (GtkTextBTree *tree, ...@@ -4879,8 +4883,8 @@ _gtk_text_btree_get_iter_at_line (GtkTextBTree *tree,
gboolean gboolean
_gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree *tree, _gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree *tree,
GtkTextIter *iter, GtkTextIter *iter,
GtkTextTag *tag) GtkTextTag *tag)
{ {
GtkTextLine *line; GtkTextLine *line;
...@@ -4907,8 +4911,8 @@ _gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree *tree, ...@@ -4907,8 +4911,8 @@ _gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree *tree,
gboolean gboolean
_gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree, _gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree,
GtkTextIter *iter, GtkTextIter *iter,
GtkTextTag *tag) GtkTextTag *tag)
{ {
g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (tree != NULL, FALSE); g_return_val_if_fail (tree != NULL, FALSE);
...@@ -4922,8 +4926,8 @@ _gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree, ...@@ -4922,8 +4926,8 @@ _gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree,
gboolean gboolean
_gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree, _gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
GtkTextIter *iter, GtkTextIter *iter,
const gchar *mark_name) const gchar *mark_name)
{ {
GtkTextMark *mark; GtkTextMark *mark;
...@@ -4944,8 +4948,8 @@ _gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree, ...@@ -4944,8 +4948,8 @@ _gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
void void
_gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree, _gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree,
GtkTextIter *iter, GtkTextIter *iter,
GtkTextMark *mark) GtkTextMark *mark)
{ {
GtkTextLineSegment *seg; GtkTextLineSegment *seg;
...@@ -4963,8 +4967,8 @@ _gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree, ...@@ -4963,8 +4967,8 @@ _gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree,
void void
_gtk_text_btree_get_iter_at_child_anchor (GtkTextBTree *tree, _gtk_text_btree_get_iter_at_child_anchor (GtkTextBTree *tree,
GtkTextIter *iter, GtkTextIter *iter,
GtkTextChildAnchor *anchor) GtkTextChildAnchor *anchor)
{ {
GtkTextLineSegment *seg; GtkTextLineSegment *seg;
......
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