diff --git a/ChangeLog b/ChangeLog index 021232470d..e79466231c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-29 Lars-Peter Clausen + + * plug-ins/pygimp/gimpui.defs + * plug-ins/pygimp/gimpui.override: + Removed wrappers for GimpRuler, GimpHRuler, GimpVRuler, as those + are going to be removed from libgimpwidgets. + 2008-08-29 Michael Natterer * app/widgets/gimphelp.c: #include "gimpwidgets-utils.h", not diff --git a/plug-ins/pygimp/gimpui.defs b/plug-ins/pygimp/gimpui.defs index bababd9c1d..cecd3376cb 100644 --- a/plug-ins/pygimp/gimpui.defs +++ b/plug-ins/pygimp/gimpui.defs @@ -280,27 +280,6 @@ (gtype-id "GIMP_TYPE_PROGRESS_BAR") ) -(define-object Ruler - (in-module "Gimp") - (parent "GtkWidget") - (c-name "GimpRuler") - (gtype-id "GIMP_TYPE_RULER") -) - -(define-object HRuler - (in-module "Gimp") - (parent "GimpRuler") - (c-name "GimpHRuler") - (gtype-id "GIMP_TYPE_HRULER") -) - -(define-object VRuler - (in-module "Gimp") - (parent "GimpRuler") - (c-name "GimpVRuler") - (gtype-id "GIMP_TYPE_VRULER") -) - (define-object ScrolledPreview (in-module "Gimp") (parent "GimpPreview") @@ -3241,105 +3220,3 @@ (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-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") - ) -) - - - -;; From gimphruler.h - -(define-function gimp_hruler_get_type - (c-name "gimp_hruler_get_type") - (return-type "GType") -) - -(define-function gimp_hruler_new - (c-name "gimp_hruler_new") - (is-constructor-of "GimpHRuler") - (return-type "GtkWidget*") - (properties - '("lower" (optional)) - '("upper" (optional)) - '("max-size" (argname "max_size") (optional)) - ) -) - - - -;; From gimpvruler.h - -(define-function gimp_vruler_get_type - (c-name "gimp_vruler_get_type") - (return-type "GType") -) - -(define-function gimp_vruler_new - (c-name "gimp_vruler_new") - (is-constructor-of "GimpVRuler") - (return-type "GtkWidget*") - (properties - '("lower" (optional)) - '("upper" (optional)) - '("max-size" (argname "max_size") (optional)) - ) -) - - diff --git a/plug-ins/pygimp/gimpui.override b/plug-ins/pygimp/gimpui.override index 4322aad952..2571a1fded 100644 --- a/plug-ins/pygimp/gimpui.override +++ b/plug-ins/pygimp/gimpui.override @@ -1977,16 +1977,3 @@ _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; - gdouble upper; - gdouble max_size; - - gimp_ruler_get_range(GIMP_RULER(self->obj), &lower, &upper, &max_size); - - return Py_BuildValue("(ddd)", lower, upper, max_size); -}