[Plplot-cvs] plplot/bindings/gnome2/python gcwmodule.c,1.1,1.2

[Thomas J. D. <to...@us...>]

Update of /cvsroot/plplot/plplot/bindings/gnome2/python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3254

Modified Files:
	gcwmodule.c 
Log Message:
Change to allow automatic wrapping of GCW driver API.


Index: gcwmodule.c
===================================================================
RCS file: /cvsroot/plplot/plplot/bindings/gnome2/python/gcwmodule.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gcwmodule.c	9 May 2005 17:06:13 -0000	1.1
+++ gcwmodule.c	16 May 2005 14:38:06 -0000	1.2
@@ -1,4 +1,4 @@
-/* gcwmodule - python wrapper for the gcw plplot driver
+/* gcwmodule - Python wrapper for the gcw driver
 
   Copyright (C) 2004, 2005 Thomas J. Duck
   All rights reserved.
@@ -26,238 +26,29 @@
   USA 
 */
 
-#include "gcw.h"
-
-#include <pygobject.h>           
-#include <pygtk/pygtk.h>
-
-/* global variable declared at top of file */
-static PyTypeObject *PyGObject_Type=NULL;    
-
-/*-------------------------------------------------------------------------*/
-
-static PyObject * _wrap_gcw_install_canvas(PyObject *self, PyObject *args)
-{
-  /* Variables for parsing the args and converting the PyObjects */
-  PyGObject *canvas_;
-  GnomeCanvas* canvas;
-
-  /* Parse the args */
-  if(!PyArg_UnpackTuple(args,"ref",1,1,&canvas_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_install_canvas: Cannot parse arguments.");
-    return NULL;
-  }
-
-  /* Convert the PyObjects */
-  canvas=GNOME_CANVAS(canvas_->obj);
-
-  /* Make the call */
-  gcw_install_canvas(canvas);
-
-  return Py_BuildValue("");
-}
-
-/*-------------------------------------------------------------------------*/
-
-static PyObject * _wrap_gcw_set_canvas_size(PyObject *self, PyObject *args)
-{
-  /* Variables for parsing the args and converting the PyObjects */
-  PyGObject *canvas_;
-  PyObject *width_, *height_;
-  GnomeCanvas* canvas;
-  PLFLT width,height;
-
-  /* Parse the args */
-  if(!PyArg_UnpackTuple(args,"ref",3,3,&canvas_,&width_,&height_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_set_canvas_size: Cannot parse arguments.");
-    return NULL;
-  }
-
-  /* Convert the PyObjects */
-  canvas=GNOME_CANVAS(canvas_->obj);
-
-  if(!PyFloat_Check(width_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_set_canvas_size: PyFloat expected as arg 2.");
-    return NULL;
-  }
-  width=PyFloat_AsDouble(width_);
-
-  if(!PyFloat_Check(height_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_set_canvas_size: PyFloat expected as arg 3.");
-    return NULL;
-  }
-  height=PyFloat_AsDouble(height_);
-
-  /* Make the call */
-  gcw_set_canvas_size(canvas,width,height);
-
-  return Py_BuildValue("");
-}
-
-/*-------------------------------------------------------------------------*/
-
-static PyObject * _wrap_gcw_set_canvas_zoom(PyObject *self, PyObject *args)
-{
-  /* Variables for parsing the args and converting the PyObjects */
-  PyGObject *canvas_;
-  PyObject *zoom_;
-  GnomeCanvas* canvas;
-  PLFLT zoom;
-
-  /* Parse the args */
-  if(!PyArg_UnpackTuple(args,"ref",2,2,&canvas_,&zoom_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_set_canvas_zoom: Cannot parse arguments.");
-    return NULL;
-  }
-
-  /* Convert the PyObjects */
-  canvas=GNOME_CANVAS(canvas_->obj);
-
-  if(!PyFloat_Check(zoom_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_set_canvas_zoom: PyFloat expected as arg 2.");
-    return NULL;
-  }
-  zoom=PyFloat_AsDouble(zoom_);
-
-  /* Make the call */
-  gcw_set_canvas_zoom(canvas,zoom);
-
-  return Py_BuildValue("");
-}
-
-/*-------------------------------------------------------------------------*/
-
-static PyObject * _wrap_gcw_use_text(PyObject *self, PyObject *args)
-{
-  /* Variables for parsing the args and converting the PyObjects */
-  PyObject *use_text_;
-  gboolean use_text;
-
-  /* Parse the args */
-  if(!PyArg_UnpackTuple(args,"ref",1,1,&use_text_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_use_text: Cannot parse arguments.");
-    return NULL;
-  }
-
-  /* Convert the PyObjects */
-
-  if(!PyInt_Check(use_text_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_use_text: PyInt expected as arg 2.");
-    return NULL;
-  }
-  use_text=(gboolean)PyInt_AsLong(use_text_);
-
-  /* Make the call */
-  gcw_use_text(use_text);
-
-  return Py_BuildValue("");
-}
-
-/*-------------------------------------------------------------------------*/
-
-static PyObject * _wrap_gcw_use_pixmap(PyObject *self, PyObject *args)
-{
-  /* Variables for parsing the args and converting the PyObjects */
-  PyObject *use_pixmap_;
-  gboolean use_pixmap;
-
-  /* Parse the args */
-  if(!PyArg_UnpackTuple(args,"ref",1,1,&use_pixmap_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_use_pixmap: Cannot parse arguments.");
-    return NULL;
-  }
-
-  /* Convert the PyObjects */
-
-  if(!PyInt_Check(use_pixmap_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_use_pixmap: PyInt expected as arg 2.");
-    return NULL;
-  }
-  use_pixmap=(gboolean)PyInt_AsLong(use_pixmap_);
-
-  /* Make the call */
-  gcw_use_pixmap(use_pixmap);
-
-  return Py_BuildValue("");
-}
-
-/*-------------------------------------------------------------------------*/
+#include <pygobject.h>
 
-static PyObject * _wrap_gcw_use_persistence(PyObject *self, PyObject *args)
+#define PY_ARRAY_UNIQUE_SYMBOL gcwapi
+#include "Numeric/arrayobject.h"
+ 
+void gcw_register_classes (PyObject *d); 
+extern PyMethodDef gcw_functions[];
+ 
+DL_EXPORT(void)
+initgcw(void)
 {
-  /* Variables for parsing the args and converting the PyObjects */
-  PyObject *use_persistence_;
-  gboolean use_persistence;
-
-  /* Parse the args */
-  if(!PyArg_UnpackTuple(args,"ref",1,1,&use_persistence_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_use_persistence: Cannot parse arguments.");
-    return NULL;
-  }
-
-  /* Convert the PyObjects */
-
-  if(!PyInt_Check(use_persistence_))
-  {
-    PyErr_SetString(PyExc_TypeError,
-                    "_wrap_gcw_use_persistence: PyInt expected as arg 2.");
-    return NULL;
-  }
-  use_persistence=(gboolean)PyInt_AsLong(use_persistence_);
-
-  /* Make the call */
-  gcw_use_persistence(use_persistence);
+    PyObject *m, *d;
+ 
+    init_pygobject ();
+ 
+    m = Py_InitModule ("gcw",gcw_functions);
+    d = PyModule_GetDict (m);
+ 
+    gcw_register_classes (d);
 
-  return Py_BuildValue("");
+    import_array();
+ 
+    if (PyErr_Occurred ()) {
+        Py_FatalError ("can't initialise module gcw");
+    }
 }
-
-/*-------------------------------------------------------------------------*/
-
-/* Method table mapping names to wrappers */
-static PyMethodDef gcwmoduleMethods[]=
-{
-  { "set_canvas_size", _wrap_gcw_set_canvas_size, METH_VARARGS },
-  { "set_canvas_zoom", _wrap_gcw_set_canvas_zoom, METH_VARARGS },
-  { "use_text", _wrap_gcw_use_text, METH_VARARGS },
-  { "use_pixmap", _wrap_gcw_use_pixmap, METH_VARARGS },
-  { "use_persistence", _wrap_gcw_use_persistence, METH_VARARGS },
-  { NULL, NULL }
-};
-
-void initgcw(void)
-{                 
-  PyObject *module;
-
-  Py_InitModule("gcw",gcwmoduleMethods);
-
-  init_pygobject();
-  init_pygtk();
-  module = PyImport_ImportModule("gobject");
-  if (module) {
-    PyGObject_Type =
-      (PyTypeObject*)PyObject_GetAttrString(module, "GObject");
-    Py_DECREF(module);
-  }
-}