diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | pango.defs | 43 | ||||
| -rw-r--r-- | pango.override | 56 |
3 files changed, 109 insertions, 1 deletions
@@ -1,3 +1,14 @@ +2004-04-25 John Finlay <finlay@moeraki.com> + + * pango.defs (pango_language_from_string) Rework as a constructor + for pango.Language. + (pango_language_matches) Rework this as a method for pango.Language. + (pango_language_to_string) Add this as a method. + + * pango.override (_wrap_pango_language_from_string1) + (_wrap_pango_language_matches1) Add these to support deprecated + pango_language functions. + 2004-04-24 John Finlay <finlay@moeraki.com> * pango.override (_wrap_pango_attr_list_filter) Add. @@ -1316,6 +1316,21 @@ (return-type "gboolean") ) +(define-method set_auto_dir + (of-object "PangoLayout") + (c-name "pango_layout_set_auto_dir") + (return-type "none") + (parameters + '("gboolean" "auto_dir") + ) +) + +(define-method get_auto_dir + (of-object "PangoLayout") + (c-name "pango_layout_get_auto_dir") + (return-type "gboolean") +) + (define-method set_alignment (of-object "PangoLayout") (c-name "pango_layout_set_alignment") @@ -1777,6 +1792,7 @@ ;; From /opt/gtk2/include/pango-1.0/pango/pango-types.h (define-function pango_language_from_string + (is-constructor-of "PangoLanguage") (c-name "pango_language_from_string") (return-type "PangoLanguage*") (parameters @@ -1784,13 +1800,38 @@ ) ) +(define-function pango_language_from_string + (c-name "pango_language_from_string1") + (return-type "PangoLanguage*") + (parameters + '("const-char*" "language") + ) + (deprecated "use pango.Language instead") +) + (define-function pango_language_matches - (c-name "pango_language_matches") + (c-name "pango_language_matches1") (return-type "gboolean") (parameters '("PangoLanguage*" "language" (null-ok)) '("const-char*" "range_list") ) + (deprecated "use pango.Language.matches instead") +) + +(define-method matches + (of-object "PangoLanguage") + (c-name "pango_language_matches") + (return-type "gboolean") + (parameters + '("const-char*" "range_list") + ) +) + +(define-method to_string + (of-object "PangoLanguage") + (c-name "pango_language_to_string") + (return-type "const-char*") ) (define-function PIXELS diff --git a/pango.override b/pango.override index e8661b76..9299ec79 100644 --- a/pango.override +++ b/pango.override @@ -1675,3 +1675,59 @@ _wrap_pango_fontset_foreach(PyGObject *self, PyObject *args, PyObject *kwargs) Py_INCREF(Py_None); return Py_None; } +%% +override pango_language_from_string1 kwargs +static PyObject * +_wrap_pango_language_from_string1(PyGObject *self, PyObject *args, + PyObject *kwargs) +{ + static char *kwlist[] = { "language", NULL }; + char *language; + PangoLanguage *ret; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "s:pango_language_from_string", + kwlist, &language)) + return NULL; + if (PyErr_Warn(PyExc_DeprecationWarning, + "use pango.Language instead") < 0) + return NULL; + + ret = pango_language_from_string(language); + /* pyg_boxed_new handles NULL checking */ + return pyg_boxed_new(PANGO_TYPE_LANGUAGE, ret, TRUE, TRUE); +} + +%% +override pango_language_matches1 kwargs +static PyObject * +_wrap_pango_language_matches1(PyGObject *self, PyObject *args, + PyObject *kwargs) +{ + static char *kwlist[] = { "language", "range_list", NULL }; + PyObject *py_language = Py_None, *py_ret; + char *range_list; + int ret; + PangoLanguage *language = NULL; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "Os:pango_language_matches", + kwlist, &py_language, &range_list)) + return NULL; + if (PyErr_Warn(PyExc_DeprecationWarning, + "use pango.Language.matches instead") < 0) + return NULL; + + if (pyg_boxed_check(py_language, PANGO_TYPE_LANGUAGE)) + language = pyg_boxed_get(py_language, PangoLanguage); + else if (py_language != Py_None) { + PyErr_SetString(PyExc_TypeError, + "language should be a PangoLanguage or None"); + return NULL; + } + + ret = pango_language_matches(language, range_list); + py_ret = ret ? Py_True : Py_False; + Py_INCREF(py_ret); + return py_ret; +} |