From d1dff1cbb51e3d2ec7ce4474133cb2b56161069f Mon Sep 17 00:00:00 2001 From: James Henstridge Date: Tue, 21 Aug 2001 01:35:31 +0000 Subject: update for autoconf 2.52 2001-08-21 James Henstridge * configure.in: update for autoconf 2.52 * gtk/gtk.defs: make GtkAccelGroup a GObject rather than a boxed type. remove the gtk_tree_model_get_first function. 2001-07-09 James Henstridge * gobjectmodule.c (initgobject): add a gobject.TYPE_PYOBJECT constant for the PyObject boxed typecode. --- ChangeLog | 12 ++++++++++++ configure.in | 13 +++++++------ gobject/gobjectmodule.c | 1 + gobjectmodule.c | 1 + gtk/gtk.defs | 24 +++++++----------------- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8751d4ca..7e05f521 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2001-08-21 James Henstridge + + * configure.in: update for autoconf 2.52 + + * gtk/gtk.defs: make GtkAccelGroup a GObject rather than a boxed + type. remove the gtk_tree_model_get_first function. + +2001-07-09 James Henstridge + + * gobjectmodule.c (initgobject): add a gobject.TYPE_PYOBJECT + constant for the PyObject boxed typecode. + 2001-07-08 James Henstridge * gobjectmodule.c (pyg_signal_new): fix argument type for diff --git a/configure.in b/configure.in index 121908a7..ed88207c 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,9 @@ -AC_INIT(gtk/gtkmodule.c) +AC_INIT(pygtk, 0.7.1, + [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-python&component=pygtk]) +AC_CONFIG_SRCDIR([gtk/gtkmodule.c]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(pygtk, 0.7.1) +AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) dnl put the ACLOCAL flags in the makefile ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" @@ -30,11 +32,9 @@ fi AM_PATH_GLIB_2_0(1.3.7,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],gobject) PKG_CHECK_MODULES(PANGO, pango >= 0.17,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)]) -AM_PATH_GTK_2_0(1.3.7,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],$extra_mods) - -dnl this is so that automake picks up the SUBSTs. autoconf already has them AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_LIBS) +AM_PATH_GTK_2_0(1.3.7,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],$extra_mods) dnl AM_PATH_GDK_IMLIB(1.8, build_imlib=true, build_imlib=false) dnl AM_CONDITIONAL(BUILD_IMLIB, $build_imlib) @@ -67,6 +67,7 @@ if test "x$enable_numpy" != xno; then CPPFLAGS="$save_CPPFLAGS" fi -AC_OUTPUT(Makefile codegen/Makefile gtk/Makefile codegen/pygtk-codegen-2.0) +AC_CONFIG_FILES([Makefile codegen/Makefile gtk/Makefile codegen/pygtk-codegen-2.0]) +AC_OUTPUT diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index 65a7f0a3..7a46bb55 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -2165,6 +2165,7 @@ initgobject(void) PyModule_AddIntConstant(m, "TYPE_BOXED", G_TYPE_BOXED); PyModule_AddIntConstant(m, "TYPE_PARAM", G_TYPE_PARAM); PyModule_AddIntConstant(m, "TYPE_OBJECT", G_TYPE_OBJECT); + PyModule_AddIntConstant(m, "TYPE_PYOBJECT", PY_TYPE_OBJECT); if (PyErr_Occurred()) { PyErr_Print(); diff --git a/gobjectmodule.c b/gobjectmodule.c index 65a7f0a3..7a46bb55 100644 --- a/gobjectmodule.c +++ b/gobjectmodule.c @@ -2165,6 +2165,7 @@ initgobject(void) PyModule_AddIntConstant(m, "TYPE_BOXED", G_TYPE_BOXED); PyModule_AddIntConstant(m, "TYPE_PARAM", G_TYPE_PARAM); PyModule_AddIntConstant(m, "TYPE_OBJECT", G_TYPE_OBJECT); + PyModule_AddIntConstant(m, "TYPE_PYOBJECT", PY_TYPE_OBJECT); if (PyErr_Occurred()) { PyErr_Print(); diff --git a/gtk/gtk.defs b/gtk/gtk.defs index 6504d4ac..c5591af2 100644 --- a/gtk/gtk.defs +++ b/gtk/gtk.defs @@ -5,6 +5,13 @@ ; object definitions ... +(define-boxed AccelGroup + (in-module "Gtk") + (parent "GObject") + (c-name "GtkAccelGroup") + (gtype-id "GTK_TYPE_ACCEL_GROUP") +) + (define-object IconFactory (in-module "Gtk") (parent "GObject") @@ -902,14 +909,6 @@ ;; Boxed types ... -(define-boxed AccelGroup - (in-module "Gtk") - (c-name "GtkAccelGroup") - (gtype-id "GTK_TYPE_ACCEL_GROUP") - (copy-func "gtk_accel_group_ref") - (release-func "gtk_accel_group_unref") -) - (define-boxed TextIter (in-module "Gtk") (c-name "GtkTextIter") @@ -14334,15 +14333,6 @@ ) ) -(define-method get_first - (of-object "GtkTreeModel") - (c-name "gtk_tree_model_get_first") - (return-type "gboolean") - (parameters - '("GtkTreeIter*" "iter") - ) -) - (define-method get_path (of-object "GtkTreeModel") (c-name "gtk_tree_model_get_path") -- cgit v1.2.1