python-gtkextra-commits

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

Update of /cvsroot/python-gtkextra/python-gtkextra2/gtkextra
In directory sc8-pr-cvs1:/tmp/cvs-serv27635/gtkextra

Modified Files:
	Makefile.am gtkextra.override mycodegen.py 
Added Files:
	_config.py.in 
Log Message:
more

--- NEW FILE: _config.py.in ---
# @configure_input@
import string
PREFIX='@prefix@'
PKGDATADIR = string.replace('@datadir@/@PACKAGE@','${prefix}', PREFIX)
PYDIR= string.replace('@pythondir@','${prefix}', PREFIX)
VERSION='@VERSION@'
PYGTK_DEFSDIR='@PYGTK_DEFSDIR@'
del string

Index: Makefile.am
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	24 Dec 2002 18:49:10 -0000	1.5
--- Makefile.am	30 Dec 2002 20:42:13 -0000	1.6
***************
*** 1,4 ****
  pygtkextradir = $(pythondir)/gtkextra
! pygtkextra_PYTHON = __init__.py
  
  pygtkextraexecdir = $(pyexecdir)/gtkextra
--- 1,6 ----
  pygtkextradir = $(pythondir)/gtkextra
! pygtkextra_PYTHON = \
!   __init__.py \
!   _config.py
  
  pygtkextraexecdir = $(pyexecdir)/gtkextra
***************
*** 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)
--- 20,23 ----
***************
*** 29,40 ****
  CLEANFILES += gtkextra.c
  defs_DATA += gtkextra.defs gtkextra-types.defs
! EXTRA_DIST += gtkextra.override
  
! #CODEGEN=$(PYGTK_DEFSDIR)/../codegen/codegen.py
! CODEGEN=$(srcdir)/mycodegen.py
  
  .defs.c:
  	(cd $(srcdir) \
! 	 && $(PYTHON) $(CODEGEN) \
  	    --register $(PYGTK_DEFSDIR)/pango-types.defs \
  	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
--- 30,40 ----
  CLEANFILES += gtkextra.c
  defs_DATA += gtkextra.defs gtkextra-types.defs
! EXTRA_DIST += gtkextra.override mycodegen.py
  
! CODEGEN=$(PYTHON) $(srcdir)/mycodegen.py
  
  .defs.c:
  	(cd $(srcdir) \
! 	 && $(CODEGEN) \
  	    --register $(PYGTK_DEFSDIR)/pango-types.defs \
  	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
***************
*** 45,46 ****
--- 45,49 ----
  	&& rm -f gen-$*.c
  
+ # a hack so that _config.py is not included in the final package.
+ dist-hook:
+ 	-rm -f $(distdir)/_config.py

Index: gtkextra.override
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/gtkextra.override,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gtkextra.override	24 Dec 2002 18:49:10 -0000	1.6
--- gtkextra.override	30 Dec 2002 20:42:13 -0000	1.7
***************
*** 692,694 ****
--- 692,735 ----
  }
  %%
+ override gtk_plot3d_new
+ static int
+ _wrap_gtk_plot3d_new(PyGObject *self, PyObject *args, PyObject *kwargs)
+ {
+     static char *kwlist1[] = { "drawable", NULL };
+     static char *kwlist2[] = { "width", "height", "drawable", NULL };
+     PyGObject *drawable = NULL;
+ 
+     if (PyArg_ParseTupleAndKeywords(args, kwargs, "|O!:GtkPlot3D.__init__",
+ 				    kwlist1, &PyGdkDrawable_Type, &drawable)) {
+ 	self->obj = (GObject *)gtk_plot3d_new(GDK_DRAWABLE(drawable->obj));
+     }
+     else {
+ 	double width, height;
+ 	PyErr_Clear();
+ 	/* It would have been nice if optional arguments were last in prototype. */
+ 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "dd|O!:GtkPlot3D.__init__",
+ 					 kwlist2,
+ 					 &width, &height,
+ 					 &PyGdkDrawable_Type, &drawable))
+ 	    return -1;
+ 	if (drawable)
+ 	    self->obj = (GObject *)gtk_plot3d_new_with_size(GDK_DRAWABLE(drawable->obj),
+ 							    width, height);
+ 	else
+ 	    self->obj = (GObject *)gtk_plot3d_new_with_size(NULL,
+ 							    width, height);
+     }
+ 
+     if (!self->obj) {
+ 	PyErr_SetString(PyExc_RuntimeError, "could not create GtkPlot3D object");
+ 	return -1;
+     }
+     pygobject_register_wrapper((PyObject *)self);
+     return 0;
+ }
+ %%
+ ignore
+ plot3d_construct
+ plot3d_construct_with_size
+ %%
  ignore-glob *_get_type

Index: mycodegen.py
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/mycodegen.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mycodegen.py	11 Jul 2002 19:17:44 -0000	1.1
--- mycodegen.py	30 Dec 2002 20:42:13 -0000	1.2
***************
*** 1,13 ****
  #!/bin/env python
  
! # This is a temporary hack.
  import sys
! sys.path.append('/usr/share/pygtk/2.0/')
! del sys
  
- # Use the PyGtk2 codegen modules
  from codegen.argtypes import matcher
  import codegen.codegen
- 
  
  matcher.register('GdkWChar', matcher.get('gint32'))
--- 1,14 ----
  #!/bin/env python
  
! # Use the PyGtk2 codegen modules.
! # Allow new types to be registered.
! 
! import _config
  import sys
! import os
! sys.path.append(os.path.join(_config.PYGTK_DEFSDIR, '../'))
  
  from codegen.argtypes import matcher
  import codegen.codegen
  
  matcher.register('GdkWChar', matcher.get('gint32'))