diff --git a/ChangeLog b/ChangeLog index 53126e6bad..a5a29d4541 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-29 Lars-Peter Clausen + + * plug-ins/pygimp/gimpui.defs + * plug-ins/pygimp/gimpui.override: + Readded wrapper for the new GimpRuler. + 2008-08-29 Sven Neumann * libgimpwidgets/gimpruler.c (gimp_ruler_new): fixed gtk-doc comment. diff --git a/plug-ins/pygimp/gimpui.defs b/plug-ins/pygimp/gimpui.defs index cecd3376cb..57ccca3c16 100644 --- a/plug-ins/pygimp/gimpui.defs +++ b/plug-ins/pygimp/gimpui.defs @@ -336,6 +336,13 @@ (gtype-id "GIMP_TYPE_BRUSH_SELECT_BUTTON") ) +(define-object Ruler + (in-module "Gimp") + (parent "GtkWidget") + (c-name "GimpRuler") + (gtype-id "GIMP_TYPE_RULER") +) + (define-object SizeEntry (in-module "Gimp") (parent "GtkTable") @@ -3220,3 +3227,78 @@ (c-name "gimp_zoom_type_get_type") (return-type "GType") ) + + + +;; From gimpruler.h + +(define-function gimp_ruler_get_type + (c-name "gimp_ruler_get_type") + (return-type "GType") +) + +(define-function gimp_ruler_new + (c-name "gimp_ruler_new") + (is-constructor-of "GimpRuler") + (return-type "GtkWidget*") + (properties + '("orientation") + '("lower" (optional)) + '("upper" (optional)) + '("max-size" (argname "max_size") (optional)) + ) +) + +(define-method set_unit + (of-object "GimpRuler") + (c-name "gimp_ruler_set_unit") + (return-type "none") + (parameters + '("GimpUnit" "unit") + ) +) + +(define-method get_unit + (of-object "GimpRuler") + (c-name "gimp_ruler_get_unit") + (return-type "GimpUnit") +) + +(define-method set_position + (of-object "GimpRuler") + (c-name "gimp_ruler_set_position") + (return-type "none") + (parameters + '("gdouble" "position") + ) +) + +(define-method get_position + (of-object "GimpRuler") + (c-name "gimp_ruler_get_position") + (return-type "gdouble") +) + +(define-method set_range + (of-object "GimpRuler") + (c-name "gimp_ruler_set_range") + (return-type "none") + (parameters + '("gdouble" "lower") + '("gdouble" "upper") + '("gdouble" "max_size") + ) +) + +(define-method get_range + (of-object "GimpRuler") + (c-name "gimp_ruler_get_range") + (return-type "none") + (parameters + '("gdouble*" "lower") + '("gdouble*" "upper") + '("gdouble*" "max_size") + ) +) + + diff --git a/plug-ins/pygimp/gimpui.override b/plug-ins/pygimp/gimpui.override index 2571a1fded..debf26bed4 100644 --- a/plug-ins/pygimp/gimpui.override +++ b/plug-ins/pygimp/gimpui.override @@ -1977,3 +1977,14 @@ _wrap_gimp_drawable_preview_new(PyGObject *self, PyObject *args, PyObject *kwarg %% new-constructor GIMP_TYPE_DRAWABLE_PREVIEW +%% +override gimp_ruler_get_range noargs +static PyObject * +_wrap_gimp_ruler_get_range(PyGObject *self) +{ + gdouble lower, upper, max_size; + + gimp_ruler_get_range(GIMP_RULER(self->obj), &lower, &upper, &max_size); + + return Py_BuildValue("(ddd)", lower, upper, max_size); +}