Changeset 357

Timestamp:

09/10/07 15:25:52 (6 years ago)

Author:

bjourne

Message:

Make GtkImageToolDragger take a constructor property so that it
becomes subclassable properly. Add a Python test for it and change the
defs so that a correct Python constructor is generated.

Files:

• gtkimageview/src/gtkimagetooldragger.c (modified) (3 diffs)
• pygtkimageview/src/gtkimageview.defs (modified) (1 diff)
• pygtkimageview/tests/test_module.py (modified) (1 diff)

gtkimageview/src/gtkimagetooldragger.c

@@ -185 +185 @@
-}
-
+enum
+{
+    PROP_IMAGE_VIEW = 1
+};
+
+static void
+gtk_image_tool_dragger_set_property (GObject      *object,
+                                     guint         prop_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+    GtkImageToolDragger *dragger = GTK_IMAGE_TOOL_DRAGGER (object);
+    if (prop_id == PROP_IMAGE_VIEW)
+        dragger->view = g_value_get_object (value);
+    else
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+}
+
-static void
-gtk_image_tool_dragger_class_init (GtkImageToolDraggerClass *klass)
@@ -190 +208 @@
-    GObjectClass *object_class = (GObjectClass *) klass;
-    object_class->finalize = gtk_image_tool_dragger_finalize;
+    object_class->set_property = gtk_image_tool_dragger_set_property;
+
+    GParamSpec *pspec =
+        g_param_spec_object ("view",
+                             "Image View",
+                             "Image View to navigate",
+                             GTK_TYPE_IMAGE_VIEW,
+                             G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE);
+    g_object_class_install_property (object_class, PROP_IMAGE_VIEW, pspec);
-}
-
@@ -212 +239 @@
-gtk_image_tool_dragger_new (GtkImageView *view)
-{
-
-
-
-
-
-
+
+
+
+
+
+
+

pygtkimageview/src/gtkimageview.defs

@@ -254 +254 @@
-  (is-constructor-of "GtkImageToolDragger")
-  (return-type "GtkIImageTool*")
-arameter
- '("GtkImageView*" 
+ropertie
+'(
-  )
-)

pygtkimageview/tests/test_module.py

@@ -84 +84 @@
-    check_class(gtkimageview.ImageToolSelector, [gtkimageview.ImageView()])
-
+def test_dragger_subclass_with_signals():
+    '''
+    Ensure that a subclass of ImageToolDragger which adds a signal to
+    the class works as expected.
+    '''
+    check_class(gtkimageview.ImageToolDragger, [gtkimageview.ImageView()])
+
-def test_min_max_zoom_functions():
-    '''