diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | codegen/argtypes.py | 7 | ||||
| -rw-r--r-- | gtk/gdk.defs | 34 | ||||
| -rw-r--r-- | gtk/gtk-types.c | 699 | ||||
| -rw-r--r-- | gtk/gtk.defs | 473 | ||||
| -rw-r--r-- | gtk/gtk.override | 281 | ||||
| -rw-r--r-- | gtk/pygtk-private.h | 3 | ||||
| -rw-r--r-- | gtk/pygtk.h | 12 |
8 files changed, 622 insertions, 902 deletions
@@ -1,5 +1,20 @@ 2001-06-27 James Henstridge <james@daa.com.au> + * codegen/argtypes.py (arg): don't register a boxed handler for + GtkTextIter here. + + * gtk/gtk.override: add overrides for various GtkTextIter methods. + + * codegen/argtypes.py (BoxedArg.write_param): fix up variable type. + + * gtk/gtk.override (_wrap_gtk_text_iter_copy): implement text iter + copy function, and ignore the gtk_text_iter_free function (it + could cause troubles). + (*): replace function calls using the old GtkTextIter wrapper. + + * gtk/gtk.defs: update defs for GtkTextIter. + (TextIter): add text iter boxed type here. + * examples/pygtk-demo/demos/toolbar.py (main): fix up toolbar constructor. diff --git a/codegen/argtypes.py b/codegen/argtypes.py index e8e659c2..d1eb3f72 100644 --- a/codegen/argtypes.py +++ b/codegen/argtypes.py @@ -371,7 +371,7 @@ class BoxedArg(ArgType): def write_param(self, ptype, pname, pdflt, pnull, varlist, parselist, extracode, arglist): if pnull: - varlist.add(ptype[:-1], '*' + pname + ' = NULL') + varlist.add(self.typename, '*' + pname + ' = NULL') varlist.add('PyObject', '*py_' + pname + ' = Py_None') parselist.append('&py_' + pname) extracode.append(self.null % {'name': pname, @@ -380,7 +380,7 @@ class BoxedArg(ArgType): arglist.append(pname) return 'O' else: - varlist.add(ptype[:-1], '*' + pname + ' = NULL') + varlist.add(self.typename, '*' + pname + ' = NULL') varlist.add('PyObject', '*py_' + pname) parselist.append('&py_' + pname) extracode.append(self.check % {'name': pname, @@ -596,9 +596,6 @@ matcher.register_custom_boxed('GtkCTreeNode', 'PyGtkCTreeNode_Type', 'PyGtkCTreeNode_Get', 'PyGtkCTreeNode_New') matcher.register_custom_boxed('GdkDevice', 'PyGdkDevice_Type', 'PyGdkDevice_Get', 'PyGdkDevice_New') -matcher.register_custom_boxed('GtkTextIter', 'PyGtkTextIter_Type', - 'PyGtkTextIter_Get', 'PyGtkTextIter_New') -matcher.register('const-GtkTextIter*', matcher.get('GtkTextIter*')) matcher.register('GdkAtom', AtomArg()) diff --git a/gtk/gdk.defs b/gtk/gdk.defs index c2bd2d47..ba833b4c 100644 --- a/gtk/gdk.defs +++ b/gtk/gdk.defs @@ -733,7 +733,7 @@ (value (name revert) (c-name GDK_PIXBUF_FRAME_REVERT)) ) -;; From /opt/pango/include/gtk-2.0/gdk/gdkcolor.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkcolor.h (function gdk_colormap_get_type (c-name gdk_colormap_get_type) @@ -817,7 +817,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkcursor.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkcursor.h (function cursor_new (c-name gdk_cursor_new) @@ -838,7 +838,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkdnd.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkdnd.h (function gdk_drag_context_get_type (c-name gdk_drag_context_get_type) @@ -947,7 +947,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkdrawable.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkdrawable.h (function gdk_drawable_get_type (c-name gdk_drawable_get_type) @@ -1194,7 +1194,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkevents.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkevents.h (method get_time (of-object Event (Gdk)) @@ -1216,7 +1216,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkfont.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkfont.h (function font_load (is-constructor-of GdkFont) @@ -1364,7 +1364,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkgc.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkgc.h (function gdk_gc_get_type (c-name gdk_gc_get_type) @@ -1554,7 +1554,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gdk/gdkimage.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkimage.h (function gdk_image_get_type (c-name gdk_image_get_type) @@ -1609,7 +1609,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkinput.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkinput.h (function input_list_devices (c-name gdk_input_list_devices) @@ -1625,7 +1625,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h +;; From /opt/gtk2/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h (method get_colorspace (of-object Pixbuf (Gdk)) @@ -1933,7 +1933,7 @@ (parameter (type-and-name const-GTimeVal* current_time)) ) -;; From /opt/pango/include/gtk-2.0/gdk/gdkpixbuf.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkpixbuf.h (method render_to_drawable (of-object Pixbuf (Gdk)) @@ -1995,7 +1995,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkpixmap.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkpixmap.h (function gdk_pixmap_get_type (c-name gdk_pixmap_get_type) @@ -2073,7 +2073,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkproperty.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkproperty.h (method name (of-object Atom (Gdk)) @@ -2116,7 +2116,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gdk/gdkrgb.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkrgb.h (function gdk_rgb_xpixel_from_rgb (c-name gdk_rgb_xpixel_from_rgb) @@ -2253,7 +2253,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkselection.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkselection.h (function selection_owner_get (c-name gdk_selection_owner_get) @@ -2291,7 +2291,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkvisual.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkvisual.h (function visual_get_best_depth (c-name gdk_visual_get_best_depth) @@ -2354,7 +2354,7 @@ -;; From /opt/pango/include/gtk-2.0/gdk/gdkwindow.h +;; From /opt/gtk2/include/gtk-2.0/gdk/gdkwindow.h (function gdk_window_object_get_type (c-name gdk_window_object_get_type) diff --git a/gtk/gtk-types.c b/gtk/gtk-types.c index 5fa29dd9..2a81379c 100644 --- a/gtk/gtk-types.c +++ b/gtk/gtk-types.c @@ -148,22 +148,6 @@ PyGdkDevice_New(GdkDevice *device) return (PyObject *)self; } -PyObject * -PyGtkTextIter_New(GtkTextIter *iter) -{ - PyGtkTextIter_Object *self; - - self = (PyGtkTextIter_Object *)PyObject_NEW(PyGtkTextIter_Object, - &PyGtkTextIter_Type); - if (self == NULL) - return NULL; - if (iter) - self->iter = *iter; - else - memset(&self->iter, 0, sizeof(GtkTextIter)); - return (PyObject *)self; -} - #if 0 typedef struct { PyObject_HEAD @@ -2447,674 +2431,6 @@ PyTypeObject PyGdkDevice_Type = { NULL }; -static void -pygtk_text_iter_dealloc(PyGtkTextIter_Object *self) -{ - PyMem_DEL(self); -} - -static int -pygtk_text_iter_compare(PyGtkTextIter_Object *self, PyGtkTextIter_Object *v) -{ - return gtk_text_iter_compare(&self->iter, &v->iter); -} - -static long -pygtk_text_iter_hash(PyGtkTextIter_Object *self) -{ - long x; - - /* a hash function for the GtkTextIter object */ - x = 0x345678L; - x = (1000003*x) ^ (long)self->iter.dummy1; - x = (1000003*x) ^ (long)self->iter.dummy2; - x = (1000003*x) ^ (long)self->iter.dummy3; - x = (1000003*x) ^ (long)self->iter.dummy4; - x = (1000003*x) ^ (long)self->iter.dummy5; - x = (1000003*x) ^ (long)self->iter.dummy6; - x = (1000003*x) ^ (long)self->iter.dummy7; - x = (1000003*x) ^ (long)self->iter.dummy8; - x = (1000003*x) ^ (long)self->iter.dummy9; - x = (1000003*x) ^ (long)self->iter.dummy10; - x = (1000003*x) ^ (long)self->iter.dummy11; - x = (1000003*x) ^ (long)self->iter.dummy12; - if (x == -1) /* -1 indicates error condition */ - x = -2; - return x; -} - -static PyObject * -pygtk_text_iter_copy(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.copy")) - return NULL; - /* don't use gtk_text_iter_copy, as it makes a new copy of the - * iter, and PyGtkTextIter_New does the same when creating the new - * PyObject */ - return PyGtkTextIter_New(&self->iter); -} - -static PyObject * -pygtk_text_iter_get_offset(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.get_offset")) - return NULL; - return PyInt_FromLong(gtk_text_iter_get_offset(&self->iter)); -} - -static PyObject * -pygtk_text_iter_get_line(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.get_line")) - return NULL; - return PyInt_FromLong(gtk_text_iter_get_line(&self->iter)); -} - -static PyObject * -pygtk_text_iter_get_line_offset(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.get_line_offset")) - return NULL; - return PyInt_FromLong(gtk_text_iter_get_line_offset(&self->iter)); -} - -static PyObject * -pygtk_text_iter_get_line_index(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.get_line_index")) - return NULL; - return PyInt_FromLong(gtk_text_iter_get_line_index(&self->iter)); -} - -static PyObject * -pygtk_text_iter_get_char(PyGtkTextIter_Object *self, PyObject *args) -{ - gunichar chr; - Py_UNICODE pychr; - - if (!PyArg_ParseTuple(args, ":GtkTextIter.get_char")) - return NULL; - chr = gtk_text_iter_get_char(&self->iter); - if (chr > 0xffff) { - PyErr_SetString(PyExc_RuntimeError, "python's broken unicode handling only supports 16 bit unicode, and you just hit this limit"); - return NULL; - } - pychr = (Py_UNICODE)chr; - return PyUnicode_FromUnicode(&pychr, 1); -} - -static PyObject * -pygtk_text_iter_get_slice(PyGtkTextIter_Object *self, PyObject *args) -{ - PyGtkTextIter_Object *end; - gchar *text; - PyObject *pytext; - - if (!PyArg_ParseTuple(args, "O!:GtkTextIter.get_slice", - &PyGtkTextIter_Type, &end)) - return NULL; - text = gtk_text_iter_get_slice(&self->iter, &end->iter); - pytext = PyUnicode_DecodeUTF8(text, strlen(text), "strict"); - g_free(text); - return pytext; -} - -static PyObject * -pygtk_text_iter_get_text(PyGtkTextIter_Object *self, PyObject *args) -{ - PyGtkTextIter_Object *end; - gchar *text; - PyObject *pytext; - - if (!PyArg_ParseTuple(args, "O!:GtkTextIter.get_text", - &PyGtkTextIter_Type, &end)) - return NULL; - text = gtk_text_iter_get_text(&self->iter, &end->iter); - pytext = PyUnicode_DecodeUTF8(text, strlen(text), "strict"); - g_free(text); - return pytext; -} - -static PyObject * -pygtk_text_iter_get_visible_slice(PyGtkTextIter_Object *self, PyObject *args) -{ - PyGtkTextIter_Object *end; - gchar *text; - PyObject *pytext; - - if (!PyArg_ParseTuple(args, "O!:GtkTextIter.get_visible_slice", - &PyGtkTextIter_Type, &end)) - return NULL; - text = gtk_text_iter_get_visible_slice(&self->iter, &end->iter); - pytext = PyUnicode_DecodeUTF8(text, strlen(text), "strict"); - g_free(text); - return pytext; -} - -static PyObject * -pygtk_text_iter_get_visible_text(PyGtkTextIter_Object *self, PyObject *args) -{ - PyGtkTextIter_Object *end; - gchar *text; - PyObject *pytext; - - if (!PyArg_ParseTuple(args, "O!:GtkTextIter.get_visible_text", - &PyGtkTextIter_Type, &end)) - return NULL; - text = gtk_text_iter_get_visible_text(&self->iter, &end->iter); - pytext = PyUnicode_DecodeUTF8(text, strlen(text), "strict"); - g_free(text); - return pytext; -} - -static PyObject * -pygtk_text_iter_get_pixbuf(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.get_pixbuf")) - return NULL; - return pygobject_new((GObject *)gtk_text_iter_get_pixbuf(&self->iter)); -} - -static PyObject * -pygtk_text_iter_get_marks(PyGtkTextIter_Object *self, PyObject *args) -{ - GSList *ret, *tmp; - PyObject *pyret; - - if (!PyArg_ParseTuple(args, ":GtkTextIter.get_marks")) - return NULL; - ret = gtk_text_iter_get_marks(&self->iter); - pyret = PyList_New(0); - for (tmp = ret; tmp != NULL; tmp = tmp->next) { - PyObject *mark = pygobject_new((GObject *)tmp->data); - PyList_Append(pyret, mark); - Py_DECREF(mark); - } - g_slist_free(ret); - return pyret; -} - -static PyObject * -pygtk_text_iter_get_toggled_tags(PyGtkTextIter_Object *self, PyObject *args) -{ - GSList *ret, *tmp; - int toggled_on; - PyObject *pyret; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.get_toggled_tags", &toggled_on)) - return NULL; - ret = gtk_text_iter_get_toggled_tags(&self->iter, toggled_on); - pyret = PyList_New(0); - for (tmp = ret; tmp != NULL; tmp = tmp->next) { - PyObject *tag = pygobject_new((GObject *)tmp->data); - PyList_Append(pyret, tag); - Py_DECREF(tag); - } - g_slist_free(ret); - return pyret; -} - -static PyObject * -pygtk_text_iter_begins_tag(PyGtkTextIter_Object *self, PyObject *args) -{ - PyGObject *tag; - extern PyExtensionClass PyGtkTextTag_Type; - - if (!PyArg_ParseTuple(args, "O:GtkTextIter.begins_tag", &tag)) - return NULL; - if (!pygobject_check(tag, &PyGtkTextTag_Type)) { - PyErr_SetString(PyExc_TypeError, "tag should be a GtkTextTag"); - return NULL; - } - return PyInt_FromLong(gtk_text_iter_begins_tag(&self->iter, - GTK_TEXT_TAG(tag->obj))); -} - -static PyObject * -pygtk_text_iter_ends_tag(PyGtkTextIter_Object *self, PyObject *args) -{ - PyGObject *tag; - extern PyExtensionClass PyGtkTextTag_Type; - - if (!PyArg_ParseTuple(args, "O:GtkTextIter.ends_tag", &tag)) - return NULL; - if (!pygobject_check(tag, &PyGtkTextTag_Type)) { - PyErr_SetString(PyExc_TypeError, "tag should be a GtkTextTag"); - return NULL; - } - return PyInt_FromLong(gtk_text_iter_ends_tag(&self->iter, - GTK_TEXT_TAG(tag->obj))); -} - -static PyObject * -pygtk_text_iter_toggles_tag(PyGtkTextIter_Object *self, PyObject *args) -{ - PyGObject *tag; - extern PyExtensionClass PyGtkTextTag_Type; - - if (!PyArg_ParseTuple(args, "O:GtkTextIter.toggles_tag", &tag)) - return NULL; - if (!pygobject_check(tag, &PyGtkTextTag_Type)) { - PyErr_SetString(PyExc_TypeError, "tag should be a GtkTextTag"); - return NULL; - } - return PyInt_FromLong(gtk_text_iter_toggles_tag(&self->iter, - GTK_TEXT_TAG(tag->obj))); -} - -static PyObject * -pygtk_text_iter_has_tag(PyGtkTextIter_Object *self, PyObject *args) -{ - PyGObject *tag; - extern PyExtensionClass PyGtkTextTag_Type; - - if (!PyArg_ParseTuple(args, "O:GtkTextIter.has_tag", &tag)) - return NULL; - if (!pygobject_check(tag, &PyGtkTextTag_Type)) { - PyErr_SetString(PyExc_TypeError, "tag should be a GtkTextTag"); - return NULL; - } - return PyInt_FromLong(gtk_text_iter_has_tag(&self->iter, - GTK_TEXT_TAG(tag->obj))); -} - -static PyObject * -pygtk_text_iter_editable(PyGtkTextIter_Object *self, PyObject *args) -{ - int default_setting; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.editable", &default_setting)) - return NULL; - return PyInt_FromLong(gtk_text_iter_editable(&self->iter,default_setting)); -} - -static PyObject * -pygtk_text_iter_starts_line(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.starts_line")) - return NULL; - return PyInt_FromLong(gtk_text_iter_starts_line(&self->iter)); -} - -static PyObject * -pygtk_text_iter_ends_line(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.ends_line")) - return NULL; - return PyInt_FromLong(gtk_text_iter_ends_line(&self->iter)); -} - -static PyObject * -pygtk_text_iter_get_chars_in_line(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.get_chars_in_line")) - return NULL; - return PyInt_FromLong(gtk_text_iter_starts_line(&self->iter)); -} - -/* XXXX - gtk_text_iter_get_attributes */ - -static PyObject * -pygtk_text_iter_is_end(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.is_end")) - return NULL; - return PyInt_FromLong(gtk_text_iter_is_end(&self->iter)); -} - -static PyObject * -pygtk_text_iter_is_start(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.is_start")) - return NULL; - return PyInt_FromLong(gtk_text_iter_is_start(&self->iter)); -} - -static PyObject * -pygtk_text_iter_forward_char(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.forward_char")) - return NULL; - return PyInt_FromLong(gtk_text_iter_forward_char(&self->iter)); -} - -static PyObject * -pygtk_text_iter_backward_char(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.backward_char")) - return NULL; - return PyInt_FromLong(gtk_text_iter_backward_char(&self->iter)); -} - -static PyObject * -pygtk_text_iter_forward_chars(PyGtkTextIter_Object *self, PyObject *args) -{ - gint count; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.forward_chars", &count)) - return NULL; - return PyInt_FromLong(gtk_text_iter_forward_chars(&self->iter, count)); -} - -static PyObject * -pygtk_text_iter_backward_chars(PyGtkTextIter_Object *self, PyObject *args) -{ - gint count; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.backward_chars", &count)) - return NULL; - return PyInt_FromLong(gtk_text_iter_backward_chars(&self->iter, count)); -} - -static PyObject * -pygtk_text_iter_forward_line(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.forward_line")) - return NULL; - return PyInt_FromLong(gtk_text_iter_forward_line(&self->iter)); -} - -static PyObject * -pygtk_text_iter_backward_line(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.backward_line")) - return NULL; - return PyInt_FromLong(gtk_text_iter_backward_line(&self->iter)); -} - -static PyObject * -pygtk_text_iter_forward_lines(PyGtkTextIter_Object *self, PyObject *args) -{ - gint count; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.forward_lines", &count)) - return NULL; - return PyInt_FromLong(gtk_text_iter_forward_lines(&self->iter, count)); -} - -static PyObject * -pygtk_text_iter_backward_lines(PyGtkTextIter_Object *self, PyObject *args) -{ - gint count; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.backward_lines", &count)) - return NULL; - return PyInt_FromLong(gtk_text_iter_backward_lines(&self->iter, count)); -} - -static PyObject * -pygtk_text_iter_forward_word_ends(PyGtkTextIter_Object *self, PyObject *args) -{ - gint count; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.forward_word_ends", &count)) - return NULL; - return PyInt_FromLong(gtk_text_iter_forward_word_ends(&self->iter, count)); -} - -static PyObject * -pygtk_text_iter_backward_word_starts(PyGtkTextIter_Object *self, PyObject *args) -{ - gint count; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.backward_word_starts", &count)) - return NULL; - return PyInt_FromLong(gtk_text_iter_backward_word_starts(&self->iter, count)); -} - -static PyObject * -pygtk_text_iter_forward_word_end(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.forward_word_end")) - return NULL; - return PyInt_FromLong(gtk_text_iter_forward_word_end(&self->iter)); -} - -static PyObject * -pygtk_text_iter_backward_word_start(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.backward_word_start")) - return NULL; - return PyInt_FromLong(gtk_text_iter_backward_word_start(&self->iter)); -} - -static PyObject * -pygtk_text_iter_set_offset(PyGtkTextIter_Object *self, PyObject *args) -{ - int char_offset; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.set_offset", &char_offset)) - return NULL; - gtk_text_iter_set_offset(&self->iter, char_offset); - Py_INCREF(Py_None); - return Py_None; -} - -static PyObject * -pygtk_text_iter_set_line(PyGtkTextIter_Object *self, PyObject *args) -{ - int line_number; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.set_line", &line_number)) - return NULL; - gtk_text_iter_set_line(&self->iter, line_number); - Py_INCREF(Py_None); - return Py_None; -} - -static PyObject * -pygtk_text_iter_set_line_offset(PyGtkTextIter_Object *self, PyObject *args) -{ - int char_on_line; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.set_line_offset",&char_on_line)) - return NULL; - gtk_text_iter_set_line_offset(&self->iter, char_on_line); - Py_INCREF(Py_None); - return Py_None; -} - -static PyObject * -pygtk_text_iter_set_line_index(PyGtkTextIter_Object *self, PyObject *args) -{ - int byte_on_line; - - if (!PyArg_ParseTuple(args, "i:GtkTextIter.set_line_index", &byte_on_line)) - return NULL; - gtk_text_iter_set_line_index(&self->iter, byte_on_line); - Py_INCREF(Py_None); - return Py_None; -} - -static PyObject * -pygtk_text_iter_forward_to_end(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.forward_to_end")) - return NULL; - gtk_text_iter_forward_to_end(&self->iter); - Py_INCREF(Py_None); - return Py_None; -} - -static PyObject * -pygtk_text_iter_forward_to_line_end(PyGtkTextIter_Object *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":GtkTextIter.forward_to_line_end")) - return NULL; - return PyInt_FromLong(gtk_text_iter_forward_to_line_end(&self->iter)); -} - -static PyObject * -pygtk_text_iter_forward_to_tag_toggle(PyGtkTextIter_Object *self, - PyObject *args) -{ - PyObject *pytag = Py_None; - GtkTextTag *tag = NULL; - extern PyExtensionClass PyGtkTextTag_Type; - - if (!PyArg_ParseTuple(args, "|O:GtkTextIter.forward_to_tag_toggle", - &pytag)) - return NULL; - if (pygobject_check(pytag, &PyGtkTextTag_Type)) - tag = GTK_TEXT_TAG(pygobject_get(pytag)); - else if (pytag != Py_None) { - PyErr_SetString(PyExc_TypeError, "tag must be a GtkTextTag or None"); - return NULL; - } - return PyInt_FromLong(gtk_text_iter_forward_to_tag_toggle(&self->iter, - tag)); -} - -static PyObject * -pygtk_text_iter_backward_to_tag_toggle(PyGtkTextIter_Object *self, - PyObject *args) -{ - PyObject *pytag = Py_None; - GtkTextTag *tag = NULL; - extern PyExtensionClass PyGtkTextTag_Type; - - if (!PyArg_ParseTuple(args, "|O:GtkTextIter.backward_to_tag_toggle", - &pytag)) - return NULL; - if (pygobject_check(pytag, &PyGtkTextTag_Type)) - tag = GTK_TEXT_TAG(pygobject_get(pytag)); - else if (pytag != Py_None) { - PyErr_SetString(PyExc_TypeError, "tag must be a GtkTextTag or None"); - return NULL; - } - return PyInt_FromLong(gtk_text_iter_backward_to_tag_toggle(&self->iter, - tag)); -} - -/* XXXX - gtk_text_iter_{fore,back}ward_find_char */ - -static PyObject * -pygtk_text_iter_forward_search(PyGtkTextIter_Object *self, PyObject *args) -{ - gchar *str; - gint visible_only, slice; - PyObject *py_limit = Py_None; - GtkTextIter match_start, match_end, *limit = NULL; - - if (!PyArg_ParseTuple(args, "sii|O:GtkTextIter.forward_search", - &str, &visible_only, &slice, &py_limit)) - return NULL; - if (PyGtkTextIter_Check(py_limit)) - limit = PyGtkTextIter_Get(py_limit); - else if (py_limit != Py_None) { - PyErr_SetString(PyExc_TypeError,"limit must be a GtkTextIter or None"); - return NULL; - } - if (gtk_text_iter_forward_search(&self->iter, str, visible_only, slice, - &match_start, &match_end, limit)) - return Py_BuildValue("(NN)", PyGtkTextIter_New(&match_start), - PyGtkTextIter_New(&match_end)); - Py_INCREF(Py_None); - return Py_None; -} - -static PyObject * -pygtk_text_iter_backward_search(PyGtkTextIter_Object *self, PyObject *args) -{ - gchar *str; - gint visible_only, slice; - PyObject *py_limit = Py_None; - GtkTextIter match_start, match_end, *limit = NULL; - - if (!PyArg_ParseTuple(args, "sii|O:GtkTextIter.backward_search", - &str, &visible_only, &slice, &py_limit)) - return NULL; - if (PyGtkTextIter_Check(py_limit)) - limit = PyGtkTextIter_Get(py_limit); - else if (py_limit != Py_None) { - PyErr_SetString(PyExc_TypeError,"limit must be a GtkTextIter or None"); - return NULL; - } - if (gtk_text_iter_backward_search(&self->iter, str, visible_only, slice, - &match_start, &match_end, limit)) - return Py_BuildValue("(NN)", PyGtkTextIter_New(&match_start), - PyGtkTextIter_New(&match_end)); - Py_INCREF(Py_None); - return Py_None; -} - -static PyMethodDef pygtk_text_iter_methods[] = { - { "copy", (PyCFunction)pygtk_text_iter_copy, METH_VARARGS }, - { "get_offset", (PyCFunction)pygtk_text_iter_get_offset, METH_VARARGS }, - { "get_line", (PyCFunction)pygtk_text_iter_get_line, METH_VARARGS }, - { "get_line_offset", (PyCFunction)pygtk_text_iter_get_line_offset, METH_VARARGS }, - { "get_line_index", (PyCFunction)pygtk_text_iter_get_line_index, METH_VARARGS }, - { "get_char", (PyCFunction)pygtk_text_iter_get_char, METH_VARARGS }, - { "get_slice", (PyCFunction)pygtk_text_iter_get_slice, METH_VARARGS }, - { "get_text", (PyCFunction)pygtk_text_iter_get_text, METH_VARARGS }, - { "get_visible_slice", (PyCFunction)pygtk_text_iter_get_visible_slice, METH_VARARGS }, - { "get_visible_text", (PyCFunction)pygtk_text_iter_get_visible_text, METH_VARARGS }, - { "get_pixbuf", (PyCFunction)pygtk_text_iter_get_pixbuf, METH_VARARGS }, - { "get_marks", (PyCFunction)pygtk_text_iter_get_marks, METH_VARARGS }, - { "get_toggled_tags", (PyCFunction)pygtk_text_iter_get_toggled_tags, METH_VARARGS }, - { "begins_tag", (PyCFunction)pygtk_text_iter_begins_tag, METH_VARARGS }, - { "ends_tag", (PyCFunction)pygtk_text_iter_ends_tag, METH_VARARGS }, - { "toggles_tag", (PyCFunction)pygtk_text_iter_toggles_tag, METH_VARARGS }, - { "has_tag", (PyCFunction)pygtk_text_iter_has_tag, METH_VARARGS }, - { "editable", (PyCFunction)pygtk_text_iter_editable, METH_VARARGS }, - { "starts_line", (PyCFunction)pygtk_text_iter_starts_line, METH_VARARGS }, - { "ends_line", (PyCFunction)pygtk_text_iter_ends_line, METH_VARARGS }, - { "get_chars_in_line", (PyCFunction)pygtk_text_iter_get_chars_in_line, METH_VARARGS }, - { "is_end", (PyCFunction)pygtk_text_iter_is_end, METH_VARARGS }, - { "is_start", (PyCFunction)pygtk_text_iter_is_start, METH_VARARGS }, - { "forward_char", (PyCFunction)pygtk_text_iter_forward_char, METH_VARARGS }, - { "backward_char", (PyCFunction)pygtk_text_iter_backward_char, METH_VARARGS }, - { "forward_chars", (PyCFunction)pygtk_text_iter_forward_chars, METH_VARARGS }, - { "backward_chars", (PyCFunction)pygtk_text_iter_backward_chars, METH_VARARGS }, - { "forward_line", (PyCFunction)pygtk_text_iter_forward_line, METH_VARARGS }, - { "backward_line", (PyCFunction)pygtk_text_iter_backward_line, METH_VARARGS }, - { "forward_lines", (PyCFunction)pygtk_text_iter_forward_lines, METH_VARARGS }, - { "backward_lines", (PyCFunction)pygtk_text_iter_backward_lines, METH_VARARGS }, - { "forward_word_ends", (PyCFunction)pygtk_text_iter_forward_word_ends, METH_VARARGS }, - { "backward_word_starts", (PyCFunction)pygtk_text_iter_backward_word_starts, METH_VARARGS }, - { "forward_word_end", (PyCFunction)pygtk_text_iter_forward_word_end, METH_VARARGS }, - { "backward_word_start", (PyCFunction)pygtk_text_iter_backward_word_start, METH_VARARGS }, - { "set_offset", (PyCFunction)pygtk_text_iter_set_offset, METH_VARARGS }, - { "set_line", (PyCFunction)pygtk_text_iter_set_line, METH_VARARGS }, - { "set_line_offset", (PyCFunction)pygtk_text_iter_set_line_offset, METH_VARARGS }, - { "set_line_index", (PyCFunction)pygtk_text_iter_set_line_index, METH_VARARGS }, - { "forward_to_end", (PyCFunction)pygtk_text_iter_forward_to_end, METH_VARARGS }, - { "forward_to_line_end", (PyCFunction)pygtk_text_iter_forward_to_line_end, METH_VARARGS }, - { "forward_to_tag_toggle", (PyCFunction)pygtk_text_iter_forward_to_tag_toggle, METH_VARARGS }, - { "backward_to_tag_toggle", (PyCFunction)pygtk_text_iter_backward_to_tag_toggle, METH_VARARGS }, - { "forward_search", (PyCFunction)pygtk_text_iter_forward_search, METH_VARARGS }, - { "backward_search", (PyCFunction)pygtk_text_iter_backward_search, METH_VARARGS }, - { NULL, NULL, 0 } -}; - -static PyObject * -pygtk_text_iter_getattr(PyGtkTextIter_Object *self, char *attr) -{ - return Py_FindMethod(pygtk_text_iter_methods, (PyObject *)self, attr); -} - -PyTypeObject PyGtkTextIter_Type = { - PyObject_HEAD_INIT(NULL) - 0, - "GtkTextIter", - sizeof(PyGtkTextIter_Object), - 0, - (destructor)pygtk_text_iter_dealloc, - (printfunc)0, - (getattrfunc)pygtk_text_iter_getattr, - (setattrfunc)0, - (cmpfunc)pygtk_text_iter_compare, - (reprfunc)0, - 0, - 0, - 0, - (hashfunc)pygtk_text_iter_hash, - (ternaryfunc)0, - (reprfunc)0, - 0L,0L,0L,0L, - NULL -}; - PyObject * pygtk_tree_path_to_pyobject(GtkTreePath *path) { @@ -3186,20 +2502,6 @@ PyGtkSelectionData_to_value(GValue *value, PyObject *object) return -1; } static PyObject * -PyGtkTextIter_from_value(const GValue *value) -{ - return PyGtkTextIter_New(g_value_get_boxed(value)); -} -static int -PyGtkTextIter_to_value(GValue *value, PyObject *object) -{ - if (PyGtkTextIter_Check(object)) { - g_value_set_boxed(value, PyGtkTextIter_Get(object)); - return 0; - } - return -1; -} -static PyObject * PyGtkTreePath_from_value(const GValue *value) { GtkTreePath *path = (GtkTreePath *)g_value_get_boxed(value); @@ -3248,7 +2550,6 @@ _pygtk_register_boxed_types(PyObject *moddict) register_tp(GdkCursor); register_tp(GtkCTreeNode); register_tp(GdkDevice); - register_tp2(GtkTextIter, GTK_TYPE_TEXT_ITER); pyg_boxed_register(GTK_TYPE_TREE_PATH, PyGtkTreePath_from_value, PyGtkTreePath_to_value); diff --git a/gtk/gtk.defs b/gtk/gtk.defs index 3794ea6f..09c95c52 100644 --- a/gtk/gtk.defs +++ b/gtk/gtk.defs @@ -766,6 +766,13 @@ (release-func gtk_accel_group_unref) ) +(boxed TextIter + (in-module Gtk) + (c-name GtkTextIter) + (copy-func gtk_text_iter_copy) + (release-func gtk_text_iter_free) +) + (boxed TreeIter (in-module Gtk) (c-name GtkTreeIter) @@ -1586,11 +1593,11 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtk.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtk.h -;; From /opt/pango/include/gtk-2.0/gtk/gtkaccelgroup.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkaccelgroup.h (function gtk_accelerator_valid (c-name gtk_accelerator_valid) @@ -1784,7 +1791,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkaccellabel.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkaccellabel.h (function gtk_accel_label_get_type (c-name gtk_accel_label_get_type) @@ -1819,7 +1826,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkadjustment.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkadjustment.h (function gtk_adjustment_get_type (c-name gtk_adjustment_get_type) @@ -1867,7 +1874,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkalignment.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkalignment.h (function gtk_alignment_get_type (c-name gtk_alignment_get_type) @@ -1896,7 +1903,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkarrow.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkarrow.h (function gtk_arrow_get_type (c-name gtk_arrow_get_type) @@ -1921,7 +1928,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkaspectframe.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkaspectframe.h (function gtk_aspect_frame_get_type (c-name gtk_aspect_frame_get_type) @@ -1951,7 +1958,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkbbox.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkbbox.h (function gtk_button_box_get_type (c-name gtk_button_box_get_type) @@ -1972,7 +1979,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkbin.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkbin.h (function gtk_bin_get_type (c-name gtk_bin_get_type) @@ -1981,7 +1988,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkbindings.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkbindings.h (method init (of-object PatternSpec (Gtk)) @@ -2083,7 +2090,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkbox.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkbox.h (function gtk_box_get_type (c-name gtk_box_get_type) @@ -2176,7 +2183,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkbutton.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkbutton.h (function gtk_button_get_type (c-name gtk_button_get_type) @@ -2253,7 +2260,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkcalendar.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcalendar.h (function gtk_calendar_get_type (c-name gtk_calendar_get_type) @@ -2331,7 +2338,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkcellrenderer.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcellrenderer.h (function gtk_cell_renderer_get_type (c-name gtk_cell_renderer_get_type) @@ -2373,7 +2380,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h (function gtk_cell_renderer_pixbuf_get_type (c-name gtk_cell_renderer_pixbuf_get_type) @@ -2388,7 +2395,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkcellrenderertext.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcellrenderertext.h (function gtk_cell_renderer_text_get_type (c-name gtk_cell_renderer_text_get_type) @@ -2403,7 +2410,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkcellrenderertextpixbuf.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcellrenderertextpixbuf.h (function gtk_cell_renderer_text_pixbuf_get_type (c-name gtk_cell_renderer_text_pixbuf_get_type) @@ -2418,7 +2425,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkcellrenderertoggle.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcellrenderertoggle.h (function gtk_cell_renderer_toggle_get_type (c-name gtk_cell_renderer_toggle_get_type) @@ -2452,7 +2459,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkcheckbutton.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcheckbutton.h (function gtk_check_button_get_type (c-name gtk_check_button_get_type) @@ -2479,7 +2486,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkcheckmenuitem.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcheckmenuitem.h (function gtk_check_menu_item_get_type (c-name gtk_check_menu_item_get_type) @@ -2533,7 +2540,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkclipboard.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkclipboard.h (method set_with_data (of-object Clipboard (Gtk)) @@ -2609,7 +2616,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkclist.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkclist.h (function gtk_clist_get_type (c-name gtk_clist_get_type) @@ -3187,7 +3194,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkcolorsel.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcolorsel.h (function gtk_color_selection_get_type (c-name gtk_color_selection_get_type) @@ -3295,7 +3302,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkcolorseldialog.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcolorseldialog.h (function gtk_color_selection_dialog_get_type (c-name gtk_color_selection_dialog_get_type) @@ -3311,7 +3318,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkcombo.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcombo.h (function gtk_combo_get_type (c-name gtk_combo_get_type) @@ -3376,11 +3383,11 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkcompat.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcompat.h -;; From /opt/pango/include/gtk-2.0/gtk/gtkcontainer.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcontainer.h (function gtk_container_get_type (c-name gtk_container_get_type) @@ -3639,7 +3646,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkctree.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkctree.h (function gtk_ctree_get_type (c-name gtk_ctree_get_type) @@ -4216,7 +4223,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkcurve.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkcurve.h (function gtk_curve_get_type (c-name gtk_curve_get_type) @@ -4277,11 +4284,11 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkdebug.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkdebug.h -;; From /opt/pango/include/gtk-2.0/gtk/gtkdialog.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkdialog.h (function gtk_dialog_get_type (c-name gtk_dialog_get_type) @@ -4372,7 +4379,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkdnd.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkdnd.h (method drag_get_data (of-object Widget (Gtk)) @@ -4543,7 +4550,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkdrawingarea.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkdrawingarea.h (function gtk_drawing_area_get_type (c-name gtk_drawing_area_get_type) @@ -4566,7 +4573,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkeditable.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkeditable.h (function gtk_editable_get_type (c-name gtk_editable_get_type) @@ -4660,7 +4667,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkoldeditable.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkoldeditable.h (function gtk_old_editable_get_type (c-name gtk_old_editable_get_type) @@ -4682,7 +4689,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkentry.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkentry.h (function gtk_entry_get_type (c-name gtk_entry_get_type) @@ -4791,11 +4798,11 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkenums.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkenums.h -;; From /opt/pango/include/gtk-2.0/gtk/gtkeventbox.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkeventbox.h (function gtk_event_box_get_type (c-name gtk_event_box_get_type) @@ -4810,7 +4817,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkfilesel.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkfilesel.h (function gtk_file_selection_get_type (c-name gtk_file_selection_get_type) @@ -4858,7 +4865,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkfixed.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkfixed.h (function gtk_fixed_get_type (c-name gtk_fixed_get_type) @@ -4891,7 +4898,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkfontsel.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkfontsel.h (function gtk_font_selection_get_type (c-name gtk_font_selection_get_type) @@ -4982,7 +4989,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkframe.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkframe.h (function gtk_frame_get_type (c-name gtk_frame_get_type) @@ -5033,7 +5040,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkgamma.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkgamma.h (function gtk_gamma_curve_get_type (c-name gtk_gamma_curve_get_type) @@ -5048,7 +5055,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkgc.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkgc.h (function gtk_gc_release (c-name gtk_gc_release) @@ -5058,7 +5065,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkhandlebox.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkhandlebox.h (function gtk_handle_box_get_type (c-name gtk_handle_box_get_type) @@ -5094,7 +5101,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkhbbox.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkhbbox.h (function gtk_hbutton_box_get_type (c-name gtk_hbutton_box_get_type) @@ -5108,7 +5115,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkhbox.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkhbox.h (function gtk_hbox_get_type (c-name gtk_hbox_get_type) @@ -5125,7 +5132,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkhpaned.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkhpaned.h (function gtk_hpaned_get_type (c-name gtk_hpaned_get_type) @@ -5140,7 +5147,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkhruler.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkhruler.h (function gtk_hruler_get_type (c-name gtk_hruler_get_type) @@ -5155,7 +5162,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkhscale.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkhscale.h (function gtk_hscale_get_type (c-name gtk_hscale_get_type) @@ -5171,7 +5178,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkhscrollbar.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkhscrollbar.h (function gtk_hscrollbar_get_type (c-name gtk_hscrollbar_get_type) @@ -5187,7 +5194,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkhseparator.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkhseparator.h (function gtk_hseparator_get_type (c-name gtk_hseparator_get_type) @@ -5202,7 +5209,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkiconfactory.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkiconfactory.h (function gtk_icon_factory_get_type (c-name gtk_icon_factory_get_type) @@ -5461,7 +5468,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkimage.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkimage.h (function gtk_image_get_type (c-name gtk_image_get_type) @@ -5625,7 +5632,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkimagemenuitem.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkimagemenuitem.h (function gtk_image_menu_item_get_type (c-name gtk_image_menu_item_get_type) @@ -5670,7 +5677,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkimcontext.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkimcontext.h (function gtk_im_context_get_type (c-name gtk_im_context_get_type) @@ -5732,7 +5739,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkimmulticontext.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkimmulticontext.h (function gtk_im_multicontext_get_type (c-name gtk_im_multicontext_get_type) @@ -5747,7 +5754,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkinputdialog.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkinputdialog.h (function gtk_input_dialog_get_type (c-name gtk_input_dialog_get_type) @@ -5762,7 +5769,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkinvisible.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkinvisible.h (function gtk_invisible_get_type (c-name gtk_invisible_get_type) @@ -5777,7 +5784,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkitem.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkitem.h (function gtk_item_get_type (c-name gtk_item_get_type) @@ -5804,7 +5811,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkitemfactory.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkitemfactory.h (function gtk_item_factory_get_type (c-name gtk_item_factory_get_type) @@ -6036,7 +6043,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtklabel.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtklabel.h (function gtk_label_get_type (c-name gtk_label_get_type) @@ -6189,7 +6196,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtklayout.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtklayout.h (function gtk_layout_get_type (c-name gtk_layout_get_type) @@ -6270,7 +6277,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtklist.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtklist.h (function gtk_list_get_type (c-name gtk_list_get_type) @@ -6451,7 +6458,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtklistitem.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtklistitem.h (function gtk_list_item_get_type (c-name gtk_list_item_get_type) @@ -6485,7 +6492,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkliststore.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkliststore.h (function gtk_list_store_get_type (c-name gtk_list_store_get_type) @@ -6577,7 +6584,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkmain.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkmain.h (function check_version (c-name gtk_check_version) @@ -6859,7 +6866,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkmenu.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkmenu.h (function gtk_menu_get_type (c-name gtk_menu_get_type) @@ -6966,7 +6973,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkmenubar.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkmenubar.h (function gtk_menu_bar_get_type (c-name gtk_menu_bar_get_type) @@ -7003,7 +7010,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkmenuitem.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkmenuitem.h (function gtk_menu_item_get_type (c-name gtk_menu_item_get_type) @@ -7098,7 +7105,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkmenushell.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkmenushell.h (function gtk_menu_shell_get_type (c-name gtk_menu_shell_get_type) @@ -7156,7 +7163,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkmessagedialog.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkmessagedialog.h (function gtk_message_dialog_get_type (c-name gtk_message_dialog_get_type) @@ -7177,7 +7184,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkmisc.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkmisc.h (function gtk_misc_get_type (c-name gtk_misc_get_type) @@ -7201,7 +7208,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtknotebook.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtknotebook.h (function gtk_notebook_get_type (c-name gtk_notebook_get_type) @@ -7457,7 +7464,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkobject.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkobject.h (function gtk_object_get_type (c-name gtk_object_get_type) @@ -7610,7 +7617,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkoptionmenu.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkoptionmenu.h (function gtk_option_menu_get_type (c-name gtk_option_menu_get_type) @@ -7657,7 +7664,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkpaned.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkpaned.h (function gtk_paned_get_type (c-name gtk_paned_get_type) @@ -7710,7 +7717,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkpixmap.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkpixmap.h (function gtk_pixmap_get_type (c-name gtk_pixmap_get_type) @@ -7750,7 +7757,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkplug.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkplug.h (function gtk_plug_get_type (c-name gtk_plug_get_type) @@ -7773,7 +7780,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkpreview.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkpreview.h (function gtk_preview_get_type (c-name gtk_preview_get_type) @@ -7887,11 +7894,11 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkprivate.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkprivate.h -;; From /opt/pango/include/gtk-2.0/gtk/gtkprogress.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkprogress.h (function gtk_progress_get_type (c-name gtk_progress_get_type) @@ -7991,7 +7998,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkprogressbar.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkprogressbar.h (function gtk_progress_bar_get_type (c-name gtk_progress_bar_get_type) @@ -8105,7 +8112,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkradiobutton.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkradiobutton.h (function gtk_radio_button_get_type (c-name gtk_radio_button_get_type) @@ -8175,7 +8182,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkradiomenuitem.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkradiomenuitem.h (function gtk_radio_menu_item_get_type (c-name gtk_radio_menu_item_get_type) @@ -8220,7 +8227,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkrange.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkrange.h (function gtk_range_get_type (c-name gtk_range_get_type) @@ -8291,7 +8298,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkrc.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkrc.h (function rc_add_default_file (c-name gtk_rc_add_default_file) @@ -8435,7 +8442,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkruler.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkruler.h (function gtk_ruler_get_type (c-name gtk_ruler_get_type) @@ -8473,7 +8480,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkscale.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkscale.h (function gtk_scale_get_type (c-name gtk_scale_get_type) @@ -8521,7 +8528,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkscrollbar.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkscrollbar.h (function gtk_scrollbar_get_type (c-name gtk_scrollbar_get_type) @@ -8530,7 +8537,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkscrolledwindow.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkscrolledwindow.h (function gtk_scrolled_window_get_type (c-name gtk_scrolled_window_get_type) @@ -8602,7 +8609,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkselection.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkselection.h (function gtk_target_list_new (c-name gtk_target_list_new) @@ -8775,7 +8782,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkseparator.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkseparator.h (function gtk_separator_get_type (c-name gtk_separator_get_type) @@ -8783,7 +8790,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkseparatormenuitem.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkseparatormenuitem.h (function gtk_separator_menu_item_get_type (c-name gtk_separator_menu_item_get_type) @@ -8796,7 +8803,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtksettings.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtksettings.h (function gtk_settings_get_type (c-name gtk_settings_get_type) @@ -8899,7 +8906,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtksizegroup.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtksizegroup.h (function gtk_size_group_get_type (c-name gtk_size_group_get_type) @@ -8941,7 +8948,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtksocket.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtksocket.h (function gtk_socket_new (c-name gtk_socket_new) @@ -8963,7 +8970,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkspinbutton.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkspinbutton.h (function gtk_spin_button_get_type (c-name gtk_spin_button_get_type) @@ -9095,7 +9102,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkstatusbar.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkstatusbar.h (function gtk_statusbar_get_type (c-name gtk_statusbar_get_type) @@ -9140,7 +9147,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkstock.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkstock.h (function stock_add (c-name gtk_stock_add) @@ -9182,7 +9189,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkstyle.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkstyle.h (function gtk_style_get_type (c-name gtk_style_get_type) @@ -9917,7 +9924,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktable.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktable.h (function gtk_table_get_type (c-name gtk_table_get_type) @@ -10006,7 +10013,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktearoffmenuitem.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktearoffmenuitem.h (function gtk_tearoff_menu_item_get_type (c-name gtk_tearoff_menu_item_get_type) @@ -10020,7 +10027,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtktextbuffer.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktextbuffer.h (function gtk_text_buffer_get_type (c-name gtk_text_buffer_get_type) @@ -10456,7 +10463,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktextchild.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktextchild.h (function gtk_text_child_anchor_get_type (c-name gtk_text_child_anchor_get_type) @@ -10482,11 +10489,11 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktextdisplay.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktextdisplay.h -;; From /opt/pango/include/gtk-2.0/gtk/gtktextiter.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktextiter.h (method get_buffer (of-object TextIter (Gtk)) @@ -10530,6 +10537,18 @@ (return-type gint) ) +(method get_visible_line_offset + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_get_visible_line_offset) + (return-type gint) +) + +(method get_visible_line_index + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_get_visible_line_index) + (return-type gint) +) + (method get_char (of-object TextIter (Gtk)) (c-name gtk_text_iter_get_char) @@ -10576,6 +10595,12 @@ (return-type GSList*) ) +(method get_child_anchor + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_get_child_anchor) + (return-type GtkTextChildAnchor*) +) + (method get_toggled_tags (of-object TextIter (Gtk)) (c-name gtk_text_iter_get_toggled_tags) @@ -10611,6 +10636,12 @@ (parameter (type-and-name GtkTextTag* tag)) ) +(method get_tags + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_get_tags) + (return-type GSList*) +) + (method editable (of-object TextIter (Gtk)) (c-name gtk_text_iter_editable) @@ -10618,6 +10649,42 @@ (parameter (type-and-name gboolean default_setting)) ) +(method starts_word + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_starts_word) + (return-type gboolean) +) + +(method ends_word + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_ends_word) + (return-type gboolean) +) + +(method inside_word + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_inside_word) + (return-type gboolean) +) + +(method starts_sentence + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_starts_sentence) + (return-type gboolean) +) + +(method ends_sentence + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_ends_sentence) + (return-type gboolean) +) + +(method inside_sentence + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_inside_sentence) + (return-type gboolean) +) + (method starts_line (of-object TextIter (Gtk)) (c-name gtk_text_iter_starts_line) @@ -10630,12 +10697,24 @@ (return-type gboolean) ) +(method is_cursor_position + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_is_cursor_position) + (return-type gboolean) +) + (method get_chars_in_line (of-object TextIter (Gtk)) (c-name gtk_text_iter_get_chars_in_line) (return-type gint) ) +(method get_bytes_in_line + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_get_bytes_in_line) + (return-type gint) +) + (method get_attributes (of-object TextIter (Gtk)) (c-name gtk_text_iter_get_attributes) @@ -10643,27 +10722,33 @@ (parameter (type-and-name GtkTextAttributes* values)) ) -(method is_last +(method get_language (of-object TextIter (Gtk)) - (c-name gtk_text_iter_is_last) + (c-name gtk_text_iter_get_language) + (return-type PangoLanguage*) +) + +(method is_end + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_is_end) (return-type gboolean) ) -(method is_first +(method is_start (of-object TextIter (Gtk)) - (c-name gtk_text_iter_is_first) + (c-name gtk_text_iter_is_start) (return-type gboolean) ) -(method next_char +(method forward_char (of-object TextIter (Gtk)) - (c-name gtk_text_iter_next_char) + (c-name gtk_text_iter_forward_char) (return-type gboolean) ) -(method prev_char +(method backward_char (of-object TextIter (Gtk)) - (c-name gtk_text_iter_prev_char) + (c-name gtk_text_iter_backward_char) (return-type gboolean) ) @@ -10707,6 +10792,18 @@ (parameter (type-and-name gint count)) ) +(method forward_word_end + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_forward_word_end) + (return-type gboolean) +) + +(method backward_word_start + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_backward_word_start) + (return-type gboolean) +) + (method forward_word_ends (of-object TextIter (Gtk)) (c-name gtk_text_iter_forward_word_ends) @@ -10721,16 +10818,56 @@ (parameter (type-and-name gint count)) ) -(method forward_word_end +(method forward_sentence_end (of-object TextIter (Gtk)) - (c-name gtk_text_iter_forward_word_end) + (c-name gtk_text_iter_forward_sentence_end) (return-type gboolean) ) -(method backward_word_start +(method backward_sentence_start (of-object TextIter (Gtk)) - (c-name gtk_text_iter_backward_word_start) + (c-name gtk_text_iter_backward_sentence_start) + (return-type gboolean) +) + +(method forward_sentence_ends + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_forward_sentence_ends) + (return-type gboolean) + (parameter (type-and-name gint count)) +) + +(method backward_sentence_starts + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_backward_sentence_starts) + (return-type gboolean) + (parameter (type-and-name gint count)) +) + +(method forward_cursor_position + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_forward_cursor_position) + (return-type gboolean) +) + +(method backward_cursor_position + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_backward_cursor_position) + (return-type gboolean) +) + +(method forward_cursor_positions + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_forward_cursor_positions) + (return-type gboolean) + (parameter (type-and-name gint count)) +) + +(method backward_cursor_positions + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_backward_cursor_positions) (return-type gboolean) + (parameter (type-and-name gint count)) ) (method set_offset @@ -10754,30 +10891,51 @@ (parameter (type-and-name gint char_on_line)) ) +(method set_line_index + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_set_line_index) + (return-type none) + (parameter (type-and-name gint byte_on_line)) +) + (method forward_to_end (of-object TextIter (Gtk)) (c-name gtk_text_iter_forward_to_end) (return-type none) ) -(method forward_to_newline +(method forward_to_line_end (of-object TextIter (Gtk)) - (c-name gtk_text_iter_forward_to_newline) + (c-name gtk_text_iter_forward_to_line_end) (return-type gboolean) ) +(method set_visible_line_offset + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_set_visible_line_offset) + (return-type none) + (parameter (type-and-name gint char_on_line)) +) + +(method set_visible_line_index + (of-object TextIter (Gtk)) + (c-name gtk_text_iter_set_visible_line_index) + (return-type none) + (parameter (type-and-name gint byte_on_line)) +) + (method forward_to_tag_toggle (of-object TextIter (Gtk)) (c-name gtk_text_iter_forward_to_tag_toggle) (return-type gboolean) - (parameter (type-and-name GtkTextTag* tag)) + (parameter (type-and-name GtkTextTag* tag) (null-ok)) ) (method backward_to_tag_toggle (of-object TextIter (Gtk)) (c-name gtk_text_iter_backward_to_tag_toggle) (return-type gboolean) - (parameter (type-and-name GtkTextTag* tag)) + (parameter (type-and-name GtkTextTag* tag) (null-ok)) ) (method forward_find_char @@ -10786,6 +10944,7 @@ (return-type gboolean) (parameter (type-and-name GtkTextCharPredicate pred)) (parameter (type-and-name gpointer user_data)) + (parameter (type-and-name const-GtkTextIter* limit)) ) (method backward_find_char @@ -10794,6 +10953,7 @@ (return-type gboolean) (parameter (type-and-name GtkTextCharPredicate pred)) (parameter (type-and-name gpointer user_data)) + (parameter (type-and-name const-GtkTextIter* limit)) ) (method forward_search @@ -10805,15 +10965,19 @@ (parameter (type-and-name gboolean slice)) (parameter (type-and-name GtkTextIter* match_start)) (parameter (type-and-name GtkTextIter* match_end)) + (parameter (type-and-name const-GtkTextIter* limit) (null-ok)) ) (method backward_search (of-object TextIter (Gtk)) (c-name gtk_text_iter_backward_search) (return-type gboolean) - (parameter (type-and-name const-char* str)) + (parameter (type-and-name const-gchar* str)) (parameter (type-and-name gboolean visible_only)) (parameter (type-and-name gboolean slice)) + (parameter (type-and-name GtkTextIter* match_start)) + (parameter (type-and-name GtkTextIter* match_end)) + (parameter (type-and-name const-GtkTextIter* limit) (null-ok)) ) (method equal @@ -10838,9 +11002,9 @@ (parameter (type-and-name const-GtkTextIter* end)) ) -(method reorder +(method order (of-object TextIter (Gtk)) - (c-name gtk_text_iter_reorder) + (c-name gtk_text_iter_order) (return-type none) (parameter (type-and-name GtkTextIter* second)) ) @@ -10853,10 +11017,7 @@ ) - - - -;; From /opt/pango/include/gtk-2.0/gtk/gtktextmark.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktextmark.h (function gtk_text_mark_get_type (c-name gtk_text_mark_get_type) @@ -10902,7 +11063,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktexttag.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktexttag.h (function gtk_text_tag_get_type (c-name gtk_text_tag_get_type) @@ -10971,7 +11132,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktexttagtable.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktexttagtable.h (function gtk_text_tag_table_get_type (c-name gtk_text_tag_table_get_type) @@ -11021,7 +11182,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktextview.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktextview.h (function gtk_text_view_get_type (c-name gtk_text_view_get_type) @@ -11402,7 +11563,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtktipsquery.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktipsquery.h (function gtk_tips_query_get_type (c-name gtk_tips_query_get_type) @@ -11444,7 +11605,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktogglebutton.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktogglebutton.h (function gtk_toggle_button_get_type (c-name gtk_toggle_button_get_type) @@ -11511,7 +11672,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtktoolbar.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktoolbar.h (function gtk_toolbar_get_type (c-name gtk_toolbar_get_type) @@ -11681,7 +11842,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktooltips.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktooltips.h (function gtk_tooltips_get_type (c-name gtk_tooltips_get_type) @@ -11743,7 +11904,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtktreednd.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktreednd.h (function gtk_tree_drag_source_get_type (c-name gtk_tree_drag_source_get_type) @@ -11804,7 +11965,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtktreemodel.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktreemodel.h (function gtk_tree_model_get_type (c-name gtk_tree_model_get_type) @@ -12147,7 +12308,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtktreemodelsort.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktreemodelsort.h (function gtk_tree_model_sort_get_type (c-name gtk_tree_model_sort_get_type) @@ -12197,7 +12358,7 @@ ; ) -;; From /opt/pango/include/gtk-2.0/gtk/gtktreeselection.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktreeselection.h (function gtk_tree_selection_get_type (c-name gtk_tree_selection_get_type) @@ -12291,7 +12452,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktreesortable.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktreesortable.h (function gtk_tree_sortable_get_type (c-name gtk_tree_sortable_get_type) @@ -12331,7 +12492,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtktreestore.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktreestore.h (function gtk_tree_store_get_type (c-name gtk_tree_store_get_type) @@ -12459,7 +12620,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktreeview.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktreeview.h (function gtk_tree_view_get_type (c-name gtk_tree_view_get_type) @@ -12838,7 +12999,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtktreeviewcolumn.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktreeviewcolumn.h (function gtk_tree_view_column_get_type (c-name gtk_tree_view_column_get_type) @@ -13068,7 +13229,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtktypeutils.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtktypeutils.h (method unique (of-object Type (Gtk)) @@ -13117,7 +13278,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkvbbox.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkvbbox.h (function gtk_vbutton_box_get_type (c-name gtk_vbutton_box_get_type) @@ -13131,7 +13292,7 @@ ) -;; From /opt/pango/include/gtk-2.0/gtk/gtkvbox.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkvbox.h (function gtk_vbox_get_type (c-name gtk_vbox_get_type) @@ -13148,7 +13309,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkviewport.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkviewport.h (function gtk_viewport_get_type (c-name gtk_viewport_get_type) @@ -13198,7 +13359,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkvpaned.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkvpaned.h (function gtk_vpaned_get_type (c-name gtk_vpaned_get_type) @@ -13213,7 +13374,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkvruler.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkvruler.h (function gtk_vruler_get_type (c-name gtk_vruler_get_type) @@ -13228,7 +13389,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkvscale.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkvscale.h (function gtk_vscale_get_type (c-name gtk_vscale_get_type) @@ -13244,7 +13405,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkvscrollbar.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkvscrollbar.h (function gtk_vscrollbar_get_type (c-name gtk_vscrollbar_get_type) @@ -13260,7 +13421,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkvseparator.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkvseparator.h (function gtk_vseparator_get_type (c-name gtk_vseparator_get_type) @@ -13275,7 +13436,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkwidget.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkwidget.h (function gtk_widget_get_type (c-name gtk_widget_get_type) @@ -14043,7 +14204,7 @@ -;; From /opt/pango/include/gtk-2.0/gtk/gtkwindow.h +;; From /opt/gtk2/include/gtk-2.0/gtk/gtkwindow.h (function gtk_window_get_type (c-name gtk_window_get_type) diff --git a/gtk/gtk.override b/gtk/gtk.override index 0c8a48ea..4ded69e2 100644 --- a/gtk/gtk.override +++ b/gtk/gtk.override @@ -3976,6 +3976,267 @@ _wrap_gtk_selection_add_targets(PyGObject *self, PyObject *args, return Py_None; } %% +ignore gtk_text_iter_free +%% +override gtk_text_iter_copy +static PyObject * +_wrap_gtk_text_iter_copy(PyGBoxed *self, PyObject *args) +{ + if (!PyArg_ParseTuple(args, ":GtkTextIter.copy")) + return NULL; + return pyg_boxed_new(GTK_TYPE_TEXT_ITER, pyg_boxed_get(self, GtkTextIter), + TRUE, TRUE); +} +%% +override gtk_text_iter_get_char +static PyObject * +_wrap_gtk_text_iter_get_char(PyGBoxed *self, PyObject *args) +{ + gunichar chr; + Py_UNICODE pychr; + + if (!PyArg_ParseTuple(args, ":GtkTextIter.get_char")) + return NULL; + chr = gtk_text_iter_get_char(pyg_boxed_get(self, GtkTextIter)); + if (chr > 0xffff) { + PyErr_SetString(PyExc_RuntimeError, "python's broken unicode handling only supports 16 bit unicode, and you just hit this limit"); + return NULL; + } + pychr = (Py_UNICODE)chr; + return PyUnicode_FromUnicode(&pychr, 1); + +} +%% +override gtk_text_iter_get_slice kwargs +static PyObject * +_wrap_gtk_text_iter_get_slice(PyGBoxed *self, PyObject *args, PyObject *kwargs) +{ + static char *kwlist[] = { "end", NULL }; + PyGBoxed *end; + gchar *text; + PyObject *pytext; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:GtkTextIter.get_slice", + kwlist, &end)) + return NULL; + if (!pyg_boxed_check(end, GTK_TYPE_TEXT_ITER)) { + PyErr_SetString(PyExc_TypeError, "end must be a GtkTextIter"); + return NULL; + } + text = gtk_text_iter_get_slice(pyg_boxed_get(self, GtkTextIter), + pyg_boxed_get(end, GtkTextIter)); + pytext = PyUnicode_DecodeUTF8(text, strlen(text), "strict"); + g_free(text); + return pytext; +} +%% +override gtk_text_iter_get_text kwargs +static PyObject * +_wrap_gtk_text_iter_get_text(PyGBoxed *self, PyObject *args, PyObject *kwargs) +{ + static char *kwlist[] = { "end", NULL }; + PyGBoxed *end; + gchar *text; + PyObject *pytext; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:GtkTextIter.get_text", + kwlist, &end)) + return NULL; + if (!pyg_boxed_check(end, GTK_TYPE_TEXT_ITER)) { + PyErr_SetString(PyExc_TypeError, "end must be a GtkTextIter"); + return NULL; + } + text = gtk_text_iter_get_text(pyg_boxed_get(self, GtkTextIter), + pyg_boxed_get(end, GtkTextIter)); + pytext = PyUnicode_DecodeUTF8(text, strlen(text), "strict"); + g_free(text); + return pytext; +} +%% +override gtk_text_iter_get_visible_slice kwargs +static PyObject * +_wrap_gtk_text_iter_get_visible_slice(PyGBoxed *self, PyObject *args, + PyObject *kwargs) +{ + static char *kwlist[] = { "end", NULL }; + PyGBoxed *end; + gchar *text; + PyObject *pytext; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "O:GtkTextIter.get_visible_slice", kwlist, + &end)) + return NULL; + if (!pyg_boxed_check(end, GTK_TYPE_TEXT_ITER)) { + PyErr_SetString(PyExc_TypeError, "end must be a GtkTextIter"); + return NULL; + } + text = gtk_text_iter_get_visible_slice(pyg_boxed_get(self, GtkTextIter), + pyg_boxed_get(end, GtkTextIter)); + pytext = PyUnicode_DecodeUTF8(text, strlen(text), "strict"); + g_free(text); + return pytext; +} +%% +override gtk_text_iter_get_visible_text kwargs +static PyObject * +_wrap_gtk_text_iter_get_visible_text(PyGBoxed *self, PyObject *args, + PyObject *kwargs) +{ + static char *kwlist[] = { "end", NULL }; + PyGBoxed *end; + gchar *text; + PyObject *pytext; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "O:GtkTextIter.get_visible_text", kwlist, + &end)) + return NULL; + if (!pyg_boxed_check(end, GTK_TYPE_TEXT_ITER)) { + PyErr_SetString(PyExc_TypeError, "end must be a GtkTextIter"); + return NULL; + } + text = gtk_text_iter_get_visible_text(pyg_boxed_get(self, GtkTextIter), + pyg_boxed_get(end, GtkTextIter)); + pytext = PyUnicode_DecodeUTF8(text, strlen(text), "strict"); + g_free(text); + return pytext; +} +%% +override gtk_text_iter_get_marks +static PyObject * +_wrap_gtk_text_iter_get_marks(PyGBoxed *self, PyObject *args) +{ + GSList *ret, *tmp; + PyObject *pyret; + + if (!PyArg_ParseTuple(args, ":GtkTextIter.get_marks")) + return NULL; + ret = gtk_text_iter_get_marks(pyg_boxed_get(self, GtkTextIter)); + pyret = PyList_New(0); + for (tmp = ret; tmp != NULL; tmp = tmp->next) { + PyObject *mark = pygobject_new((GObject *)tmp->data); + PyList_Append(pyret, mark); + Py_DECREF(mark); + } + g_slist_free(ret); + return pyret; +} +%% +override gtk_text_iter_get_toggled_tags kwargs +static PyObject * +_wrap_gtk_text_iter_get_toggled_tags(PyGBoxed *self, PyObject *args, + PyObject *kwargs) +{ + static char *kwlist[] = { "toggled_on", NULL }; + GSList *ret, *tmp; + int toggled_on; + PyObject *pyret; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "i:GtkTextIter.get_toggled_tags", kwlist, + &toggled_on)) + return NULL; + ret = gtk_text_iter_get_toggled_tags(pyg_boxed_get(self, GtkTextIter), + toggled_on); + pyret = PyList_New(0); + for (tmp = ret; tmp != NULL; tmp = tmp->next) { + PyObject *tag = pygobject_new((GObject *)tmp->data); + PyList_Append(pyret, tag); + Py_DECREF(tag); + } + g_slist_free(ret); + return pyret; +} +%% +override gtk_text_iter_get_tags +static PyObject * +_wrap_gtk_text_iter_get_tags(PyGBoxed *self, PyObject *args) +{ + GSList *ret, *tmp; + PyObject *pyret; + + if (!PyArg_ParseTuple(args, ":GtkTextIter.get_tags")) + return NULL; + ret = gtk_text_iter_get_tags(pyg_boxed_get(self, GtkTextIter)); + pyret = PyList_New(0); + for (tmp = ret; tmp != NULL; tmp = tmp->next) { + PyObject *tag = pygobject_new((GObject *)tmp->data); + PyList_Append(pyret, tag); + Py_DECREF(tag); + } + g_slist_free(ret); + return pyret; +} +%% +override gtk_text_iter_forward_search kwargs +static PyObject * +_wrap_gtk_text_iter_forward_search(PyGBoxed *self, PyObject *args, + PyObject *kwargs) +{ + static char *kwlist[] = { "str", "visible_only", "slice", "limit", NULL }; + gchar *str; + gint visible_only, slice; + PyObject *py_limit = Py_None; + GtkTextIter match_start, match_end, *limit = NULL; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "sii|O:GtkTextIter.forward_search", + kwlist, &str, &visible_only, &slice, + &py_limit)) + return NULL; + if (pyg_boxed_check(py_limit, GTK_TYPE_TEXT_ITER)) + limit = pyg_boxed_get(py_limit, GtkTextIter); + else if (py_limit != Py_None) { + PyErr_SetString(PyExc_TypeError,"limit must be a GtkTextIter or None"); + return NULL; + } + if (gtk_text_iter_forward_search(pyg_boxed_get(self, GtkTextIter), str, + visible_only, slice, &match_start, + &match_end, limit)) + return Py_BuildValue("(NN)", + pyg_boxed_new(GTK_TYPE_TEXT_ITER, &match_start, + TRUE, TRUE), + pyg_boxed_new(GTK_TYPE_TEXT_ITER, &match_end, + TRUE, TRUE)); + Py_INCREF(Py_None); + return Py_None; +} +%% +override gtk_text_iter_backward_search kwargs +static PyObject * +_wrap_gtk_text_iter_backward_search(PyGBoxed *self, PyObject *args, + PyObject *kwargs) +{ + static char *kwlist[] = { "str", "visible_only", "slice", "limit", NULL }; + gchar *str; + gint visible_only, slice; + PyObject *py_limit = Py_None; + GtkTextIter match_start, match_end, *limit = NULL; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "sii|O:GtkTextIter.backward_search", + kwlist, &str, &visible_only, &slice, + &py_limit)) + return NULL; + if (pyg_boxed_check(py_limit, GTK_TYPE_TEXT_ITER)) + limit = pyg_boxed_get(py_limit, GtkTextIter); + else if (py_limit != Py_None) { + PyErr_SetString(PyExc_TypeError,"limit must be a GtkTextIter or None"); + return NULL; + } + if (gtk_text_iter_backward_search(pyg_boxed_get(self, GtkTextIter), str, + visible_only, slice, &match_start, + &match_end, limit)) + return Py_BuildValue("(NN)", + pyg_boxed_new(GTK_TYPE_TEXT_ITER, &match_start, + TRUE, TRUE), + pyg_boxed_new(GTK_TYPE_TEXT_ITER, &match_end, + TRUE, TRUE)); + Py_INCREF(Py_None); + return Py_None; +} +%% override gtk_text_buffer_create_tag kwargs static PyObject * _wrap_gtk_text_buffer_create_tag(PyGObject *self, PyObject *args, PyObject *kwargs) @@ -4006,7 +4267,7 @@ _wrap_gtk_text_buffer_get_iter_at_line_offset(PyGObject *self, PyObject *args, P gtk_text_buffer_get_iter_at_line_offset(GTK_TEXT_BUFFER(self->obj), &iter, line_number, char_offset); - return PyGtkTextIter_New(&iter); + return pyg_boxed_new(GTK_TYPE_TEXT_ITER, &iter, TRUE, TRUE); } %% override gtk_text_buffer_get_iter_at_line_index kwargs @@ -4022,7 +4283,7 @@ _wrap_gtk_text_buffer_get_iter_at_line_index(PyGObject *self, PyObject *args, Py gtk_text_buffer_get_iter_at_line_index(GTK_TEXT_BUFFER(self->obj), &iter, line_number, byte_offset); - return PyGtkTextIter_New(&iter); + return pyg_boxed_new(GTK_TYPE_TEXT_ITER, &iter, TRUE, TRUE); } %% override gtk_text_buffer_get_iter_at_offset kwargs @@ -4038,7 +4299,7 @@ _wrap_gtk_text_buffer_get_iter_at_offset(PyGObject *self, PyObject *args, PyObje gtk_text_buffer_get_iter_at_offset(GTK_TEXT_BUFFER(self->obj), &iter, char_offset); - return PyGtkTextIter_New(&iter); + return pyg_boxed_new(GTK_TYPE_TEXT_ITER, &iter, TRUE, TRUE); } %% override gtk_text_buffer_get_iter_at_line kwargs @@ -4054,7 +4315,7 @@ _wrap_gtk_text_buffer_get_iter_at_line(PyGObject *self, PyObject *args, PyObject gtk_text_buffer_get_iter_at_line(GTK_TEXT_BUFFER(self->obj), &iter, line_number); - return PyGtkTextIter_New(&iter); + return pyg_boxed_new(GTK_TYPE_TEXT_ITER, &iter, TRUE, TRUE); } %% override gtk_text_buffer_get_start_iter @@ -4067,7 +4328,7 @@ _wrap_gtk_text_buffer_get_start_iter(PyGObject *self, PyObject *args) return NULL; gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(self->obj), &iter); - return PyGtkTextIter_New(&iter); + return pyg_boxed_new(GTK_TYPE_TEXT_ITER, &iter, TRUE, TRUE); } %% override gtk_text_buffer_get_end_iter @@ -4080,7 +4341,7 @@ _wrap_gtk_text_buffer_get_end_iter(PyGObject *self, PyObject *args) return NULL; gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(self->obj), &iter); - return PyGtkTextIter_New(&iter); + return pyg_boxed_new(GTK_TYPE_TEXT_ITER, &iter, TRUE, TRUE); } %% override gtk_text_buffer_get_bounds @@ -4093,8 +4354,9 @@ _wrap_gtk_text_buffer_get_bounds(PyGObject *self, PyObject *args) return NULL; gtk_text_buffer_get_bounds(GTK_TEXT_BUFFER(self->obj), &start, &end); - return Py_BuildValue("(NN)", PyGtkTextIter_New(&start), - PyGtkTextIter_New(&end)); + return Py_BuildValue("(NN)", + pyg_boxed_new(GTK_TYPE_TEXT_ITER, &start, TRUE, TRUE), + pyg_boxed_new(GTK_TYPE_TEXT_ITER, &end, TRUE, TRUE)); } %% override gtk_text_buffer_get_iter_at_mark kwargs @@ -4104,7 +4366,6 @@ _wrap_gtk_text_buffer_get_iter_at_mark(PyGObject *self, PyObject *args, PyObject PyGObject *mark; static char *kwlist[] = { "mark", NULL }; GtkTextIter iter; - extern PyExtensionClass PyGtkTextMark_Type; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:GtkTextBuffer.get_iter_at_mark", kwlist, &mark)) return NULL; @@ -4115,7 +4376,7 @@ _wrap_gtk_text_buffer_get_iter_at_mark(PyGObject *self, PyObject *args, PyObject gtk_text_buffer_get_iter_at_mark(GTK_TEXT_BUFFER(self->obj), &iter, GTK_TEXT_MARK(mark->obj)); - return PyGtkTextIter_New(&iter); + return pyg_boxed_new(GTK_TYPE_TEXT_ITER, &iter, TRUE, TRUE); } diff --git a/gtk/pygtk-private.h b/gtk/pygtk-private.h index 665a2d95..a61215d5 100644 --- a/gtk/pygtk-private.h +++ b/gtk/pygtk-private.h @@ -20,7 +20,6 @@ extern PyTypeObject PyGdkAtom_Type; extern PyTypeObject PyGdkCursor_Type; extern PyTypeObject PyGtkCTreeNode_Type; extern PyTypeObject PyGdkDevice_Type; -extern PyTypeObject PyGtkTextIter_Type; /* check the type of a PyObject */ #define PyGdkEvent_Check(v) ((v)->ob_type == &PyGdkEvent_Type) @@ -29,7 +28,6 @@ extern PyTypeObject PyGtkTextIter_Type; #define PyGdkCursor_Check(v) ((v)->ob_type == &PyGdkCursor_Type) #define PyGtkCTreeNode_Check(v) ((v)->ob_type == &PyGtkCTreeNode_Type) #define PyGdkDevice_Check(v) ((v)->ob_type == &PyGdkDevice_Type) -#define PyGtkTextIter_Check(v) ((v)->ob_type == &PyGtkTextIter_Type) /* constructors for PyObject wrappers ... */ PyObject *PyGdkEvent_New(GdkEvent *event); @@ -38,7 +36,6 @@ PyObject *PyGdkAtom_New(GdkAtom atom); PyObject *PyGdkCursor_New(GdkCursor *cursor); PyObject *PyGtkCTreeNode_New(GtkCTreeNode *node); PyObject *PyGdkDevice_New(GdkDevice *device); -PyObject *PyGtkTextIter_New(GtkTextIter *iter); /* miscelaneous functions */ void pygtk_block_threads(void); diff --git a/gtk/pygtk.h b/gtk/pygtk.h index f47f4aa2..a1e73eec 100644 --- a/gtk/pygtk.h +++ b/gtk/pygtk.h @@ -34,9 +34,6 @@ struct _PyGtk_FunctionStruct { PyTypeObject *gdkDevice_type; PyObject *(* gdkDevice_new)(GdkDevice *device); - - PyTypeObject *gtkTextIter_type; - PyObject *(* gtkTextIter_new)(GtkTextIter *iter); }; /* structure definitions for the various object types in PyGTK */ @@ -72,11 +69,6 @@ typedef struct { GdkDevice *obj; } PyGdkDevice_Object; -typedef struct { - PyObject_HEAD - GtkTextIter iter; -} PyGtkTextIter_Object; - /* routines to get the C object value out of the PyObject wrapper */ #define PyGdkEvent_Get(v) (((PyGdkEvent_Object *)(v))->obj) #define PyGtkSelectionData_Get(v) (((PyGtkSelectionData_Object *)(v))->obj) @@ -84,7 +76,6 @@ typedef struct { #define PyGdkCursor_Get(v) (((PyGdkCursor_Object *)(v))->obj) #define PyGtkCTreeNode_Get(v) (((PyGtkCTreeNode_Object *)(v))->node) #define PyGdkDevice_Get(v) (((PyGdkDevice_Object *)(v))->obj) -#define PyGtkTextIter_Get(v) (&((PyGtkTextIter_Object *)(v))->iter) /* this section is dependent on whether we are being included from gtkmodule.c * or not. A similar source level interface should be provided in both @@ -106,7 +97,6 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; #define PyGdkCursor_Type *(_PyGtk_API->gdkCursor_type) #define PyGtkCTreeNode_Type *(_PyGtk_API->gtkCTreeNode_type) #define PyGdkDevice_Type *(_PyGtk_API->gdkDevice_type) -#define PyGtkTextIter_Type *(_PyGtk_API->gtkTextIter_type) /* type checking routines */ #define PyGdkEvent_Check(v) ((v)->ob_type == _PyGtk_API->gdkEvent_type) @@ -115,7 +105,6 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; #define PyGdkCursor_Check(v) ((v)->ob_type == _PyGtk_API->gdkCursor_type) #define PyGtkCTreeNode_Check(v) ((v)->ob_type == _PyGtk_API->gtkCTreeNode_type) #define PyGdkDevice_Check(v) ((v)->ob_type == _PyGtk_API->gdkDevice_type) -#define PyGtkTextIter_Check(v) ((v)->ob_type == _PyGtk_API->gtkTextIter_type) /* type objects */ #define PyGdkEvent_New (_PyGtk_API->gdkEvent_new) @@ -124,7 +113,6 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; #define PyGdkCursor_New (_PyGtk_API->gdkCursor_new) #define PyGtkCTreeNode_New (_PyGtk_API->gtkCTreeNode_new) #define PyGdkDevice_New (_PyGtk_API->gdkDevice_new) -#define PyGtkTextIter_New (_PyGtk_API->gtkTextIter_new) /* miscelaneous other functions */ #define pygtk_block_threads (_PyGtk_API->block_threads) |