Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src print.cpp,1.13,1.14 wx_bind.cpp,1.39,1.40 wxlua.cpp,1.16,1.17 xml.cpp,1.11,1.12
|
From: John L. <jr...@us...> - 2006-05-17 05:02:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20662/wxLua/modules/wxbind/src Modified Files: print.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: update .i files to use more HTML friendly comment markers update print.i and xml.i to 2.6.3 cleanup generate docs script to use nicer colours and whatnot Index: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** print.cpp 2 May 2006 05:25:02 -0000 1.13 --- print.cpp 17 May 2006 05:02:05 -0000 1.14 *************** *** 57,60 **** --- 57,81 ---- #endif + // %override wxLua_wxPrintout_GetPageInfo + // void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) + static int LUACALL wxLua_wxPrintout_GetPageInfo(lua_State *L) + { + wxLuaState wxlState(L); + int pageTo; + int pageFrom; [...3421 lines suppressed...] static int LUACALL wxLua_wxPrinterDC_constructor(lua_State *L) --- 3335,3339 ---- ! #if (wxLUA_USE_wxPrint) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint)) // wxPrinterDC(const wxPrintData& printData) static int LUACALL wxLua_wxPrinterDC_constructor(lua_State *L) *************** *** 3156,3160 **** { LuaMethod, "Delete", wxLua_wxPrinterDC_Delete, 0, 0, {0} }, ! #if (wxLUA_USE_wxPrint) && ((defined(__WXMSW__)) && (wxLUA_USE_wxPrint)) { LuaConstructor, "wxPrinterDC", wxLua_wxPrinterDC_constructor, 1, 1, { &s_wxluatag_wxPrintData, 0 } }, #endif --- 3364,3368 ---- { LuaMethod, "Delete", wxLua_wxPrinterDC_Delete, 0, 0, {0} }, ! #if (wxLUA_USE_wxPrint) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint)) { LuaConstructor, "wxPrinterDC", wxLua_wxPrinterDC_constructor, 1, 1, { &s_wxluatag_wxPrintData, 0 } }, #endif Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** xml.cpp 2 May 2006 05:25:06 -0000 1.11 --- xml.cpp 17 May 2006 05:02:05 -0000 1.12 *************** *** 38,56 **** int s_wxluatag_wxXmlNode = -1; ! // wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString); ! static int LUACALL wxLua_wxXmlNode_constructor(lua_State *L) { wxLuaState wxlState(L); wxXmlNode *returns; - // get number of arguments - int argCount = lua_gettop(L); - // const wxString content = wxEmptyString - const wxString content = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); - // const wxString name - const wxString name = lua2wx(wxlState.GetStringType(2)); - // wxXmlNodeType type - wxXmlNodeType type = (wxXmlNodeType)wxlState.GetEnumerationType(1); // call constructor ! returns = new wxXmlNode(type, name, content); // add to tracked memory list wxLua_AddToTrackedMemoryList(wxlState, (wxXmlNode *)returns); --- 38,48 ---- int s_wxluatag_wxXmlNode = -1; ! // %constructor wxXmlNodeDefault() ! static int LUACALL wxLua_wxXmlNodeDefault_constructor(lua_State *L) { wxLuaState wxlState(L); wxXmlNode *returns; // call constructor ! returns = new wxXmlNode(); // add to tracked memory list wxLua_AddToTrackedMemoryList(wxlState, (wxXmlNode *)returns); *************** *** 61,71 **** } ! // %constructor wxXmlDefaultNode() ! static int LUACALL wxLua_wxXmlDefaultNode_constructor(lua_State *L) { wxLuaState wxlState(L); wxXmlNode *returns; // call constructor ! returns = new wxXmlNode(); // add to tracked memory list wxLua_AddToTrackedMemoryList(wxlState, (wxXmlNode *)returns); --- 53,71 ---- } ! // wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString); ! static int LUACALL wxLua_wxXmlNode_constructor(lua_State *L) { wxLuaState wxlState(L); wxXmlNode *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString content = wxEmptyString + const wxString content = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); + // const wxString name + const wxString name = lua2wx(wxlState.GetStringType(2)); + // wxXmlNodeType type + wxXmlNodeType type = (wxXmlNodeType)wxlState.GetEnumerationType(1); // call constructor ! returns = new wxXmlNode(type, name, content); // add to tracked memory list wxLua_AddToTrackedMemoryList(wxlState, (wxXmlNode *)returns); *************** *** 489,494 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxXmlNode_methods[] = { { LuaConstructor, "wxXmlNode", wxLua_wxXmlNode_constructor, 3, 2, { &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, - { LuaConstructor, "wxXmlDefaultNode", wxLua_wxXmlDefaultNode_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlNodeEntry", wxLua_wxXmlNodeEntry_constructor, 6, 6, { &s_wxluatag_wxXmlNode, &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, &s_wxluatag_wxXmlNode, 0 } }, { LuaMethod, "AddChild", wxLua_wxXmlNode_AddChild, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, --- 489,494 ---- // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxXmlNode_methods[] = { + { LuaConstructor, "wxXmlNodeDefault", wxLua_wxXmlNodeDefault_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlNode", wxLua_wxXmlNode_constructor, 3, 2, { &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaConstructor, "wxXmlNodeEntry", wxLua_wxXmlNodeEntry_constructor, 6, 6, { &s_wxluatag_wxXmlNode, &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, &s_wxluatag_wxXmlNode, 0 } }, { LuaMethod, "AddChild", wxLua_wxXmlNode_AddChild, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, *************** *** 508,532 **** { LuaMethod, "HasProp", wxLua_wxXmlNode_HasProp, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetType", wxLua_wxXmlNode_SetType, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, - { LuaGetProp, "Type", wxLua_wxXmlNode_GetType, 0, 0, {0} }, - { LuaSetProp, "Type", wxLua_wxXmlNode_SetType, 1, 1, {0} }, { LuaMethod, "SetName", wxLua_wxXmlNode_SetName, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaGetProp, "Name", wxLua_wxXmlNode_GetName, 0, 0, {0} }, - { LuaSetProp, "Name", wxLua_wxXmlNode_SetName, 1, 1, {0} }, { LuaMethod, "SetContent", wxLua_wxXmlNode_SetContent, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaGetProp, "Content", wxLua_wxXmlNode_GetContent, 0, 0, {0} }, - { LuaSetProp, "Content", wxLua_wxXmlNode_SetContent, 1, 1, {0} }, { LuaMethod, "SetParent", wxLua_wxXmlNode_SetParent, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, - { LuaGetProp, "Parent", wxLua_wxXmlNode_GetParent, 0, 0, {0} }, - { LuaSetProp, "Parent", wxLua_wxXmlNode_SetParent, 1, 1, {0} }, { LuaMethod, "SetNext", wxLua_wxXmlNode_SetNext, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, - { LuaGetProp, "Next", wxLua_wxXmlNode_GetNext, 0, 0, {0} }, - { LuaSetProp, "Next", wxLua_wxXmlNode_SetNext, 1, 1, {0} }, { LuaMethod, "SetChildren", wxLua_wxXmlNode_SetChildren, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, { LuaGetProp, "Children", wxLua_wxXmlNode_GetChildren, 0, 0, {0} }, { LuaSetProp, "Children", wxLua_wxXmlNode_SetChildren, 1, 1, {0} }, ! { LuaMethod, "SetProperties", wxLua_wxXmlNode_SetProperties, 1, 1, { &s_wxluatag_wxXmlProperty, 0 } }, { LuaGetProp, "Properties", wxLua_wxXmlNode_GetProperties, 0, 0, {0} }, { LuaSetProp, "Properties", wxLua_wxXmlNode_SetProperties, 1, 1, {0} }, ! { LuaMethod, "AddPropertyEntry", wxLua_wxXmlNode_AddPropertyEntry, 1, 1, { &s_wxluatag_wxXmlProperty, 0 } }, { LuaDelete, "wxXmlNode", wxLua_wxXmlNode_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlNode_Delete, 0, 0, {0} }, --- 508,532 ---- { LuaMethod, "HasProp", wxLua_wxXmlNode_HasProp, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetType", wxLua_wxXmlNode_SetType, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "SetName", wxLua_wxXmlNode_SetName, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetContent", wxLua_wxXmlNode_SetContent, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetParent", wxLua_wxXmlNode_SetParent, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, { LuaMethod, "SetNext", wxLua_wxXmlNode_SetNext, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, { LuaMethod, "SetChildren", wxLua_wxXmlNode_SetChildren, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, + { LuaMethod, "SetProperties", wxLua_wxXmlNode_SetProperties, 1, 1, { &s_wxluatag_wxXmlProperty, 0 } }, + { LuaMethod, "AddPropertyEntry", wxLua_wxXmlNode_AddPropertyEntry, 1, 1, { &s_wxluatag_wxXmlProperty, 0 } }, { LuaGetProp, "Children", wxLua_wxXmlNode_GetChildren, 0, 0, {0} }, { LuaSetProp, "Children", wxLua_wxXmlNode_SetChildren, 1, 1, {0} }, ! { LuaGetProp, "Content", wxLua_wxXmlNode_GetContent, 0, 0, {0} }, ! { LuaSetProp, "Content", wxLua_wxXmlNode_SetContent, 1, 1, {0} }, ! { LuaGetProp, "Name", wxLua_wxXmlNode_GetName, 0, 0, {0} }, ! { LuaSetProp, "Name", wxLua_wxXmlNode_SetName, 1, 1, {0} }, ! { LuaGetProp, "Next", wxLua_wxXmlNode_GetNext, 0, 0, {0} }, ! { LuaSetProp, "Next", wxLua_wxXmlNode_SetNext, 1, 1, {0} }, ! { LuaGetProp, "Parent", wxLua_wxXmlNode_GetParent, 0, 0, {0} }, ! { LuaSetProp, "Parent", wxLua_wxXmlNode_SetParent, 1, 1, {0} }, { LuaGetProp, "Properties", wxLua_wxXmlNode_GetProperties, 0, 0, {0} }, { LuaSetProp, "Properties", wxLua_wxXmlNode_SetProperties, 1, 1, {0} }, ! { LuaGetProp, "Type", wxLua_wxXmlNode_GetType, 0, 0, {0} }, ! { LuaSetProp, "Type", wxLua_wxXmlNode_SetType, 1, 1, {0} }, { LuaDelete, "wxXmlNode", wxLua_wxXmlNode_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlNode_Delete, 0, 0, {0} }, *************** *** 547,551 **** int s_wxluatag_wxXmlProperty = -1; ! // wxXmlProperty(const wxString& name, const wxString& value, wxXmlProperty *next); static int LUACALL wxLua_wxXmlProperty_constructor(lua_State *L) { --- 547,551 ---- int s_wxluatag_wxXmlProperty = -1; ! // wxXmlProperty(const wxString& name, const wxString& value, wxXmlProperty *next) static int LUACALL wxLua_wxXmlProperty_constructor(lua_State *L) { *************** *** 568,572 **** } ! // %constructor wxXmlPropertyDefault(); static int LUACALL wxLua_wxXmlPropertyDefault_constructor(lua_State *L) { --- 568,572 ---- } ! // %constructor wxXmlPropertyDefault() static int LUACALL wxLua_wxXmlPropertyDefault_constructor(lua_State *L) { *************** *** 583,587 **** } ! // wxString GetName(); static int LUACALL wxLua_wxXmlProperty_GetName(lua_State *L) { --- 583,587 ---- } ! // wxString GetName() static int LUACALL wxLua_wxXmlProperty_GetName(lua_State *L) { *************** *** 598,602 **** } ! // wxString GetValue(); static int LUACALL wxLua_wxXmlProperty_GetValue(lua_State *L) { --- 598,602 ---- } ! // wxString GetValue() static int LUACALL wxLua_wxXmlProperty_GetValue(lua_State *L) { *************** *** 613,617 **** } ! // wxXmlProperty *GetNext(); static int LUACALL wxLua_wxXmlProperty_GetNext(lua_State *L) { --- 613,617 ---- } ! // wxXmlProperty *GetNext() static int LUACALL wxLua_wxXmlProperty_GetNext(lua_State *L) { *************** *** 628,632 **** } ! // void SetName(const wxString& name); static int LUACALL wxLua_wxXmlProperty_SetName(lua_State *L) { --- 628,632 ---- } ! // void SetName(const wxString& name) static int LUACALL wxLua_wxXmlProperty_SetName(lua_State *L) { *************** *** 642,646 **** } ! // void SetValue(const wxString& value); static int LUACALL wxLua_wxXmlProperty_SetValue(lua_State *L) { --- 642,646 ---- } ! // void SetValue(const wxString& value) static int LUACALL wxLua_wxXmlProperty_SetValue(lua_State *L) { *************** *** 656,660 **** } ! // void SetNext(wxXmlProperty *next); static int LUACALL wxLua_wxXmlProperty_SetNext(lua_State *L) { --- 656,660 ---- } ! // void SetNext(wxXmlProperty *next) static int LUACALL wxLua_wxXmlProperty_SetNext(lua_State *L) { *************** *** 946,960 **** { LuaMethod, "IsOk", wxLua_wxXmlDocument_IsOk, 0, 0, { 0 } }, { LuaMethod, "GetRoot", wxLua_wxXmlDocument_GetRoot, 0, 0, { 0 } }, { LuaGetProp, "Root", wxLua_wxXmlDocument_GetRoot, 0, 0, {0} }, { LuaSetProp, "Root", wxLua_wxXmlDocument_SetRoot, 1, 1, {0} }, - { LuaMethod, "GetVersion", wxLua_wxXmlDocument_GetVersion, 0, 0, { 0 } }, { LuaGetProp, "Version", wxLua_wxXmlDocument_GetVersion, 0, 0, {0} }, { LuaSetProp, "Version", wxLua_wxXmlDocument_SetVersion, 1, 1, {0} }, - { LuaMethod, "GetFileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, { 0 } }, { LuaGetProp, "FileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, {0} }, { LuaSetProp, "FileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, {0} }, - { LuaMethod, "SetRoot", wxLua_wxXmlDocument_SetRoot, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, - { LuaMethod, "SetVersion", wxLua_wxXmlDocument_SetVersion, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "SetFileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaDelete, "wxXmlDocument", wxLua_wxXmlDocument_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlDocument_Delete, 0, 0, {0} }, --- 946,960 ---- { LuaMethod, "IsOk", wxLua_wxXmlDocument_IsOk, 0, 0, { 0 } }, { LuaMethod, "GetRoot", wxLua_wxXmlDocument_GetRoot, 0, 0, { 0 } }, + { LuaMethod, "GetVersion", wxLua_wxXmlDocument_GetVersion, 0, 0, { 0 } }, + { LuaMethod, "GetFileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, { 0 } }, + { LuaMethod, "SetRoot", wxLua_wxXmlDocument_SetRoot, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, + { LuaMethod, "SetVersion", wxLua_wxXmlDocument_SetVersion, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "SetFileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaGetProp, "Root", wxLua_wxXmlDocument_GetRoot, 0, 0, {0} }, { LuaSetProp, "Root", wxLua_wxXmlDocument_SetRoot, 1, 1, {0} }, { LuaGetProp, "Version", wxLua_wxXmlDocument_GetVersion, 0, 0, {0} }, { LuaSetProp, "Version", wxLua_wxXmlDocument_SetVersion, 1, 1, {0} }, { LuaGetProp, "FileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, {0} }, { LuaSetProp, "FileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, {0} }, { LuaDelete, "wxXmlDocument", wxLua_wxXmlDocument_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlDocument_Delete, 0, 0, {0} }, *************** *** 1304,1321 **** } - // void AddHandler(wxXmlResourceHandler* handler); - static int LUACALL wxLua_wxXmlResource_AddHandler(lua_State *L) - { - wxLuaState wxlState(L); - // wxXmlResourceHandler handler - wxXmlResourceHandler * handler = (wxXmlResourceHandler *)wxlState.GetUserDataType(2, s_wxluatag_wxXmlResourceHandler); - // get this - wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); - // call AddHandler - self->AddHandler(handler); - - return 0; - } - // bool AttachUnknownControl(const wxString& name, wxWindow* control, wxWindow* parent = NULL); static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L) --- 1304,1307 ---- *************** *** 1390,1393 **** --- 1376,1394 ---- } + // int GetFlags() + static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get this + wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); + // call GetFlags + returns = self->GetFlags(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + // long GetVersion() const; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L) *************** *** 1506,1524 **** } - // int GetFlags(); - static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // get this - wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); - // call GetFlags - returns = self->GetFlags(); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - // void SetFlags(int flags); static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L) --- 1507,1510 ---- *************** *** 1535,1538 **** --- 1521,1541 ---- } + // bool Unload(const wxString& filename) + static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // const wxString filename + const wxString filename = lua2wx(wxlState.GetStringType(2)); + // get this + wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); + // call Unload + returns = self->Unload(filename); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + static int LUACALL wxLua_wxXmlResource_destructor(lua_State *L) { *************** *** 1604,1614 **** { LuaConstructor, "wxXmlResourceGetDefault", wxLua_wxXmlResourceGetDefault_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlResourceDefault", wxLua_wxXmlResourceDefault_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, - { LuaMethod, "AddHandler", wxLua_wxXmlResource_AddHandler, 1, 1, { &s_wxluatag_wxXmlResourceHandler, 0 } }, { LuaMethod, "AttachUnknownControl", wxLua_wxXmlResource_AttachUnknownControl, 3, 2, { &s_wxluaarg_String, &s_wxluatag_wxWindow, &s_wxluatag_wxWindow, 0 } }, { LuaMethod, "ClearHandlers", wxLua_wxXmlResource_ClearHandlers, 0, 0, { 0 } }, { LuaMethod, "CompareVersion", wxLua_wxXmlResource_CompareVersion, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Get", wxLua_wxXmlResource_Get, 0, 0, { 0 } }, { LuaMethod, "GetVersion", wxLua_wxXmlResource_GetVersion, 0, 0, { 0 } }, - { LuaGetProp, "Version", wxLua_wxXmlResource_GetVersion, 0, 0, {0} }, { LuaMethod, "GetXRCID", wxLua_wxXmlResource_GetXRCID, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "InitAllHandlers", wxLua_wxXmlResource_InitAllHandlers, 0, 0, { 0 } }, --- 1607,1616 ---- { LuaConstructor, "wxXmlResourceGetDefault", wxLua_wxXmlResourceGetDefault_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlResourceDefault", wxLua_wxXmlResourceDefault_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "AttachUnknownControl", wxLua_wxXmlResource_AttachUnknownControl, 3, 2, { &s_wxluaarg_String, &s_wxluatag_wxWindow, &s_wxluatag_wxWindow, 0 } }, { LuaMethod, "ClearHandlers", wxLua_wxXmlResource_ClearHandlers, 0, 0, { 0 } }, { LuaMethod, "CompareVersion", wxLua_wxXmlResource_CompareVersion, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Get", wxLua_wxXmlResource_Get, 0, 0, { 0 } }, + { LuaMethod, "GetFlags", wxLua_wxXmlResource_GetFlags, 0, 0, { 0 } }, { LuaMethod, "GetVersion", wxLua_wxXmlResource_GetVersion, 0, 0, { 0 } }, { LuaMethod, "GetXRCID", wxLua_wxXmlResource_GetXRCID, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "InitAllHandlers", wxLua_wxXmlResource_InitAllHandlers, 0, 0, { 0 } }, *************** *** 1617,1623 **** { LuaMethod, "LoadPanelCreate", wxLua_wxXmlResource_LoadPanelCreate, 3, 3, { &s_wxluatag_wxPanel, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "Set", wxLua_wxXmlResource_Set, 1, 1, { &s_wxluatag_wxXmlResource, 0 } }, - { LuaMethod, "GetFlags", wxLua_wxXmlResource_GetFlags, 0, 0, { 0 } }, { LuaMethod, "SetFlags", wxLua_wxXmlResource_SetFlags, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaGetProp, "Flags", wxLua_wxXmlResource_GetFlags, 0, 0, {0} }, { LuaDelete, "wxXmlResource", wxLua_wxXmlResource_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlResource_Delete, 0, 0, {0} }, --- 1619,1626 ---- { LuaMethod, "LoadPanelCreate", wxLua_wxXmlResource_LoadPanelCreate, 3, 3, { &s_wxluatag_wxPanel, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "Set", wxLua_wxXmlResource_Set, 1, 1, { &s_wxluatag_wxXmlResource, 0 } }, { LuaMethod, "SetFlags", wxLua_wxXmlResource_SetFlags, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "Unload", wxLua_wxXmlResource_Unload, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaGetProp, "Flags", wxLua_wxXmlResource_GetFlags, 0, 0, {0} }, + { LuaGetProp, "Version", wxLua_wxXmlResource_GetVersion, 0, 0, {0} }, { LuaDelete, "wxXmlResource", wxLua_wxXmlResource_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlResource_Delete, 0, 0, {0} }, Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wx_bind.cpp 16 May 2006 22:47:09 -0000 1.39 --- wx_bind.cpp 17 May 2006 05:02:05 -0000 1.40 *************** *** 894,907 **** { "wxFLOOD_SURFACE", wxFLOOD_SURFACE }, { "wxINVERT", wxINVERT }, - { "wxMM_ANISOTROPIC", wxMM_ANISOTROPIC }, - { "wxMM_HIENGLISH", wxMM_HIENGLISH }, - { "wxMM_HIMETRIC", wxMM_HIMETRIC }, - { "wxMM_ISOTROPIC", wxMM_ISOTROPIC }, - { "wxMM_LOENGLISH", wxMM_LOENGLISH }, - { "wxMM_LOMETRIC", wxMM_LOMETRIC }, - { "wxMM_METRIC", wxMM_METRIC }, - { "wxMM_POINTS", wxMM_POINTS }, - { "wxMM_TEXT", wxMM_TEXT }, - { "wxMM_TWIPS", wxMM_TWIPS }, { "wxNAND", wxNAND }, { "wxNOR", wxNOR }, --- 894,897 ---- *************** *** 1264,1269 **** --- 1254,1274 ---- #if wxLUA_USE_wxPrint + { "wxID_PREVIEW_CLOSE", wxID_PREVIEW_CLOSE }, + { "wxID_PREVIEW_FIRST", wxID_PREVIEW_FIRST }, + { "wxID_PREVIEW_GOTO", wxID_PREVIEW_GOTO }, + { "wxID_PREVIEW_LAST", wxID_PREVIEW_LAST }, + { "wxID_PREVIEW_NEXT", wxID_PREVIEW_NEXT }, + { "wxID_PREVIEW_PREVIOUS", wxID_PREVIEW_PREVIOUS }, + { "wxID_PREVIEW_PRINT", wxID_PREVIEW_PRINT }, + { "wxID_PREVIEW_ZOOM", wxID_PREVIEW_ZOOM }, { "wxLANDSCAPE", wxLANDSCAPE }, { "wxPORTRAIT", wxPORTRAIT }, + { "wxPREVIEW_FIRST", wxPREVIEW_FIRST }, + { "wxPREVIEW_GOTO", wxPREVIEW_GOTO }, + { "wxPREVIEW_LAST", wxPREVIEW_LAST }, + { "wxPREVIEW_NEXT", wxPREVIEW_NEXT }, + { "wxPREVIEW_PREVIOUS", wxPREVIEW_PREVIOUS }, + { "wxPREVIEW_PRINT", wxPREVIEW_PRINT }, + { "wxPREVIEW_ZOOM", wxPREVIEW_ZOOM }, #endif *************** *** 1943,1946 **** --- 1948,1965 ---- + #if wxLUA_USE_wxDC + { "wxMM_ANISOTROPIC", wxMM_ANISOTROPIC }, + { "wxMM_HIENGLISH", wxMM_HIENGLISH }, + { "wxMM_HIMETRIC", wxMM_HIMETRIC }, + { "wxMM_ISOTROPIC", wxMM_ISOTROPIC }, + { "wxMM_LOENGLISH", wxMM_LOENGLISH }, + { "wxMM_LOMETRIC", wxMM_LOMETRIC }, + { "wxMM_METRIC", wxMM_METRIC }, + { "wxMM_POINTS", wxMM_POINTS }, + { "wxMM_TEXT", wxMM_TEXT }, + { "wxMM_TWIPS", wxMM_TWIPS }, + #endif + + #if wxLUA_USE_wxDataObject { "Get", wxDataObject::Get }, *************** *** 2325,2328 **** --- 2344,2348 ---- { "wxPAPER_10X14", wxPAPER_10X14 }, { "wxPAPER_11X17", wxPAPER_11X17 }, + { "wxPAPER_12X11", wxPAPER_12X11 }, { "wxPAPER_15X11", wxPAPER_15X11 }, { "wxPAPER_9X11", wxPAPER_9X11 }, *************** *** 2331,2334 **** --- 2351,2355 ---- { "wxPAPER_A3_EXTRA", wxPAPER_A3_EXTRA }, { "wxPAPER_A3_EXTRA_TRANSVERSE", wxPAPER_A3_EXTRA_TRANSVERSE }, + { "wxPAPER_A3_ROTATED", wxPAPER_A3_ROTATED }, { "wxPAPER_A3_TRANSVERSE", wxPAPER_A3_TRANSVERSE }, { "wxPAPER_A4", wxPAPER_A4 }, *************** *** 2336,2350 **** --- 2357,2381 ---- { "wxPAPER_A4_EXTRA", wxPAPER_A4_EXTRA }, { "wxPAPER_A4_PLUS", wxPAPER_A4_PLUS }, + { "wxPAPER_A4_ROTATED", wxPAPER_A4_ROTATED }, { "wxPAPER_A4_TRANSVERSE", wxPAPER_A4_TRANSVERSE }, { "wxPAPER_A5", wxPAPER_A5 }, { "wxPAPER_A5_EXTRA", wxPAPER_A5_EXTRA }, + { "wxPAPER_A5_ROTATED", wxPAPER_A5_ROTATED }, { "wxPAPER_A5_TRANSVERSE", wxPAPER_A5_TRANSVERSE }, + { "wxPAPER_A6", wxPAPER_A6 }, + { "wxPAPER_A6_ROTATED", wxPAPER_A6_ROTATED }, { "wxPAPER_A_PLUS", wxPAPER_A_PLUS }, { "wxPAPER_B4", wxPAPER_B4 }, + { "wxPAPER_B4_JIS_ROTATED", wxPAPER_B4_JIS_ROTATED }, { "wxPAPER_B5", wxPAPER_B5 }, { "wxPAPER_B5_EXTRA", wxPAPER_B5_EXTRA }, + { "wxPAPER_B5_JIS_ROTATED", wxPAPER_B5_JIS_ROTATED }, { "wxPAPER_B5_TRANSVERSE", wxPAPER_B5_TRANSVERSE }, + { "wxPAPER_B6_JIS", wxPAPER_B6_JIS }, + { "wxPAPER_B6_JIS_ROTATED", wxPAPER_B6_JIS_ROTATED }, { "wxPAPER_B_PLUS", wxPAPER_B_PLUS }, { "wxPAPER_CSHEET", wxPAPER_CSHEET }, + { "wxPAPER_DBL_JAPANESE_POSTCARD", wxPAPER_DBL_JAPANESE_POSTCARD }, + { "wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED", wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED }, { "wxPAPER_DSHEET", wxPAPER_DSHEET }, { "wxPAPER_ENV_10", wxPAPER_ENV_10 }, *************** *** 2374,2377 **** --- 2405,2419 ---- { "wxPAPER_ISO_B4", wxPAPER_ISO_B4 }, { "wxPAPER_JAPANESE_POSTCARD", wxPAPER_JAPANESE_POSTCARD }, + { "wxPAPER_JAPANESE_POSTCARD_ROTATED", wxPAPER_JAPANESE_POSTCARD_ROTATED }, + { "wxPAPER_JENV_CHOU3", wxPAPER_JENV_CHOU3 }, + { "wxPAPER_JENV_CHOU3_ROTATED", wxPAPER_JENV_CHOU3_ROTATED }, + { "wxPAPER_JENV_CHOU4", wxPAPER_JENV_CHOU4 }, + { "wxPAPER_JENV_CHOU4_ROTATED", wxPAPER_JENV_CHOU4_ROTATED }, + { "wxPAPER_JENV_KAKU2", wxPAPER_JENV_KAKU2 }, + { "wxPAPER_JENV_KAKU2_ROTATED", wxPAPER_JENV_KAKU2_ROTATED }, + { "wxPAPER_JENV_KAKU3", wxPAPER_JENV_KAKU3 }, + { "wxPAPER_JENV_KAKU3_ROTATED", wxPAPER_JENV_KAKU3_ROTATED }, + { "wxPAPER_JENV_YOU4", wxPAPER_JENV_YOU4 }, + { "wxPAPER_JENV_YOU4_ROTATED", wxPAPER_JENV_YOU4_ROTATED }, { "wxPAPER_LEDGER", wxPAPER_LEDGER }, { "wxPAPER_LEGAL", wxPAPER_LEGAL }, *************** *** 2382,2388 **** --- 2424,2457 ---- { "wxPAPER_LETTER_EXTRA_TRANSVERSE", wxPAPER_LETTER_EXTRA_TRANSVERSE }, { "wxPAPER_LETTER_PLUS", wxPAPER_LETTER_PLUS }, + { "wxPAPER_LETTER_ROTATED", wxPAPER_LETTER_ROTATED }, { "wxPAPER_LETTER_TRANSVERSE", wxPAPER_LETTER_TRANSVERSE }, { "wxPAPER_NONE", wxPAPER_NONE }, { "wxPAPER_NOTE", wxPAPER_NOTE }, + { "wxPAPER_P16K", wxPAPER_P16K }, + { "wxPAPER_P16K_ROTATED", wxPAPER_P16K_ROTATED }, + { "wxPAPER_P32K", wxPAPER_P32K }, + { "wxPAPER_P32KBIG", wxPAPER_P32KBIG }, + { "wxPAPER_P32KBIG_ROTATED", wxPAPER_P32KBIG_ROTATED }, + { "wxPAPER_P32K_ROTATED", wxPAPER_P32K_ROTATED }, + { "wxPAPER_PENV_1", wxPAPER_PENV_1 }, + { "wxPAPER_PENV_10", wxPAPER_PENV_10 }, + { "wxPAPER_PENV_10_ROTATED", wxPAPER_PENV_10_ROTATED }, + { "wxPAPER_PENV_1_ROTATED", wxPAPER_PENV_1_ROTATED }, + { "wxPAPER_PENV_2", wxPAPER_PENV_2 }, + { "wxPAPER_PENV_2_ROTATED", wxPAPER_PENV_2_ROTATED }, + { "wxPAPER_PENV_3", wxPAPER_PENV_3 }, + { "wxPAPER_PENV_3_ROTATED", wxPAPER_PENV_3_ROTATED }, + { "wxPAPER_PENV_4", wxPAPER_PENV_4 }, + { "wxPAPER_PENV_4_ROTATED", wxPAPER_PENV_4_ROTATED }, + { "wxPAPER_PENV_5", wxPAPER_PENV_5 }, + { "wxPAPER_PENV_5_ROTATED", wxPAPER_PENV_5_ROTATED }, + { "wxPAPER_PENV_6", wxPAPER_PENV_6 }, + { "wxPAPER_PENV_6_ROTATED", wxPAPER_PENV_6_ROTATED }, + { "wxPAPER_PENV_7", wxPAPER_PENV_7 }, + { "wxPAPER_PENV_7_ROTATED", wxPAPER_PENV_7_ROTATED }, + { "wxPAPER_PENV_8", wxPAPER_PENV_8 }, + { "wxPAPER_PENV_8_ROTATED", wxPAPER_PENV_8_ROTATED }, + { "wxPAPER_PENV_9", wxPAPER_PENV_9 }, + { "wxPAPER_PENV_9_ROTATED", wxPAPER_PENV_9_ROTATED }, { "wxPAPER_QUARTO", wxPAPER_QUARTO }, { "wxPAPER_STATEMENT", wxPAPER_STATEMENT }, *************** *** 2634,2637 **** --- 2703,2707 ---- { "wxXML_PI_NODE", wxXML_PI_NODE }, { "wxXML_TEXT_NODE", wxXML_TEXT_NODE }, + { "wxXRC_NO_RELOADING", wxXRC_NO_RELOADING }, { "wxXRC_NO_SUBCLASSING", wxXRC_NO_SUBCLASSING }, { "wxXRC_USE_LOCALE", wxXRC_USE_LOCALE }, *************** *** 2639,2642 **** --- 2709,2721 ---- + #if wxUSE_HOTKEY + { "wxMOD_ALT", wxMOD_ALT }, + { "wxMOD_CONTROL", wxMOD_CONTROL }, + { "wxMOD_NONE", wxMOD_NONE }, + { "wxMOD_SHIFT", wxMOD_SHIFT }, + { "wxMOD_WIN", wxMOD_WIN }, + #endif + + #if wxUSE_STREAMS { "wxEOL_DOS", wxEOL_DOS }, *************** *** 5348,5351 **** --- 5427,5435 ---- + #if (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint) + { "wxPrinterDC", wxPrinterDC_methods, wxPrinterDC_methodCount, -1, CLASSINFO(wxPrinterDC), &s_wxluatag_wxPrinterDC, "wxDC" }, + #endif + + #if (defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) { "wxBitmapHandler", wxBitmapHandler_methods, wxBitmapHandler_methodCount, -1, NULL, &s_wxluatag_wxBitmapHandler, NULL }, *************** *** 5360,5368 **** - #if (defined(__WXMSW__)) && (wxLUA_USE_wxPrint) - { "wxPrinterDC", wxPrinterDC_methods, wxPrinterDC_methodCount, -1, CLASSINFO(wxPrinterDC), &s_wxluatag_wxPrinterDC, "wxDC" }, - #endif - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp) { "wxLog", wxLog_methods, wxLog_methodCount, -1, NULL, &s_wxluatag_wxLog, NULL }, --- 5444,5447 ---- *************** *** 5425,5429 **** { "wxPreviewFrame", wxPreviewFrame_methods, wxPreviewFrame_methodCount, -1, CLASSINFO(wxPreviewFrame), &s_wxluatag_wxPreviewFrame, "wxFrame" }, { "wxPrintPreview", wxPrintPreview_methods, wxPrintPreview_methodCount, -1, NULL, &s_wxluatag_wxPrintPreview, "wxObject" }, ! { "wxPrinter", wxPrinter_methods, wxPrinter_methodCount, -1, NULL, &s_wxluatag_wxPrinter, "wxObject" }, #endif --- 5504,5508 ---- { "wxPreviewFrame", wxPreviewFrame_methods, wxPreviewFrame_methodCount, -1, CLASSINFO(wxPreviewFrame), &s_wxluatag_wxPreviewFrame, "wxFrame" }, { "wxPrintPreview", wxPrintPreview_methods, wxPrintPreview_methodCount, -1, NULL, &s_wxluatag_wxPrintPreview, "wxObject" }, ! { "wxPrinter", wxPrinter_methods, wxPrinter_methodCount, -1, CLASSINFO(wxPrinter), &s_wxluatag_wxPrinter, "wxObject" }, #endif *************** *** 5492,5495 **** --- 5571,5579 ---- + #if (wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT) && (wxLUA_USE_wxPrint) + { "wxPostScriptDC", wxPostScriptDC_methods, wxPostScriptDC_methodCount, -1, CLASSINFO(wxPostScriptDC), &s_wxluatag_wxPostScriptDC, "wxDC" }, + #endif + + #if (wxUSE_SOUND) && (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxWave) { "wxSound", wxSound_methods, wxSound_methodCount, -1, NULL, &s_wxluatag_wxSound, "wxObject" }, *************** *** 5995,6001 **** #if wxLUA_USE_wxPrint ! { "wxPageSetupDialog", wxPageSetupDialog_methods, wxPageSetupDialog_methodCount, -1, CLASSINFO(wxPageSetupDialog), &s_wxluatag_wxPageSetupDialog, "wxDialog" }, { "wxPageSetupDialogData", wxPageSetupDialogData_methods, wxPageSetupDialogData_methodCount, -1, CLASSINFO(wxPageSetupDialogData), &s_wxluatag_wxPageSetupDialogData, "wxObject" }, { "wxPreviewCanvas", wxPreviewCanvas_methods, wxPreviewCanvas_methodCount, -1, NULL, &s_wxluatag_wxPreviewCanvas, "wxScrolledWindow" }, { "wxPrintData", wxPrintData_methods, wxPrintData_methodCount, -1, CLASSINFO(wxPrintData), &s_wxluatag_wxPrintData, "wxObject" }, { "wxPrintDialog", wxPrintDialog_methods, wxPrintDialog_methodCount, -1, CLASSINFO(wxPrintDialog), &s_wxluatag_wxPrintDialog, "wxObject" }, --- 6079,6086 ---- #if wxLUA_USE_wxPrint ! { "wxPageSetupDialog", wxPageSetupDialog_methods, wxPageSetupDialog_methodCount, -1, CLASSINFO(wxPageSetupDialog), &s_wxluatag_wxPageSetupDialog, "wxObject" }, { "wxPageSetupDialogData", wxPageSetupDialogData_methods, wxPageSetupDialogData_methodCount, -1, CLASSINFO(wxPageSetupDialogData), &s_wxluatag_wxPageSetupDialogData, "wxObject" }, { "wxPreviewCanvas", wxPreviewCanvas_methods, wxPreviewCanvas_methodCount, -1, NULL, &s_wxluatag_wxPreviewCanvas, "wxScrolledWindow" }, + { "wxPreviewControlBar", wxPreviewControlBar_methods, wxPreviewControlBar_methodCount, -1, CLASSINFO(wxPreviewControlBar), &s_wxluatag_wxPreviewControlBar, "wxPanel" }, { "wxPrintData", wxPrintData_methods, wxPrintData_methodCount, -1, CLASSINFO(wxPrintData), &s_wxluatag_wxPrintData, "wxObject" }, { "wxPrintDialog", wxPrintDialog_methods, wxPrintDialog_methodCount, -1, CLASSINFO(wxPrintDialog), &s_wxluatag_wxPrintDialog, "wxObject" }, Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlua.cpp 2 May 2006 05:25:06 -0000 1.16 --- wxlua.cpp 17 May 2006 05:02:05 -0000 1.17 *************** *** 636,641 **** } ! static int LUACALL wxLua_wxLuaDebugEvent_destructor(lua_State *) { return 0; } --- 636,661 ---- } ! static int LUACALL wxLua_wxLuaDebugEvent_destructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); ! ! // remove from tracked memory list ! if (self != 0) ! wxlState.RemoveTrackedMemory(self); ! return 0; ! } ! ! static int LUACALL wxLua_wxLuaDebugEvent_Delete(lua_State *L) { + wxLuaState wxlState(L); + wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); + // remove from tracked memory list + if (self != 0) + if (wxlState.RemoveTrackedMemory(self)) + { // if removed, reset the tag so that gc() is not called on this object. + lua_pushnil(L); + lua_setmetatable(L, -2); + } return 0; } *************** *** 653,656 **** --- 673,677 ---- { LuaMethod, "GetDebugData", wxLua_wxLuaDebugEvent_GetDebugData, 0, 0, { 0 } }, { LuaDelete, "wxLuaDebugEvent", wxLua_wxLuaDebugEvent_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxLuaDebugEvent_Delete, 0, 0, {0} }, }; *************** *** 913,918 **** } ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_destructor(lua_State *) { return 0; } --- 934,959 ---- } ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_destructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); ! ! // remove from tracked memory list ! if (self != 0) ! wxlState.RemoveTrackedMemory(self); ! return 0; ! } ! ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L) { + wxLuaState wxlState(L); + wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); + // remove from tracked memory list + if (self != 0) + if (wxlState.RemoveTrackedMemory(self)) + { // if removed, reset the tag so that gc() is not called on this object. + lua_pushnil(L); + lua_setmetatable(L, -2); + } return 0; } *************** *** 927,932 **** #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, { 0 } }, - { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, {0} }, { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, { 0 } }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, {0} }, #endif --- 968,973 ---- #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, { 0 } }, { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, { 0 } }, + { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, {0} }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, {0} }, #endif *************** *** 937,940 **** --- 978,982 ---- { LuaSetProp, "ParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 1, {0} }, { LuaDelete, "wxLuaHtmlWinTagEvent", wxLua_wxLuaHtmlWinTagEvent_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxLuaHtmlWinTagEvent_Delete, 0, 0, {0} }, }; |
