Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/modules/wxlua/include
Modified Files:
wxlbind.h
Log Message:
Add picker.i for all of the wxPicker controls
Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity.
Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** wxlbind.h 16 Jun 2007 06:21:45 -0000 1.52
--- wxlbind.h 17 Jun 2007 18:36:28 -0000 1.53
***************
*** 286,301 ****
#define wxLUA_DECLARE_ENCAPSULATION(IMPEXPSYMBOL, className, objName) \
! class IMPEXPSYMBOL wxObject_##objName : public wxObject \
{ \
public: \
! wxObject_##objName(className *p_##objName) : m_p##objName(p_##objName) {} \
! ~wxObject_##objName(); \
className *m_p##objName; \
! DECLARE_ABSTRACT_CLASS(wxObject_##objName) \
};
#define wxLUA_IMPLEMENT_ENCAPSULATION(className, objName) \
! IMPLEMENT_ABSTRACT_CLASS(wxObject_##objName, wxObject) \
! wxObject_##objName::~wxObject_##objName() \
{ \
delete m_p##objName; \
--- 286,302 ----
#define wxLUA_DECLARE_ENCAPSULATION(IMPEXPSYMBOL, className, objName) \
! class IMPEXPSYMBOL wxLua_wxObject_##objName : public wxObject \
{ \
public: \
! wxLua_wxObject_##objName(className *p_##objName) : m_p##objName(p_##objName) {} \
! ~wxLua_wxObject_##objName(); \
className *m_p##objName; \
! DECLARE_ABSTRACT_CLASS(wxLua_wxObject_##objName) \
};
+ // we may not have fully defined the class/object in header so delete it in src.
#define wxLUA_IMPLEMENT_ENCAPSULATION(className, objName) \
! IMPLEMENT_ABSTRACT_CLASS(wxLua_wxObject_##objName, wxObject) \
! wxLua_wxObject_##objName::~wxLua_wxObject_##objName() \
{ \
delete m_p##objName; \
|
