X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2Fprimitives.h;h=47647e6b77971eb2821f4b36967ab8d2b2f308c2;hb=f3abbbfab5bc702daff5e17c74f5d2067f99cd55;hp=09d695ca447ddaef5c9714921bdbfe899944f1ef;hpb=49062bcde61a1622b6e5605097beff11916cd07e;p=swftools.git

diff --git a/lib/python/primitives.h b/lib/python/primitives.h
index 09d695c..47647e6 100644
--- a/lib/python/primitives.h
+++ b/lib/python/primitives.h
@@ -26,40 +26,27 @@
 #undef HAVE_STAT
 #include <Python.h>
 
+#include "../rfxswf.h"
+
+/* exported to allow casting to this type */
 extern PyTypeObject ColorClass;
 extern PyTypeObject BBoxClass;
 extern PyTypeObject CXFormClass;
 extern PyTypeObject GradientClass;
 extern PyTypeObject MatrixClass;
 
-typedef struct {
-    PyObject_HEAD
-    RGBA rgba;
-} ColorObject;
-
-typedef struct {
-    PyObject_HEAD
-    SRECT bbox;
-} BBoxObject;
-
-typedef struct {
-    PyObject_HEAD
-    MATRIX matrix;
-} MatrixObject;
-
-typedef struct {
-    PyObject_HEAD
-    CXFORM cxform;
-} CXFormObject;
-
-typedef struct {
-    PyObject_HEAD
-    GRADIENT gradient;
-} GradientObject;
-
 PyObject* f_Color(PyObject* self, PyObject* args, PyObject* kwargs);
 PyObject* f_ColorTransform(PyObject* self, PyObject* args, PyObject* kwargs);
 PyObject* f_Gradient(PyObject* self, PyObject* args, PyObject* kwargs);
 PyObject* f_BBox(PyObject* self, PyObject* args, PyObject* kwargs);
 PyObject* f_Matrix(PyObject* self, PyObject* args, PyObject* kwargs);
+
+RGBA color_getRGBA(PyObject*self);
+CXFORM colortransform_getCXForm(PyObject*self);
+GRADIENT gradient_getGradient(PyObject*self);
+SRECT bbox_getBBox(PyObject*self);
+MATRIX matrix_getMatrix(PyObject*self);
+
+extern PyMethodDef* primitive_getMethods();
+
 #endif