From f1558e3a9297c6a4fefa9d399a7c9d067d859aa3 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Tue, 11 Jan 2005 04:59:27 +0000 Subject: added symbol type fixed incorrect unbinding of instance methods fixes for symbol type little restructuring svn path=/trunk/; revision=2489 --- externals/grill/py/source/main.h | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'externals/grill/py/source/main.h') diff --git a/externals/grill/py/source/main.h b/externals/grill/py/source/main.h index 03b67e1c..ef9a16c9 100644 --- a/externals/grill/py/source/main.h +++ b/externals/grill/py/source/main.h @@ -11,23 +11,13 @@ WARRANTIES, see the file, "license.txt," in this distribution. #ifndef __MAIN_H #define __MAIN_H -#define FLEXT_ATTRIBUTES 1 - -#include -#if FLEXT_OS == FLEXT_OS_MAC -#include -#else -#include -#endif +#include "pyprefix.h" +#include "pysymbol.h" #if FLEXT_OS == FLEXT_LINUX || FLEXT_OS == FLEXT_IRIX #include #endif -#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 500) -#error You need at least flext version 0.5.0 -#endif - #define PY__VERSION "0.2.0pre" @@ -61,7 +51,7 @@ protected: class py: public flext_base { - FLEXT_HEADER(py,flext_base) + FLEXT_HEADER_S(py,flext_base,Setup) public: py(); @@ -190,8 +180,12 @@ public: static PyObject* StdOut_Write(PyObject* Self, PyObject* Args); protected: - // callbacks + virtual void m_click(); + + static void Setup(t_classid c); + + // callbacks FLEXT_ATTRVAR_I(detach) FLEXT_ATTRVAR_B(respond) FLEXT_CALLBACK_V(m_stop) -- cgit v1.2.1