Update of /cvsroot/python-gtkextra/python-gtkextra2/gtkextra
In directory sc8-pr-cvs1:/tmp/cvs-serv18931
Modified Files:
gtkextra-types.defs gtkextra.defs gtkextra.override
Log Message:
A very few accumulated changes. Not much.
Index: gtkextra-types.defs
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/gtkextra-types.defs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gtkextra-types.defs 21 Jan 2003 21:56:34 -0000 1.9
--- gtkextra-types.defs 2 Jul 2003 16:25:07 -0000 1.10
***************
*** 154,157 ****
--- 154,160 ----
(c-name "GtkPlot")
(gtype-id "GTK_TYPE_PLOT")
+ (fields
+ '("GList*" "data_sets")
+ )
)
***************
*** 564,567 ****
--- 567,571 ----
'("pixmap" "GTK_PLOT_CANVAS_PIXMAP")
'("marker" "GTK_PLOT_CANVAS_MARKER")
+ '("polygon" "GTK_PLOT_CANVAS_POLYGON")
'("custom" "GTK_PLOT_CANVAS_CUSTOM")
)
Index: gtkextra.defs
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/gtkextra.defs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gtkextra.defs 17 Apr 2003 16:39:52 -0000 1.11
--- gtkextra.defs 2 Jul 2003 16:25:07 -0000 1.12
***************
*** 1878,1881 ****
--- 1878,1896 ----
)
+ (define-method put_polygon
+ (of-object "GtkPlotCanvas")
+ (c-name "gtk_plot_canvas_put_polygon_PY")
+ (return-type "GtkPlotCanvasChild*")
+ (parameters
+ '("GtkPlotPoint*" "points")
+ '("guint" "npoints")
+ '("GtkPlotLineStyle" "style" (default "GTK_PLOT_LINE_SOLID"))
+ '("gfloat" "width" (default "1.0"))
+ '("const-GdkColor*" "fg" (default "NULL") (null-ok))
+ '("const-GdkColor*" "bg" (default "NULL") (null-ok))
+ '("gboolean" "fill" (default "TRUE"))
+ )
+ )
+
(define-method put_pixmap
(of-object "GtkPlotCanvas")
***************
*** 1957,1960 ****
--- 1972,2001 ----
(of-object "GtkPlotCanvasChild")
(c-name "gtk_plot_canvas_ellipse_set_attributes")
+ (return-type "none")
+ (parameters
+ '("GtkPlotLineStyle" "style")
+ '("gfloat" "width")
+ '("const-GdkColor*" "fg" (null-ok))
+ '("const-GdkColor*" "bg" (null-ok))
+ '("gboolean" "fill")
+ )
+ )
+
+ ;(define-function gtk_plot_canvas_polygon_set_attributes
+ ; (c-name "gtk_plot_canvas_polygon_set_attributes")
+ ; (return-type "none")
+ ; (parameters
+ ; '("GtkPlotCanvasChild*" "child")
+ ; '("GtkPlotLineStyle" "style")
+ ; '("gfloat" "width")
+ ; '("const-GdkColor*" "fg")
+ ; '("const-GdkColor*" "bg")
+ ; '("gboolean" "fill")
+ ; )
+ ;)
+
+ (define-method polygon_set_attributes
+ (of-object "GtkPlotCanvasChild")
+ (c-name "gtk_plot_canvas_polygon_set_attributes")
(return-type "none")
(parameters
Index: gtkextra.override
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/gtkextra.override,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** gtkextra.override 17 Apr 2003 16:39:53 -0000 1.17
--- gtkextra.override 2 Jul 2003 16:25:07 -0000 1.18
***************
*** 1171,1178 ****
py_copy = pygobject_new((GObject*)copy);
gtk_plot_data_clone(GTK_PLOT_DATA(self->obj), copy);
for (i=0; i < G_N_ELEMENTS(pygtkextra_keys); i++) {
const char *key = pygtkextra_keys[i];
! pygtkextra_set_data( (PyGObject*)py_copy, key, pygtkextra_get_data(self, key));
}
--- 1171,1181 ----
py_copy = pygobject_new((GObject*)copy);
gtk_plot_data_clone(GTK_PLOT_DATA(self->obj), copy);
+ g_object_unref(copy);
for (i=0; i < G_N_ELEMENTS(pygtkextra_keys); i++) {
const char *key = pygtkextra_keys[i];
! PyObject *py_obj = pygtkextra_get_data(self, key);
! pygtkextra_set_data( (PyGObject*)py_copy, key, py_obj);
! Py_DECREF(py_obj);
}
***************
*** 1385,1388 ****
--- 1388,1416 ----
gtk_plot_get_point(GTK_PLOT(self->obj), x, y, &xx, &yy);
return Py_BuildValue("(dd)", xx, yy);
+ }
+ %%
+ override-attr GtkPlot.data_sets
+ static PyObject *
+ _wrap_gtk_plot__get_data_sets(PyGObject *self, void *closure)
+ {
+ GList *list, *tmp;
+ PyObject *py_list;
+
+ list = GTK_PLOT(self->obj)->data_sets;
+
+ if ((py_list = PyList_New(0)) == NULL) {
+ return NULL;
+ }
+ for (tmp = list; tmp != NULL; tmp = tmp->next) {
+ PyObject *gtk_obj = pygobject_new(G_OBJECT(tmp->data));
+
+ if (gtk_obj == NULL) {
+ Py_DECREF(py_list);
+ return NULL;
+ }
+ PyList_Append(py_list, gtk_obj);
+ Py_DECREF(gtk_obj);
+ }
+ return py_list;
}
%%
|
