[Python-gtkextra-commits] CVS: python-gtkextra2/gtkextra Makefile.am,1.3,1.4 gtkextra.defs,1.4,1.5 gtkextra.override,1.4,1.5 gtkextramodule.c,1.3,1.4

[<pyt...@li...>]

Update of /cvsroot/python-gtkextra/python-gtkextra2/gtkextra
In directory usw-pr-cvs1:/tmp/cvs-serv27698/gtkextra

Modified Files:
	Makefile.am gtkextra.defs gtkextra.override gtkextramodule.c 
Log Message:
More examples mostly run. GtkExtra fixes

Index: Makefile.am
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	11 Jul 2002 19:17:44 -0000	1.3
--- Makefile.am	22 Jul 2002 13:06:54 -0000	1.4
***************
*** 18,23 ****
  
  # gtkextra module
! #GTKEXTRA_LIBS=-lgtkextra #DOES NOT WORK
! #GTKEXTRA_LIBS=-lgtkextra-x11 #DOES NOT WORK
  pygtkextraexec_LTLIBRARIES = gtkextramodule.la
  gtkextramodule_la_CFLAGS = $(PYGTK_CFLAGS) $(GTK_CFLAGS) $(GTKEXTRA_CFLAGS)
--- 18,22 ----
  
  # gtkextra module
! #GTKEXTRA_LIBS=-lgtkextra-x11-1.1 #DOES NOT WORK
  pygtkextraexec_LTLIBRARIES = gtkextramodule.la
  gtkextramodule_la_CFLAGS = $(PYGTK_CFLAGS) $(GTK_CFLAGS) $(GTKEXTRA_CFLAGS)

Index: gtkextra.defs
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/gtkextra.defs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gtkextra.defs	16 Jul 2002 17:05:15 -0000	1.4
--- gtkextra.defs	22 Jul 2002 13:06:55 -0000	1.5
***************
*** 2760,2766 ****
  )
  
! (define-method set_quadtrilateral
    (of-object "GtkPlotDT")
!   (c-name "gtk_plot_dt_set_quadtrilateral")
    (return-type "none")
    (parameters
--- 2760,2766 ----
  )
  
! (define-method set_quadrilateral
    (of-object "GtkPlotDT")
!   (c-name "gtk_plot_dt_set_quadrilateral")
    (return-type "none")
    (parameters
***************
*** 5330,5336 ****
  )
  
! (define-method row_resizable
    (of-object "GtkSheet")
!   (c-name "gtk_sheet_row_resizable")
    (return-type "gboolean")
  )
--- 5330,5336 ----
  )
  
! (define-method rows_resizable
    (of-object "GtkSheet")
!   (c-name "gtk_sheet_rows_resizable")
    (return-type "gboolean")
  )

Index: gtkextra.override
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/gtkextra.override,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gtkextra.override	16 Jul 2002 17:05:15 -0000	1.4
--- gtkextra.override	22 Jul 2002 13:06:55 -0000	1.5
***************
*** 28,31 ****
--- 28,32 ----
  #include <pygtk/pygtk.h>
  #include <gtkextra/gtkextra.h>
+ #include <gtkextra/gtkextratypebuiltins.h>
  
  /* ----------------------------------------------------------------------
***************
*** 129,148 ****
  }
  
- #define _GET_ONE(_x) static PyObject * \
- _wrap_gtk_plot_data_get_##_x(PyGObject *self) \
- { \
-     PyObject *py_ret; \
-     gdouble *points; \
-     gint num_points; \
- \
-     points = gtk_plot_data_get_##_x(GTK_PLOT_DATA(self->obj), &num_points); \
- \
-     if( !(py_ret = pygtkextra_vec2py(num_points, points))) \
- 	return NULL; \
- \
-     return py_ret; \
- }
- 
- 
  /* ----------------------------------------------------------------------
     Functions for converting Python sequence like objects To/From C arrays.
--- 130,133 ----
***************
*** 428,456 ****
  %%
  override gtk_plot_data_get_x noargs
! _GET_ONE(x)
  
  %%
  override gtk_plot_data_get_y noargs
! _GET_ONE(y)
  
  %%
  override gtk_plot_data_get_z noargs
! _GET_ONE(z)
  
  %%
  override gtk_plot_data_get_a noargs
! _GET_ONE(a)
  
  %%
  override gtk_plot_data_get_dx noargs
! _GET_ONE(dx)
  
  %%
  override gtk_plot_data_get_dy noargs
! _GET_ONE(dy)
  
  %%
  override gtk_plot_data_get_dz noargs
! _GET_ONE(dz)
  
  %%
--- 413,441 ----
  %%
  override gtk_plot_data_get_x noargs
! _GET_ONE_DOUBLE_VEC(gtk_plot_data_get_x, GTK_PLOT_DATA)
  
  %%
  override gtk_plot_data_get_y noargs
! _GET_ONE_DOUBLE_VEC(gtk_plot_data_get_y, GTK_PLOT_DATA)
  
  %%
  override gtk_plot_data_get_z noargs
! _GET_ONE_DOUBLE_VEC(gtk_plot_data_get_z, GTK_PLOT_DATA)
  
  %%
  override gtk_plot_data_get_a noargs
! _GET_ONE_DOUBLE_VEC(gtk_plot_data_get_a, GTK_PLOT_DATA)
  
  %%
  override gtk_plot_data_get_dx noargs
! _GET_ONE_DOUBLE_VEC(gtk_plot_data_get_dx, GTK_PLOT_DATA)
  
  %%
  override gtk_plot_data_get_dy noargs
! _GET_ONE_DOUBLE_VEC(gtk_plot_data_get_dy, GTK_PLOT_DATA)
  
  %%
  override gtk_plot_data_get_dz noargs
! _GET_ONE_DOUBLE_VEC(gtk_plot_data_get_dz, GTK_PLOT_DATA)
  
  %%
***************
*** 488,492 ****
  ignore
    triangulate
-   gtk_sheet_row_resizable
-   gtkextra_check_version
-   gtk_plot_dt_set_quadtrilateral
--- 473,474 ----

Index: gtkextramodule.c
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/gtkextramodule.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gtkextramodule.c	16 Jul 2002 17:05:15 -0000	1.3
--- gtkextramodule.c	22 Jul 2002 13:06:55 -0000	1.4
***************
*** 8,11 ****
--- 8,12 ----
  #include <pygtk/pygtk.h>
  #include <gtkextra/gtkextra.h>
+ #include <gtkextra/gtkextratypebuiltins.h>
  
  void pygtkextra_register_classes(PyObject *d);