Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2007-06-08 01:36:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15480/wxLua/modules/wxbindstc/include Modified Files: wxbind.h Log Message: Add a simple method to get the binding info, seems small and works well Addd sample lua program bindings.wx.lua to show them in a listctrl Fix incircles to work with new bindings Put the "name" of the struct binding items first always Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxbind.h 7 Jun 2007 03:22:09 -0000 1.24 --- wxbind.h 8 Jun 2007 01:36:30 -0000 1.25 *************** *** 26,32 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 9 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 9 // --------------------------------------------------------------------------- --- 26,32 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 10 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 10 // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-06-08 01:36:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15480/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: Add a simple method to get the binding info, seems small and works well Addd sample lua program bindings.wx.lua to show them in a listctrl Fix incircles to work with new bindings Put the "name" of the struct binding items first always Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxluasocket_bind.h 7 Jun 2007 03:22:10 -0000 1.18 --- wxluasocket_bind.h 8 Jun 2007 01:36:32 -0000 1.19 *************** *** 27,33 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 9 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 9 // --------------------------------------------------------------------------- --- 27,33 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 10 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 10 // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-06-08 01:36:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15480/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp Log Message: Add a simple method to get the binding info, seems small and works well Addd sample lua program bindings.wx.lua to show them in a listctrl Fix incircles to work with new bindings Put the "name" of the struct binding items first always Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** wxlbind.cpp 6 Jun 2007 23:43:16 -0000 1.65 --- wxlbind.cpp 8 Jun 2007 01:36:31 -0000 1.66 *************** *** 25,28 **** --- 25,30 ---- WX_DEFINE_LIST(wxLuaBindingList); + int LUACALL wxluabind_wxLuaBinding_index(lua_State* L); + // Binding tags are generated as positive tag id automatically when bound // so we set the inbuilt lua arg tags to negative values *************** *** 685,688 **** --- 687,708 ---- PostRegister(wxlState, registerTypes, tableOffset); + // Push function to access the binding info + lua_pushstring(L, wx2lua(wxT("wxLuaBinding_") + m_bindingName)); + const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *)); + *ptr = this; + lua_newtable(L); + lua_pushstring(L, "__index"); + lua_pushlightuserdata(L, this); // push tag to recognize table call + lua_pushcclosure(L, wxluabind_wxLuaBinding_index, 1); // push func with tag as upvalue + lua_rawset(L, -3); + + //lua_pushstring(L, "__metatable"); + //lua_pushstring(L, "Metatable is not accessible"); + //lua_rawset(L, -3); + + lua_setmetatable(L, -2); + lua_rawset(L, -3); + + m_bindings_registered = true; *************** *** 712,718 **** // install the classes, functions and methods, creating new tags // if this is the first time we're registering them ! for (size_t i_class = 0; i_class < m_classCount; ++i_class) { - wxLuaBindClass *wxlClass = m_classArray + i_class; // Create a new tag if registering types, else use tag already set --- 732,738 ---- // install the classes, functions and methods, creating new tags // if this is the first time we're registering them ! wxLuaBindClass *wxlClass = m_classArray; ! for (size_t i_class = 0; i_class < m_classCount; ++i_class, ++wxlClass) { // Create a new tag if registering types, else use tag already set *************** *** 774,780 **** // Install public functions like constructors or global functions ! for (i_method = 0; i_method < method_count; ++i_method) { - wxLuaBindMethod *wxlMethod = wxlClass->methods + i_method; if (WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_CONSTRUCTOR | WXLUAMETHOD_CFUNCTION)) { --- 794,800 ---- // Install public functions like constructors or global functions ! wxLuaBindMethod *wxlMethod = wxlClass->methods; ! for (i_method = 0; i_method < method_count; ++i_method, ++wxlMethod) { if (WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_CONSTRUCTOR | WXLUAMETHOD_CFUNCTION)) { *************** *** 963,967 **** { const int eventType = eventType_; ! wxLuaBindEvent eventItem = { &eventType, "" }; const wxLuaBindEvent *pLuaEvent = (wxLuaBindEvent *)bsearch(&eventItem, --- 983,987 ---- { const int eventType = eventType_; ! wxLuaBindEvent eventItem = { "", &eventType }; const wxLuaBindEvent *pLuaEvent = (wxLuaBindEvent *)bsearch(&eventItem, *************** *** 981,998 **** const wxLuaBindClass* wxLuaBinding::GetLuaClass(const wxLuaBindMethod* wxlMethod) const { ! for (size_t i_class = 0; i_class < m_classCount; ++i_class) { ! wxLuaBindClass *wxlClass = m_classArray + i_class; ! int i_method, method_count = wxlClass->methods_n; ! for (i_method = 0; i_method < method_count; ++i_method) { ! for (int i = 0; i < wxlClass->methods_n; ++i) ! { ! if (&wxlClass->methods[i] == wxlMethod) ! return wxlClass; ! } } - } --- 1001,1017 ---- const wxLuaBindClass* wxLuaBinding::GetLuaClass(const wxLuaBindMethod* wxlMethod) const { ! wxLuaBindClass* wxlClass_i = m_classArray; ! wxLuaBindMethod* wxlMethod_i = NULL; ! ! for (size_t i_class = 0; i_class < m_classCount; ++i_class, ++wxlClass_i) { ! wxlMethod_i = wxlClass_i->methods; ! int i_method, methods_n = wxlClass_i->methods_n; ! for (i_method = 0; i_method < methods_n; ++i_method, ++wxlMethod_i) { ! if (wxlMethod_i == wxlMethod) ! return wxlClass_i; } } *************** *** 1002,1024 **** const wxLuaBindClass* wxLuaBinding::GetLuaClass(const wxLuaBindCFunc* wxlMethod_cfunc) const { ! for (size_t i_class = 0; i_class < m_classCount; ++i_class) { ! wxLuaBindClass *wxlClass = m_classArray + i_class; ! int i_method, method_count = wxlClass->methods_n; ! for (i_method = 0; i_method < method_count; ++i_method) { ! for (int i = 0; i < wxlClass->methods_n; ++i) { ! for (int j = 0; j < wxlClass->methods[i].funcs_n; ++j) { ! if (&wxlClass->methods[i].funcs[j] == wxlMethod_cfunc) ! return wxlClass; } } } } ! return NULL; } --- 1021,1541 ---- const wxLuaBindClass* wxLuaBinding::GetLuaClass(const wxLuaBindCFunc* wxlMethod_cfunc) const { ! wxLuaBindClass* wxlClass_i = m_classArray; ! wxLuaBindMethod* wxlMethod_i = NULL; ! wxLuaBindCFunc* wxlCFunc_i = NULL; ! ! for (size_t i_class = 0; i_class < m_classCount; ++i_class, ++wxlClass_i) { ! wxlMethod_i = wxlClass_i->methods; ! int i_method, methods_n = wxlClass_i->methods_n; ! for (i_method = 0; i_method < methods_n; ++i_method, ++wxlMethod_i) { ! wxlCFunc_i = wxlMethod_i->funcs; ! int i_func, funcs_n = wxlMethod_i->funcs_n; ! ! for (i_func = 0; i_func < funcs_n; ++i_func, ++wxlCFunc_i) { ! if (wxlCFunc_i == wxlMethod_cfunc) ! return wxlClass_i; ! } ! } ! } ! ! return NULL; ! } ! ! //----------------------------------------------------------------------------- ! // wxluabind_wxLuaBindCFunc_index ! //----------------------------------------------------------------------------- ! ! int LUACALL wxluabind_wxLuaBindCFunc_index(lua_State* L) ! { ! wxLuaState wxlState(L); ! wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! ! void **ptr = (void **)lua_touserdata(L, 1); ! wxLuaBindCFunc* wxlCFunc= (wxLuaBindCFunc*)*ptr; ! wxLuaBinding *wxlBinding = (wxLuaBinding *)lua_touserdata(L, lua_upvalueindex(1)); ! ! int idx_type = lua_type(L, 2); ! ! if (idx_type == LUA_TSTRING) ! { ! const char* idx_str = lua_tostring(L, 2); ! ! if (strcmp(idx_str, "func") == 0) ! { ! lua_pushcfunction(L, wxlCFunc->func); ! return 1; ! } ! else if (strcmp(idx_str, "type") == 0) ! { ! lua_pushnumber(L, wxlCFunc->type); ! return 1; ! } ! else if (strcmp(idx_str, "minargs") == 0) ! { ! lua_pushnumber(L, wxlCFunc->minargs); ! return 1; ! } ! else if (strcmp(idx_str, "maxargs") == 0) ! { ! lua_pushnumber(L, wxlCFunc->maxargs); ! return 1; ! } ! else if (strcmp(idx_str, "argtags") == 0) ! { ! size_t idx, count = wxlCFunc->maxargs; ! lua_createtable(L, count, 0); ! ! // check for terminating null argtag ! for (idx = 0; (idx < count) && wxlCFunc->argtags[idx]; ++idx) ! { ! lua_pushnumber(L, *wxlCFunc->argtags[idx]); ! lua_rawseti(L, -2, idx + 1); ! } ! ! return 1; ! } ! else if (strcmp(idx_str, "argtags_name") == 0) ! { ! size_t idx, count = wxlCFunc->maxargs; ! lua_createtable(L, count, 0); ! ! // check for terminating null argtag ! for (idx = 0; (idx < count) && wxlCFunc->argtags[idx]; ++idx) ! { ! lua_pushstring(L, wxlState.GetLuaTagName(*wxlCFunc->argtags[idx])); ! lua_rawseti(L, -2, idx + 1); ! } ! ! return 1; ! } ! ! ! } ! ! return 0; ! } ! ! //----------------------------------------------------------------------------- ! // wxluabind_wxLuaBindMethod_index ! //----------------------------------------------------------------------------- ! ! int LUACALL wxluabind_wxLuaBindMethod_index(lua_State* L) ! { ! wxLuaState wxlState(L); ! wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! ! void **ptr = (void **)lua_touserdata(L, 1); ! wxLuaBindMethod* wxlMethod = (wxLuaBindMethod*)*ptr; ! wxLuaBinding *wxlBinding = (wxLuaBinding *)lua_touserdata(L, lua_upvalueindex(1)); ! ! int idx_type = lua_type(L, 2); ! ! if (idx_type == LUA_TSTRING) ! { ! const char* idx_str = lua_tostring(L, 2); ! ! if (strcmp(idx_str, "name") == 0) ! { ! lua_pushstring(L, wxlMethod->name); ! return 1; ! } ! else if (strcmp(idx_str, "type") == 0) ! { ! lua_pushnumber(L, wxlMethod->type); ! return 1; ! } ! else if (strcmp(idx_str, "funcs") == 0) ! { ! wxLuaBindCFunc* wxlCFunc = wxlMethod->funcs; ! size_t idx, count = wxlMethod->funcs_n; ! lua_createtable(L, count, 0); ! ! for (idx = 0; idx < count; ++idx, ++wxlCFunc) ! { ! const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *)); ! *ptr = wxlCFunc; ! lua_newtable(L); ! lua_pushstring(L, "__index"); ! lua_pushlightuserdata(L, wxlBinding); ! lua_pushcclosure(L, wxluabind_wxLuaBindCFunc_index, 1); // push func with tag as upvalue ! lua_rawset(L, -3); ! lua_setmetatable(L, -2); ! ! lua_rawseti(L, -2, idx + 1); ! } ! ! return 1; ! } ! else if (strcmp(idx_str, "funcs_n") == 0) ! { ! lua_pushnumber(L, wxlMethod->funcs_n); ! return 1; ! } ! else if (strcmp(idx_str, "basemethod") == 0) ! { ! if (wxlMethod->basemethod) ! { ! const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *)); ! *ptr = wxlMethod->basemethod; ! lua_newtable(L); ! lua_pushstring(L, "__index"); ! lua_pushlightuserdata(L, wxlBinding); ! lua_pushcclosure(L, wxluabind_wxLuaBindMethod_index, 1); // push func with tag as upvalue ! lua_rawset(L, -3); ! lua_setmetatable(L, -2); ! ! return 1; ! } ! ! return 0; ! } ! } ! ! return 0; ! } ! ! //----------------------------------------------------------------------------- ! // wxluabind_wxLuaBindClass_index ! //----------------------------------------------------------------------------- ! ! int LUACALL wxluabind_wxLuaBindClass_index(lua_State* L) ! { ! wxLuaState wxlState(L); ! wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! ! void **ptr = (void **)lua_touserdata(L, 1); ! wxLuaBindClass* wxlClass = (wxLuaBindClass*)*ptr; ! wxLuaBinding *wxlBinding = (wxLuaBinding *)lua_touserdata(L, lua_upvalueindex(1)); ! ! int idx_type = lua_type(L, 2); ! ! if (idx_type == LUA_TSTRING) ! { ! const char* idx_str = lua_tostring(L, 2); ! ! if (strcmp(idx_str, "name") == 0) ! { ! lua_pushstring(L, wxlClass->name); ! return 1; ! } ! else if (strcmp(idx_str, "methods") == 0) ! { ! if (wxlClass->methods_n > 0) ! { ! wxLuaBindMethod* wxlMethod = wxlClass->methods; ! size_t idx, count = wxlClass->methods_n; ! lua_createtable(L, count, 0); ! ! for (idx = 0; idx < count; ++idx, ++wxlMethod) { ! // Force the baseclass methods to be found ! wxlState.GetLuaMethod(wxlClass, wxlMethod->name, true); ! ! // Create table { wxLuaBindClass userdata } ! const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *)); ! *ptr = wxlMethod; ! lua_newtable(L); ! lua_pushstring(L, "__index"); ! lua_pushlightuserdata(L, wxlBinding); ! lua_pushcclosure(L, wxluabind_wxLuaBindMethod_index, 1); // push func with tag as upvalue ! lua_rawset(L, -3); ! lua_setmetatable(L, -2); ! ! lua_rawseti(L, -2, idx + 1); } + + return 1; } + + return 0; } + else if (strcmp(idx_str, "methods_n") == 0) + { + lua_pushnumber(L, wxlClass->methods_n); + return 1; + } + else if (strcmp(idx_str, "classInfo") == 0) + { + if (wxlClass->classInfo) + { + const wxLuaBindClass* classInfoClass = wxlState.GetLuaClass("wxClassInfo"); + if (classInfoClass) + { + wxlState.PushUserDataType(*classInfoClass->class_tag, wxlClass->classInfo); + return 1; + } + } + return 0; + } + else if (strcmp(idx_str, "class_tag") == 0) + { + lua_pushnumber(L, *wxlClass->class_tag); + return 1; + } + else if (strcmp(idx_str, "baseclassName") == 0) + { + lua_pushstring(L, wxlClass->baseclassName); + return 1; + } + else if (strcmp(idx_str, "baseclass") == 0) + { + if (wxlClass->baseclass) + { + const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *)); + *ptr = wxlClass->baseclass; + lua_newtable(L); + lua_pushstring(L, "__index"); + lua_pushlightuserdata(L, wxlBinding); + lua_pushcclosure(L, wxluabind_wxLuaBindClass_index, 1); // push func with tag as upvalue + lua_rawset(L, -3); + lua_setmetatable(L, -2); + + return 1; + } + + return 0; + } + else if (strcmp(idx_str, "enums") == 0) + { + if (wxlClass->enums_n > 0) + { + wxLuaBindDefine* wxlDefine = wxlClass->enums; + size_t idx, count = wxlClass->enums_n; + lua_createtable(L, count, 0); + + for (idx = 0; idx < count; ++idx, ++wxlDefine) + { + // Create table { name, value } + lua_createtable(L, 0, 2); + lua_pushstring(L, "name"); + lua_pushstring(L, wxlDefine->name); + lua_rawset(L, -3); + lua_pushstring(L, "value"); + lua_pushnumber(L, wxlDefine->value); + lua_rawset(L, -3); + + lua_rawseti(L, -2, idx + 1); + } + + return 1; + } + + return 0; + } + else if (strcmp(idx_str, "enums_n") == 0) + { + lua_pushnumber(L, wxlClass->enums_n); + return 1; + } } ! return 0; ! } ! ! //----------------------------------------------------------------------------- ! // wxluabind_wxLuaBinding_index ! //----------------------------------------------------------------------------- ! ! int LUACALL wxluabind_wxLuaBinding_index(lua_State* L) ! { ! wxLuaState wxlState(L); ! wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! ! void **ptr = (void **)lua_touserdata(L, 1); ! wxLuaBinding* wxlBinding = (wxLuaBinding*)*ptr; ! ! int idx_type = lua_type(L, 2); ! ! if (idx_type == LUA_TSTRING) ! { ! const char* idx_str = lua_tostring(L, 2); ! ! if (strcmp(idx_str, "GetBindingName") == 0) ! { ! lua_pushstring(L, wx2lua(wxlBinding->GetBindingName())); ! return 1; ! } ! else if (strcmp(idx_str, "GetLuaNamespace") == 0) ! { ! lua_pushstring(L, wx2lua(wxlBinding->GetLuaNamespace())); ! return 1; ! } ! else if (strcmp(idx_str, "GetClassCount") == 0) ! { ! lua_pushnumber(L, wxlBinding->GetClassCount()); ! return 1; ! } ! else if (strcmp(idx_str, "GetDefineCount") == 0) ! { ! lua_pushnumber(L, wxlBinding->GetDefineCount()); ! return 1; ! } ! else if (strcmp(idx_str, "GetEventCount") == 0) ! { ! lua_pushnumber(L, wxlBinding->GetEventCount()); ! return 1; ! } ! else if (strcmp(idx_str, "GetObjectCount") == 0) ! { ! lua_pushnumber(L, wxlBinding->GetObjectCount()); ! return 1; ! } ! else if (strcmp(idx_str, "GetFunctionCount") == 0) ! { ! lua_pushnumber(L, wxlBinding->GetFunctionCount()); ! return 1; ! } ! else if (strcmp(idx_str, "GetClassArray") == 0) ! { ! wxLuaBindClass* wxlClass = wxlBinding->GetClassArray(); ! size_t idx, count = wxlBinding->GetClassCount(); ! lua_createtable(L, count, 0); ! ! for (idx = 0; idx < count; ++idx, ++wxlClass) ! { ! // Create table { wxLuaBindClass userdata } ! const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *)); ! *ptr = wxlClass; ! lua_newtable(L); ! lua_pushstring(L, "__index"); ! lua_pushlightuserdata(L, wxlBinding); ! lua_pushcclosure(L, wxluabind_wxLuaBindClass_index, 1); // push func with tag as upvalue ! lua_rawset(L, -3); ! lua_setmetatable(L, -2); ! ! lua_rawseti(L, -2, idx + 1); ! } ! ! return 1; ! } ! else if (strcmp(idx_str, "GetFunctionArray") == 0) ! { ! wxLuaBindMethod* wxlMethod = wxlBinding->GetFunctionArray(); ! size_t idx, count = wxlBinding->GetFunctionCount(); ! lua_createtable(L, count, 0); ! ! for (idx = 0; idx < count; ++idx, ++wxlMethod) ! { ! // Create table { wxLuaBindClass userdata } ! const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *)); ! *ptr = wxlMethod; ! lua_newtable(L); ! lua_pushstring(L, "__index"); ! lua_pushlightuserdata(L, wxlBinding); ! lua_pushcclosure(L, wxluabind_wxLuaBindMethod_index, 1); // push func with tag as upvalue ! lua_rawset(L, -3); ! lua_setmetatable(L, -2); ! ! lua_rawseti(L, -2, idx + 1); ! } ! ! return 1; ! } ! else if (strcmp(idx_str, "GetDefineArray") == 0) ! { ! wxLuaBindDefine* wxlDefine = wxlBinding->GetDefineArray(); ! size_t idx, count = wxlBinding->GetDefineCount(); ! lua_createtable(L, count, 0); ! ! for (idx = 0; idx < count; ++idx, ++wxlDefine) ! { ! // Create table { name, value } ! lua_createtable(L, 0, 2); ! lua_pushstring(L, "name"); ! lua_pushstring(L, wxlDefine->name); ! lua_rawset(L, -3); ! lua_pushstring(L, "value"); ! lua_pushnumber(L, wxlDefine->value); ! lua_rawset(L, -3); ! ! lua_rawseti(L, -2, idx + 1); ! } ! ! return 1; ! } ! else if (strcmp(idx_str, "GetStringArray") == 0) ! { ! wxLuaBindString* wxlString = wxlBinding->GetStringArray(); ! size_t idx, count = wxlBinding->GetStringCount(); ! lua_createtable(L, count, 0); ! ! for (idx = 0; idx < count; ++idx, ++wxlString) ! { ! // Create table { name, value } ! lua_createtable(L, 0, 2); ! lua_pushstring(L, "name"); ! lua_pushstring(L, wxlString->name); ! lua_rawset(L, -3); ! lua_pushstring(L, "value"); ! lua_pushstring(L, wx2lua(wxlString->value)); ! lua_rawset(L, -3); ! ! lua_rawseti(L, -2, idx + 1); ! } ! ! return 1; ! } ! else if (strcmp(idx_str, "GetEventArray") == 0) ! { ! wxLuaBindEvent* wxlEvent = wxlBinding->GetEventArray(); ! size_t idx, count = wxlBinding->GetEventCount(); ! lua_createtable(L, count, 0); ! ! for (idx = 0; idx < count; ++idx, ++wxlEvent) ! { ! // Create table { name, eventType, class_tag } ! lua_createtable(L, 0, 3); ! lua_pushstring(L, "name"); ! lua_pushstring(L, wxlEvent->name); ! lua_rawset(L, -3); ! lua_pushstring(L, "eventType"); ! lua_pushnumber(L, *wxlEvent->eventType); ! lua_rawset(L, -3); ! lua_pushstring(L, "class_tag"); ! lua_pushnumber(L, *wxlEvent->class_tag); ! lua_rawset(L, -3); ! ! lua_rawseti(L, -2, idx + 1); ! } ! ! return 1; ! } ! else if (strcmp(idx_str, "GetObjectArray") == 0) ! { ! wxLuaBindObject* wxlObject = wxlBinding->GetObjectArray(); ! size_t idx, count = wxlBinding->GetObjectCount(); ! lua_createtable(L, count, 0); ! ! for (idx = 0; idx < count; ++idx, ++wxlObject) ! { ! // Create table { name, object, class_tag } ! lua_createtable(L, 0, 3); ! lua_pushstring(L, "name"); ! lua_pushstring(L, wxlObject->name); ! lua_rawset(L, -3); ! ! lua_pushstring(L, "object"); ! if (wxlObject->objPtr != 0) ! wxlState.tpushusertag(wxlObject->objPtr, *wxlObject->class_tag); ! else ! wxlState.tpushusertag(*wxlObject->pObjPtr, *wxlObject->class_tag); ! lua_rawset(L, -3); ! ! lua_pushstring(L, "class_tag"); ! lua_pushnumber(L, *wxlObject->class_tag); ! lua_rawset(L, -3); ! ! lua_rawseti(L, -2, idx + 1); ! } ! ! return 1; ! } ! } ! ! return 0; } |
|
From: John L. <jr...@us...> - 2007-06-07 03:42:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22306/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: Use dummy wxLuaBindDefine for class member enums if they don't have any Some formatting fixes for the generated bindings Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxluasocket_bind.h 6 Jun 2007 23:43:17 -0000 1.17 --- wxluasocket_bind.h 7 Jun 2007 03:22:10 -0000 1.18 *************** *** 70,80 **** extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; - extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindDefine wxLuaDebuggerEvent_enums[]; - extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_enumCount; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerServer; extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerServer_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; - extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindDefine wxLuaDebuggerServer_enums[]; - extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_enumCount; --- 70,76 ---- |
|
From: John L. <jr...@us...> - 2007-06-07 03:42:41
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22306/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan_bind.cpp Log Message: Use dummy wxLuaBindDefine for class member enums if they don't have any Some formatting fixes for the generated bindings Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxluacan.cpp 6 Jun 2007 23:42:53 -0000 1.28 --- wxluacan.cpp 7 Jun 2007 03:21:58 -0000 1.29 *************** *** 30,34 **** static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_AddObject }}; - // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L) --- 30,33 ---- *************** *** 48,52 **** static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetX }}; - // double GetX() static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L) --- 47,50 ---- *************** *** 67,71 **** static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetY }}; - // double GetY() static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L) --- 65,68 ---- *************** *** 88,92 **** static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }}; - // void SetBrush( const wxBrush& brush ) static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L) --- 85,88 ---- *************** *** 106,110 **** static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPen }}; - // void SetPen( const wxPen& pen ) static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L) --- 102,105 ---- *************** *** 126,130 **** static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPending }}; - // void SetPending( bool pending = true ) static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L) --- 121,124 ---- *************** *** 146,150 **** static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxlCanObj_SetPos }}; - // void SetPos( double x, double y ) static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L) --- 140,143 ---- *************** *** 166,170 **** static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxlCanObj_constructor }}; - // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) --- 159,162 ---- *************** *** 209,218 **** - wxLuaBindDefine wxlCanObj_enums[] = { - { NULL, 0, }, - }; - - int wxlCanObj_enumCount = sizeof(wxlCanObj_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlCanObjRect --- 201,204 ---- *************** *** 225,229 **** static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }}; - // wxlCanObjRect( double x, double y, double w, double h ) static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L) --- 211,214 ---- *************** *** 259,268 **** - wxLuaBindDefine wxlCanObjRect_enums[] = { - { NULL, 0, }, - }; - - int wxlCanObjRect_enumCount = sizeof(wxlCanObjRect_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlCanObjCircle --- 244,247 ---- *************** *** 275,279 **** static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }}; - // wxlCanObjCircle( double x, double y, double r ) static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) --- 254,257 ---- *************** *** 307,316 **** - wxLuaBindDefine wxlCanObjCircle_enums[] = { - { NULL, 0, }, - }; - - int wxlCanObjCircle_enumCount = sizeof(wxlCanObjCircle_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlCanObjScript --- 285,288 ---- *************** *** 323,327 **** static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }}; - // wxlCanObjScript( double x, double y, const wxString& name ) static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L) --- 295,298 ---- *************** *** 355,364 **** - wxLuaBindDefine wxlCanObjScript_enums[] = { - { NULL, 0, }, - }; - - int wxlCanObjScript_enumCount = sizeof(wxlCanObjScript_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlCanObjAddScript --- 326,329 ---- *************** *** 371,375 **** static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }}; - // void SetScript( const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L) --- 336,339 ---- *************** *** 389,393 **** static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }}; - // wxlCanObjAddScript( double x, double y, const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L) --- 353,356 ---- *************** *** 422,431 **** - wxLuaBindDefine wxlCanObjAddScript_enums[] = { - { NULL, 0, }, - }; - - int wxlCanObjAddScript_enumCount = sizeof(wxlCanObjAddScript_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlCan --- 385,388 ---- *************** *** 438,442 **** static int LUACALL wxLua_wxlCan_AddObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCan_AddObject }}; - // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCan_AddObject(lua_State *L) --- 395,398 ---- *************** *** 456,460 **** static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetCmdh }}; - // wxlLuaCanCmd* GetCmdh() static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L) --- 412,415 ---- *************** *** 475,479 **** static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetYaxis }}; - // bool GetYaxis() static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L) --- 430,433 ---- *************** *** 496,500 **** static int LUACALL wxLua_wxlCan_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 4, s_wxluatagArray_wxLua_wxlCan_constructor }}; - // wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) static int LUACALL wxLua_wxlCan_constructor(lua_State *L) --- 450,453 ---- *************** *** 541,550 **** - wxLuaBindDefine wxlCan_enums[] = { - { NULL, 0, }, - }; - - int wxlCan_enumCount = sizeof(wxlCan_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlLuaCanCmd --- 494,497 ---- *************** *** 557,561 **** static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }}; - // void MoveObject( int index, double x, double y ) static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L) --- 504,507 ---- *************** *** 579,583 **** static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }}; - // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) --- 525,528 ---- *************** *** 612,619 **** - wxLuaBindDefine wxlLuaCanCmd_enums[] = { - { NULL, 0, }, - }; - - int wxlLuaCanCmd_enumCount = sizeof(wxlLuaCanCmd_enums)/sizeof(wxLuaBindDefine) - 1; - --- 557,558 ---- Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxluacan_bind.cpp 6 Jun 2007 23:42:53 -0000 1.20 --- wxluacan_bind.cpp 7 Jun 2007 03:21:58 -0000 1.21 *************** *** 97,101 **** return 1; } - static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; --- 97,100 ---- *************** *** 112,116 **** return 1; } - static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; --- 111,114 ---- *************** *** 142,152 **** static wxLuaBindClass classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL ,wxlCan_enums, wxlCan_enumCount, }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &s_wxluatag_wxlCanObj, "wxObject", NULL ,wxlCanObj_enums, wxlCanObj_enumCount, }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj", NULL ,wxlCanObjAddScript_enums, wxlCanObjAddScript_enumCount, }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj", NULL ,wxlCanObjCircle_enums, wxlCanObjCircle_enumCount, }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj", NULL ,wxlCanObjRect_enums, wxlCanObjRect_enumCount, }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL ,wxlCanObjScript_enums, wxlCanObjScript_enumCount, }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL ,wxlLuaCanCmd_enums, wxlLuaCanCmd_enumCount, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 140,150 ---- static wxLuaBindClass classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &s_wxluatag_wxlCanObj, "wxObject", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL ,s_wxluadefineArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxluacan.h 6 Jun 2007 23:42:53 -0000 1.25 --- wxluacan.h 7 Jun 2007 03:21:58 -0000 1.26 *************** *** 60,95 **** extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCan_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObj_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjAddScript_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjCircle_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjRect_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjScript_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlLuaCanCmd_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_enumCount; --- 60,81 ---- |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22306/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: Use dummy wxLuaBindDefine for class member enums if they don't have any Some formatting fixes for the generated bindings Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** xml.cpp 6 Jun 2007 23:43:13 -0000 1.33 --- xml.cpp 7 Jun 2007 03:22:08 -0000 1.34 *************** *** 38,42 **** static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_AddChild[1] = {{ wxLua_wxXmlNode_AddChild, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddChild }}; - // void AddChild(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L) --- 38,41 ---- *************** *** 56,60 **** static int LUACALL wxLua_wxXmlNode_AddProperty1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_AddProperty1[1] = {{ wxLua_wxXmlNode_AddProperty1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddProperty1 }}; - // void AddProperty(wxXmlProperty *prop) static int LUACALL wxLua_wxXmlNode_AddProperty1(lua_State *L) --- 55,58 ---- *************** *** 74,78 **** static int LUACALL wxLua_wxXmlNode_AddProperty(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_AddProperty[1] = {{ wxLua_wxXmlNode_AddProperty, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlNode_AddProperty }}; - // void AddProperty(const wxString& name, const wxString& value) static int LUACALL wxLua_wxXmlNode_AddProperty(lua_State *L) --- 72,75 ---- *************** *** 94,98 **** static int LUACALL wxLua_wxXmlNode_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_Delete[1] = {{ wxLua_wxXmlNode_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_Delete }}; - static int LUACALL wxLua_wxXmlNode_Delete(lua_State *L) { --- 91,94 ---- *************** *** 111,115 **** static int LUACALL wxLua_wxXmlNode_DeleteProperty(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_DeleteProperty[1] = {{ wxLua_wxXmlNode_DeleteProperty, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_DeleteProperty }}; - // bool DeleteProperty(const wxString& name) static int LUACALL wxLua_wxXmlNode_DeleteProperty(lua_State *L) --- 107,110 ---- *************** *** 132,136 **** static int LUACALL wxLua_wxXmlNode_GetChildren(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetChildren[1] = {{ wxLua_wxXmlNode_GetChildren, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetChildren }}; - // wxXmlNode *GetChildren() const static int LUACALL wxLua_wxXmlNode_GetChildren(lua_State *L) --- 127,130 ---- *************** *** 151,155 **** static int LUACALL wxLua_wxXmlNode_GetContent(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetContent[1] = {{ wxLua_wxXmlNode_GetContent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetContent }}; - // wxString GetContent() const static int LUACALL wxLua_wxXmlNode_GetContent(lua_State *L) --- 145,148 ---- *************** *** 170,174 **** static int LUACALL wxLua_wxXmlNode_GetName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetName[1] = {{ wxLua_wxXmlNode_GetName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetName }}; - // wxString GetName() const static int LUACALL wxLua_wxXmlNode_GetName(lua_State *L) --- 163,166 ---- *************** *** 189,193 **** static int LUACALL wxLua_wxXmlNode_GetNext(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetNext[1] = {{ wxLua_wxXmlNode_GetNext, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetNext }}; - // wxXmlNode *GetNext() const static int LUACALL wxLua_wxXmlNode_GetNext(lua_State *L) --- 181,184 ---- *************** *** 208,212 **** static int LUACALL wxLua_wxXmlNode_GetParent(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetParent[1] = {{ wxLua_wxXmlNode_GetParent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetParent }}; - // wxXmlNode *GetParent() const static int LUACALL wxLua_wxXmlNode_GetParent(lua_State *L) --- 199,202 ---- *************** *** 227,231 **** static int LUACALL wxLua_wxXmlNode_GetPropVal1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetPropVal1[1] = {{ wxLua_wxXmlNode_GetPropVal1, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal1 }}; - // wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const static int LUACALL wxLua_wxXmlNode_GetPropVal1(lua_State *L) --- 217,220 ---- *************** *** 251,255 **** static int LUACALL wxLua_wxXmlNode_GetPropVal(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetPropVal[1] = {{ wxLua_wxXmlNode_GetPropVal, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal }}; - // %override wxLua_wxXmlNode_GetPropValPtr // %rename GetPropValPtr bool GetPropVal(const wxString& propName, wxString *value) const; --- 240,243 ---- *************** *** 274,281 **** } static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetProperties[] = { &s_wxluatag_wxXmlNode, NULL }; static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetProperties[1] = {{ wxLua_wxXmlNode_GetProperties, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetProperties }}; - // wxXmlProperty *GetProperties() const static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L) --- 262,269 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetProperties[] = { &s_wxluatag_wxXmlNode, NULL }; static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetProperties[1] = {{ wxLua_wxXmlNode_GetProperties, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetProperties }}; // wxXmlProperty *GetProperties() const static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L) *************** *** 296,300 **** static int LUACALL wxLua_wxXmlNode_GetType(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetType[1] = {{ wxLua_wxXmlNode_GetType, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetType }}; - // wxXmlNodeType GetType() const static int LUACALL wxLua_wxXmlNode_GetType(lua_State *L) --- 284,287 ---- *************** *** 315,319 **** static int LUACALL wxLua_wxXmlNode_HasProp(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_HasProp[1] = {{ wxLua_wxXmlNode_HasProp, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_HasProp }}; - // bool HasProp(const wxString& propName) const static int LUACALL wxLua_wxXmlNode_HasProp(lua_State *L) --- 302,305 ---- *************** *** 336,340 **** static int LUACALL wxLua_wxXmlNode_InsertChild(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_InsertChild[1] = {{ wxLua_wxXmlNode_InsertChild, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlNode_InsertChild }}; - // void InsertChild(wxXmlNode *child, wxXmlNode *before_node) static int LUACALL wxLua_wxXmlNode_InsertChild(lua_State *L) --- 322,325 ---- *************** *** 356,360 **** static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_RemoveChild[1] = {{ wxLua_wxXmlNode_RemoveChild, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_RemoveChild }}; - // bool RemoveChild(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L) --- 341,344 ---- *************** *** 377,381 **** static int LUACALL wxLua_wxXmlNode_SetChildren(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetChildren[1] = {{ wxLua_wxXmlNode_SetChildren, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetChildren }}; - // void SetChildren(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_SetChildren(lua_State *L) --- 361,364 ---- *************** *** 395,399 **** static int LUACALL wxLua_wxXmlNode_SetContent(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetContent[1] = {{ wxLua_wxXmlNode_SetContent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetContent }}; - // void SetContent(const wxString& con) static int LUACALL wxLua_wxXmlNode_SetContent(lua_State *L) --- 378,381 ---- *************** *** 413,417 **** static int LUACALL wxLua_wxXmlNode_SetName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetName[1] = {{ wxLua_wxXmlNode_SetName, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetName }}; - // void SetName(const wxString& name) static int LUACALL wxLua_wxXmlNode_SetName(lua_State *L) --- 395,398 ---- *************** *** 431,435 **** static int LUACALL wxLua_wxXmlNode_SetNext(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetNext[1] = {{ wxLua_wxXmlNode_SetNext, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetNext }}; - // void SetNext(wxXmlNode *next) static int LUACALL wxLua_wxXmlNode_SetNext(lua_State *L) --- 412,415 ---- *************** *** 449,453 **** static int LUACALL wxLua_wxXmlNode_SetParent(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetParent[1] = {{ wxLua_wxXmlNode_SetParent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetParent }}; - // void SetParent(wxXmlNode *parent) static int LUACALL wxLua_wxXmlNode_SetParent(lua_State *L) --- 429,432 ---- *************** *** 467,471 **** static int LUACALL wxLua_wxXmlNode_SetProperties(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetProperties[1] = {{ wxLua_wxXmlNode_SetProperties, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetProperties }}; - // void SetProperties(wxXmlProperty *prop) static int LUACALL wxLua_wxXmlNode_SetProperties(lua_State *L) --- 446,449 ---- *************** *** 485,489 **** static int LUACALL wxLua_wxXmlNode_SetType(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetType[1] = {{ wxLua_wxXmlNode_SetType, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetType }}; - // void SetType(wxXmlNodeType type) static int LUACALL wxLua_wxXmlNode_SetType(lua_State *L) --- 463,466 ---- *************** *** 503,507 **** static int LUACALL wxLua_wxXmlNode_constructor2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_constructor2[1] = {{ wxLua_wxXmlNode_constructor2, WXLUAMETHOD_CONSTRUCTOR, 6, 6, s_wxluatagArray_wxLua_wxXmlNode_constructor2 }}; - // wxXmlNode(wxXmlNode *parent, wxXmlNodeType type, const wxString& name, const wxString& content, wxXmlProperty *props, wxXmlNode *next) static int LUACALL wxLua_wxXmlNode_constructor2(lua_State *L) --- 480,483 ---- *************** *** 535,539 **** static int LUACALL wxLua_wxXmlNode_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_constructor1[1] = {{ wxLua_wxXmlNode_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 3, s_wxluatagArray_wxLua_wxXmlNode_constructor1 }}; - // wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString) static int LUACALL wxLua_wxXmlNode_constructor1(lua_State *L) --- 511,514 ---- *************** *** 562,566 **** static int LUACALL wxLua_wxXmlNode_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_constructor[1] = {{ wxLua_wxXmlNode_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; - // wxXmlNode() static int LUACALL wxLua_wxXmlNode_constructor(lua_State *L) --- 537,540 ---- *************** *** 679,688 **** int wxXmlNode_methodCount = sizeof(wxXmlNode_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxXmlNode_enums[] = { - { NULL, 0, }, - }; - - int wxXmlNode_enumCount = sizeof(wxXmlNode_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 653,656 ---- *************** *** 699,703 **** static int LUACALL wxLua_wxXmlProperty_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_Delete[1] = {{ wxLua_wxXmlProperty_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_Delete }}; - static int LUACALL wxLua_wxXmlProperty_Delete(lua_State *L) { --- 667,670 ---- *************** *** 716,720 **** static int LUACALL wxLua_wxXmlProperty_GetName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_GetName[1] = {{ wxLua_wxXmlProperty_GetName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_GetName }}; - // wxString GetName() static int LUACALL wxLua_wxXmlProperty_GetName(lua_State *L) --- 683,686 ---- *************** *** 735,739 **** static int LUACALL wxLua_wxXmlProperty_GetNext(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_GetNext[1] = {{ wxLua_wxXmlProperty_GetNext, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_GetNext }}; - // wxXmlProperty *GetNext() static int LUACALL wxLua_wxXmlProperty_GetNext(lua_State *L) --- 701,704 ---- *************** *** 754,758 **** static int LUACALL wxLua_wxXmlProperty_GetValue(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_GetValue[1] = {{ wxLua_wxXmlProperty_GetValue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_GetValue }}; - // wxString GetValue() static int LUACALL wxLua_wxXmlProperty_GetValue(lua_State *L) --- 719,722 ---- *************** *** 773,777 **** static int LUACALL wxLua_wxXmlProperty_SetName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_SetName[1] = {{ wxLua_wxXmlProperty_SetName, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlProperty_SetName }}; - // void SetName(const wxString& name) static int LUACALL wxLua_wxXmlProperty_SetName(lua_State *L) --- 737,740 ---- *************** *** 791,795 **** static int LUACALL wxLua_wxXmlProperty_SetNext(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_SetNext[1] = {{ wxLua_wxXmlProperty_SetNext, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlProperty_SetNext }}; - // void SetNext(wxXmlProperty *next) static int LUACALL wxLua_wxXmlProperty_SetNext(lua_State *L) --- 754,757 ---- *************** *** 809,813 **** static int LUACALL wxLua_wxXmlProperty_SetValue(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_SetValue[1] = {{ wxLua_wxXmlProperty_SetValue, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlProperty_SetValue }}; - // void SetValue(const wxString& value) static int LUACALL wxLua_wxXmlProperty_SetValue(lua_State *L) --- 771,774 ---- *************** *** 827,831 **** static int LUACALL wxLua_wxXmlProperty_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_constructor1[1] = {{ wxLua_wxXmlProperty_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxXmlProperty_constructor1 }}; - // wxXmlProperty(const wxString& name, const wxString& value, wxXmlProperty *next) static int LUACALL wxLua_wxXmlProperty_constructor1(lua_State *L) --- 788,791 ---- *************** *** 852,856 **** static int LUACALL wxLua_wxXmlProperty_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_constructor[1] = {{ wxLua_wxXmlProperty_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; - // wxXmlProperty() static int LUACALL wxLua_wxXmlProperty_constructor(lua_State *L) --- 812,815 ---- *************** *** 911,920 **** int wxXmlProperty_methodCount = sizeof(wxXmlProperty_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxXmlProperty_enums[] = { - { NULL, 0, }, - }; - - int wxXmlProperty_enumCount = sizeof(wxXmlProperty_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 870,873 ---- *************** *** 931,935 **** static int LUACALL wxLua_wxXmlDocument_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_Delete[1] = {{ wxLua_wxXmlDocument_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_Delete }}; - static int LUACALL wxLua_wxXmlDocument_Delete(lua_State *L) { --- 884,887 ---- *************** *** 948,952 **** static int LUACALL wxLua_wxXmlDocument_GetFileEncoding(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_GetFileEncoding[1] = {{ wxLua_wxXmlDocument_GetFileEncoding, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_GetFileEncoding }}; - // wxString GetFileEncoding() const; static int LUACALL wxLua_wxXmlDocument_GetFileEncoding(lua_State *L) --- 900,903 ---- *************** *** 967,971 **** static int LUACALL wxLua_wxXmlDocument_GetRoot(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_GetRoot[1] = {{ wxLua_wxXmlDocument_GetRoot, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_GetRoot }}; - // wxXmlNode *GetRoot() const; static int LUACALL wxLua_wxXmlDocument_GetRoot(lua_State *L) --- 918,921 ---- *************** *** 986,990 **** static int LUACALL wxLua_wxXmlDocument_GetVersion(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_GetVersion[1] = {{ wxLua_wxXmlDocument_GetVersion, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_GetVersion }}; - // wxString GetVersion() const; static int LUACALL wxLua_wxXmlDocument_GetVersion(lua_State *L) --- 936,939 ---- *************** *** 1005,1009 **** static int LUACALL wxLua_wxXmlDocument_IsOk(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_IsOk[1] = {{ wxLua_wxXmlDocument_IsOk, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_IsOk }}; - // bool IsOk() const; static int LUACALL wxLua_wxXmlDocument_IsOk(lua_State *L) --- 954,957 ---- *************** *** 1024,1028 **** static int LUACALL wxLua_wxXmlDocument_Load(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_Load[1] = {{ wxLua_wxXmlDocument_Load, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxXmlDocument_Load }}; - // bool Load(const wxString& filename, const wxString& encoding = "UTF-8"); static int LUACALL wxLua_wxXmlDocument_Load(lua_State *L) --- 972,975 ---- *************** *** 1049,1053 **** static int LUACALL wxLua_wxXmlDocument_Save(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_Save[1] = {{ wxLua_wxXmlDocument_Save, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlDocument_Save }}; - // bool Save(const wxString& filename) const; static int LUACALL wxLua_wxXmlDocument_Save(lua_State *L) --- 996,999 ---- *************** *** 1070,1074 **** static int LUACALL wxLua_wxXmlDocument_SetFileEncoding(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_SetFileEncoding[1] = {{ wxLua_wxXmlDocument_SetFileEncoding, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlDocument_SetFileEncoding }}; - // void SetFileEncoding(const wxString& encoding); static int LUACALL wxLua_wxXmlDocument_SetFileEncoding(lua_State *L) --- 1016,1019 ---- *************** *** 1088,1092 **** static int LUACALL wxLua_wxXmlDocument_SetRoot(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_SetRoot[1] = {{ wxLua_wxXmlDocument_SetRoot, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlDocument_SetRoot }}; - // void SetRoot(wxXmlNode *node); static int LUACALL wxLua_wxXmlDocument_SetRoot(lua_State *L) --- 1033,1036 ---- *************** *** 1106,1110 **** static int LUACALL wxLua_wxXmlDocument_SetVersion(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_SetVersion[1] = {{ wxLua_wxXmlDocument_SetVersion, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlDocument_SetVersion }}; - // void SetVersion(const wxString& version); static int LUACALL wxLua_wxXmlDocument_SetVersion(lua_State *L) --- 1050,1053 ---- *************** *** 1124,1128 **** static int LUACALL wxLua_wxXmlDocument_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_constructor1[1] = {{ wxLua_wxXmlDocument_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxXmlDocument_constructor1 }}; - // wxXmlDocument(const wxString& filename, const wxString& encoding = "UTF-8"); static int LUACALL wxLua_wxXmlDocument_constructor1(lua_State *L) --- 1067,1070 ---- *************** *** 1149,1153 **** static int LUACALL wxLua_wxXmlDocument_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_constructor[1] = {{ wxLua_wxXmlDocument_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; - // wxXmlDocument(); static int LUACALL wxLua_wxXmlDocument_constructor(lua_State *L) --- 1091,1094 ---- *************** *** 1211,1220 **** int wxXmlDocument_methodCount = sizeof(wxXmlDocument_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxXmlDocument_enums[] = { - { NULL, 0, }, - }; - - int wxXmlDocument_enumCount = sizeof(wxXmlDocument_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 1152,1155 ---- *************** *** 1231,1235 **** static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_AttachUnknownControl[1] = {{ wxLua_wxXmlResource_AttachUnknownControl, WXLUAMETHOD_METHOD, 3, 4, s_wxluatagArray_wxLua_wxXmlResource_AttachUnknownControl }}; - // bool AttachUnknownControl(const wxString& name, wxWindow* control, wxWindow* parent = NULL); static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L) --- 1166,1169 ---- *************** *** 1258,1262 **** static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_ClearHandlers[1] = {{ wxLua_wxXmlResource_ClearHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_ClearHandlers }}; - // void ClearHandlers(); static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L) --- 1192,1195 ---- *************** *** 1274,1278 **** static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_CompareVersion[1] = {{ wxLua_wxXmlResource_CompareVersion, WXLUAMETHOD_METHOD, 5, 5, s_wxluatagArray_wxLua_wxXmlResource_CompareVersion }}; - // int CompareVersion(int major, int minor, int release, int revision) const; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L) --- 1207,1210 ---- *************** *** 1303,1307 **** static int LUACALL wxLua_wxXmlResource_CreateDialog(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_CreateDialog[1] = {{ wxLua_wxXmlResource_CreateDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_CreateDialog }}; - // %override wxLua_wxXmlResource_CreateDialog // wxFrame* CreateFrame(wxWindow* parent, const wxString& name) --- 1235,1238 ---- *************** *** 1329,1332 **** --- 1260,1264 ---- } + #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXMLResource && wxUSE_XML) *************** *** 1335,1339 **** static int LUACALL wxLua_wxXmlResource_CreateFrame(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_CreateFrame[1] = {{ wxLua_wxXmlResource_CreateFrame, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_CreateFrame }}; - // %override wxLua_wxXmlResource_CreateFrame // wxFrame* CreateFrame(wxWindow* parent, const wxString& name) --- 1267,1270 ---- *************** *** 1361,1364 **** --- 1292,1296 ---- } + #endif // (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXMLResource && wxUSE_XML) *************** *** 1366,1370 **** static int LUACALL wxLua_wxXmlResource_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Delete[1] = {{ wxLua_wxXmlResource_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Delete }}; - static int LUACALL wxLua_wxXmlResource_Delete(lua_State *L) { --- 1298,1301 ---- *************** *** 1383,1387 **** static int LUACALL wxLua_wxXmlResource_Get(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Get[1] = {{ wxLua_wxXmlResource_Get, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Get }}; - // %override wxLua_wxXmlResource_Get // wxXmlResource* Get() --- 1314,1317 ---- *************** *** 1398,1405 **** } static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetFlags[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetFlags[1] = {{ wxLua_wxXmlResource_GetFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_GetFlags }}; - // int GetFlags() static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) --- 1328,1335 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetFlags[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetFlags[1] = {{ wxLua_wxXmlResource_GetFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_GetFlags }}; // int GetFlags() static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) *************** *** 1420,1424 **** static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetVersion[1] = {{ wxLua_wxXmlResource_GetVersion, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_GetVersion }}; - // long GetVersion() const; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L) --- 1350,1353 ---- *************** *** 1439,1443 **** static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetXRCID[1] = {{ wxLua_wxXmlResource_GetXRCID, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_GetXRCID }}; - // %override wxLua_wxXmlResource_GetXRCID // int GetXRCID(const wxString &stringID) --- 1368,1371 ---- *************** *** 1456,1463 **** } static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_InitAllHandlers[1] = {{ wxLua_wxXmlResource_InitAllHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers }}; - // void InitAllHandlers(); static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L) --- 1384,1391 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_InitAllHandlers[1] = {{ wxLua_wxXmlResource_InitAllHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers }}; // void InitAllHandlers(); static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L) *************** *** 1475,1479 **** static int LUACALL wxLua_wxXmlResource_Load(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Load[1] = {{ wxLua_wxXmlResource_Load, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_Load }}; - // bool Load(const wxString& filemask); static int LUACALL wxLua_wxXmlResource_Load(lua_State *L) --- 1403,1406 ---- *************** *** 1498,1502 **** static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadBitmap[1] = {{ wxLua_wxXmlResource_LoadBitmap, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap }}; - // wxBitmap LoadBitmap(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L) --- 1425,1428 ---- *************** *** 1525,1529 **** static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog1[1] = {{ wxLua_wxXmlResource_LoadDialog1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog1 }}; - // bool LoadDialog(wxDialog* dlg, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L) --- 1451,1454 ---- *************** *** 1550,1554 **** static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog[1] = {{ wxLua_wxXmlResource_LoadDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog }}; - // wxDialog* LoadDialog(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L) --- 1475,1478 ---- *************** *** 1576,1580 **** static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadFrame[1] = {{ wxLua_wxXmlResource_LoadFrame, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadFrame }}; - // bool LoadFrame(wxFrame* frame, wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L) --- 1500,1503 ---- *************** *** 1604,1608 **** static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadIcon[1] = {{ wxLua_wxXmlResource_LoadIcon, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadIcon }}; - // wxIcon LoadIcon(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L) --- 1527,1530 ---- *************** *** 1631,1635 **** static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenu[1] = {{ wxLua_wxXmlResource_LoadMenu, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenu }}; - // wxMenu* LoadMenu(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L) --- 1553,1556 ---- *************** *** 1652,1656 **** static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar1[1] = {{ wxLua_wxXmlResource_LoadMenuBar1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar1 }}; - // wxMenuBar* LoadMenuBar(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L) --- 1573,1576 ---- *************** *** 1673,1677 **** static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar[1] = {{ wxLua_wxXmlResource_LoadMenuBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar }}; - // wxMenuBar* LoadMenuBar(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L) --- 1593,1596 ---- *************** *** 1698,1702 **** static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel1[1] = {{ wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel1 }}; - // bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L) --- 1617,1620 ---- *************** *** 1723,1727 **** static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel[1] = {{ wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel }}; - // wxPanel* LoadPanel(wxWindow* parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L) --- 1641,1644 ---- *************** *** 1748,1752 **** static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadToolBar[1] = {{ wxLua_wxXmlResource_LoadToolBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar }}; - // wxToolBar* LoadToolBar(wxWindow *parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L) --- 1665,1668 ---- *************** *** 1773,1777 **** static int LUACALL wxLua_wxXmlResource_Set(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Set[1] = {{ wxLua_wxXmlResource_Set, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_Set }}; - // %override wxLua_wxXmlResource_Set // wxXmlResource* Set(wxXmlResource *res) --- 1689,1692 ---- *************** *** 1790,1797 **** } static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_SetFlags[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetFlags[1] = {{ wxLua_wxXmlResource_SetFlags, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_SetFlags }}; - // void SetFlags(int flags); static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L) --- 1705,1712 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_SetFlags[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetFlags[1] = {{ wxLua_wxXmlResource_SetFlags, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_SetFlags }}; // void SetFlags(int flags); static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L) *************** *** 1811,1815 **** static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Unload[1] = {{ wxLua_wxXmlResource_Unload, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_Unload }}; - // bool Unload(const wxString& filename) static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L) --- 1726,1729 ---- *************** *** 1832,1836 **** static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor1[1] = {{ wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxXmlResource_constructor1 }}; - // wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE); static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L) --- 1746,1749 ---- *************** *** 1858,1862 **** static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor[1] = {{ wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxXmlResource_constructor }}; - // wxXmlResource(int flags = wxXRC_USE_LOCALE); static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L) --- 1771,1774 ---- *************** *** 2038,2047 **** int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxXmlResource_enums[] = { - { NULL, 0, }, - }; - - int wxXmlResource_enumCount = sizeof(wxXmlResource_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 1950,1953 ---- Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** defsutil.cpp 6 Jun 2007 23:43:00 -0000 1.35 --- defsutil.cpp 7 Jun 2007 03:22:01 -0000 1.36 *************** *** 39,43 **** static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_CloseOutput[1] = {{ wxLua_wxProcess_CloseOutput, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_CloseOutput }}; - // void CloseOutput() static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L) --- 39,42 ---- *************** *** 57,61 **** static int LUACALL wxLua_wxProcess_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_Delete[1] = {{ wxLua_wxProcess_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_Delete }}; - static int LUACALL wxLua_wxProcess_Delete(lua_State *L) { --- 56,59 ---- *************** *** 74,78 **** static int LUACALL wxLua_wxProcess_Detach(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_Detach[1] = {{ wxLua_wxProcess_Detach, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_Detach }}; - // void Detach() static int LUACALL wxLua_wxProcess_Detach(lua_State *L) --- 72,75 ---- *************** *** 90,94 **** static int LUACALL wxLua_wxProcess_Exists(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_Exists[1] = {{ wxLua_wxProcess_Exists, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatagArray_wxLua_wxProcess_Exists }}; - // static bool Exists(int pid) static int LUACALL wxLua_wxProcess_Exists(lua_State *L) --- 87,90 ---- *************** *** 110,114 **** static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_GetErrorStream[1] = {{ wxLua_wxProcess_GetErrorStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetErrorStream }}; - // wxInputStream *GetErrorStream() const static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L) --- 106,109 ---- *************** *** 129,133 **** static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_GetInputStream[1] = {{ wxLua_wxProcess_GetInputStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetInputStream }}; - // wxInputStream *GetInputStream() const static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L) --- 124,127 ---- *************** *** 148,152 **** static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_GetOutputStream[1] = {{ wxLua_wxProcess_GetOutputStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetOutputStream }}; - // wxOutputStream *GetOutputStream() const static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L) --- 142,145 ---- *************** *** 170,174 **** static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_IsErrorAvailable[1] = {{ wxLua_wxProcess_IsErrorAvailable, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsErrorAvailable }}; - // bool IsErrorAvailable() const static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L) --- 163,166 ---- *************** *** 189,193 **** static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_IsInputAvailable[1] = {{ wxLua_wxProcess_IsInputAvailable, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsInputAvailable }}; - // bool IsInputAvailable() const static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L) --- 181,184 ---- *************** *** 208,212 **** static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_IsInputOpened[1] = {{ wxLua_wxProcess_IsInputOpened, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsInputOpened }}; - // bool IsInputOpened() const static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L) --- 199,202 ---- *************** *** 229,233 **** static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_IsRedirected[1] = {{ wxLua_wxProcess_IsRedirected, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsRedirected }}; - // bool IsRedirected() static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L) --- 219,222 ---- *************** *** 248,252 **** static int LUACALL wxLua_wxProcess_Kill(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_Kill[1] = {{ wxLua_wxProcess_Kill, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 3, s_wxluatagArray_wxLua_wxProcess_Kill }}; - // static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN) static int LUACALL wxLua_wxProcess_Kill(lua_State *L) --- 237,240 ---- *************** *** 272,276 **** static int LUACALL wxLua_wxProcess_Open(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_Open[1] = {{ wxLua_wxProcess_Open, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxProcess_Open }}; - // static wxProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC) static int LUACALL wxLua_wxProcess_Open(lua_State *L) --- 260,263 ---- *************** *** 295,299 **** static int LUACALL wxLua_wxProcess_Redirect(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_Redirect[1] = {{ wxLua_wxProcess_Redirect, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_Redirect }}; - // void Redirect() static int LUACALL wxLua_wxProcess_Redirect(lua_State *L) --- 282,285 ---- *************** *** 313,317 **** static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_SetPipeStreams[1] = {{ wxLua_wxProcess_SetPipeStreams, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxProcess_SetPipeStreams }}; - // void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream) static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L) --- 299,302 ---- *************** *** 337,341 **** static int LUACALL wxLua_wxProcess_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_constructor[1] = {{ wxLua_wxProcess_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxProcess_constructor }}; - // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) static int LUACALL wxLua_wxProcess_constructor(lua_State *L) --- 322,325 ---- *************** *** 401,410 **** int wxProcess_methodCount = sizeof(wxProcess_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxProcess_enums[] = { - { NULL, 0, }, - }; - - int wxProcess_enumCount = sizeof(wxProcess_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxProcess --- 385,388 ---- *************** *** 421,425 **** static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_AltDown[1] = {{ wxLua_wxMouseState_AltDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_AltDown }}; - // bool AltDown() static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L) --- 399,402 ---- *************** *** 440,444 **** static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_CmdDown[1] = {{ wxLua_wxMouseState_CmdDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_CmdDown }}; - // bool CmdDown() static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L) --- 417,420 ---- *************** *** 459,463 **** static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_ControlDown[1] = {{ wxLua_wxMouseState_ControlDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_ControlDown }}; - // bool ControlDown() static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L) --- 435,438 ---- *************** *** 478,482 **** static int LUACALL wxLua_wxMouseState_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_Delete[1] = {{ wxLua_wxMouseState_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_Delete }}; - static int LUACALL wxLua_wxMouseState_Delete(lua_State *L) { --- 453,456 ---- *************** *** 495,499 **** static int LUACALL wxLua_wxMouseState_GetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_GetX[1] = {{ wxLua_wxMouseState_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_GetX }}; - // wxCoord GetX() static int LUACALL wxLua_wxMouseState_GetX(lua_State *L) --- 469,472 ---- *************** *** 514,518 **** static int LUACALL wxLua_wxMouseState_GetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_GetY[1] = {{ wxLua_wxMouseState_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_GetY }}; - // wxCoord GetY() static int LUACALL wxLua_wxMouseState_GetY(lua_State *L) --- 487,490 ---- *************** *** 533,537 **** static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_LeftDown[1] = {{ wxLua_wxMouseState_LeftDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_LeftDown }}; - // bool LeftDown() static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L) --- 505,508 ---- *************** *** 552,556 **** static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_MetaDown[1] = {{ wxLua_wxMouseState_MetaDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_MetaDown }}; - // bool MetaDown() static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L) --- 523,526 ---- *************** *** 571,575 **** static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_MiddleDown[1] = {{ wxLua_wxMouseState_MiddleDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_MiddleDown }}; - // bool MiddleDown() static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L) --- 541,544 ---- *************** *** 590,594 **** static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_RightDown[1] = {{ wxLua_wxMouseState_RightDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_RightDown }}; - // bool RightDown() static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L) --- 559,562 ---- *************** *** 609,613 **** static int LUACALL wxLua_wxMouseState_SetAltDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetAltDown[1] = {{ wxLua_wxMouseState_SetAltDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetAltDown }}; - // void SetAltDown(bool down) static int LUACALL wxLua_wxMouseState_SetAltDown(lua_State *L) --- 577,580 ---- *************** *** 627,631 **** static int LUACALL wxLua_wxMouseState_SetControlDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetControlDown[1] = {{ wxLua_wxMouseState_SetControlDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetControlDown }}; - // void SetControlDown(bool down) static int LUACALL wxLua_wxMouseState_SetControlDown(lua_State *L) --- 594,597 ---- *************** *** 645,649 **** static int LUACALL wxLua_wxMouseState_SetLeftDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetLeftDown[1] = {{ wxLua_wxMouseState_SetLeftDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetLeftDown }}; - // void SetLeftDown(bool down) static int LUACALL wxLua_wxMouseState_SetLeftDown(lua_State *L) --- 611,614 ---- *************** *** 663,667 **** static int LUACALL wxLua_wxMouseState_SetMetaDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetMetaDown[1] = {{ wxLua_wxMouseState_SetMetaDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetMetaDown }}; - // void SetMetaDown(bool down) static int LUACALL wxLua_wxMouseState_SetMetaDown(lua_State *L) --- 628,631 ---- *************** *** 681,685 **** static int LUACALL wxLua_wxMouseState_SetMiddleDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetMiddleDown[1] = {{ wxLua_wxMouseState_SetMiddleDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown }}; - // void SetMiddleDown(bool down) static int LUACALL wxLua_wxMouseState_SetMiddleDown(lua_State *L) --- 645,648 ---- *************** *** 699,703 **** static int LUACALL wxLua_wxMouseState_SetRightDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetRightDown[1] = {{ wxLua_wxMouseState_SetRightDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetRightDown }}; - // void SetRightDown(bool down) static int LUACALL wxLua_wxMouseState_SetRightDown(lua_State *L) --- 662,665 ---- *************** *** 717,721 **** static int LUACALL wxLua_wxMouseState_SetShiftDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetShiftDown[1] = {{ wxLua_wxMouseState_SetShiftDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetShiftDown }}; - // void SetShiftDown(bool down) static int LUACALL wxLua_wxMouseState_SetShiftDown(lua_State *L) --- 679,682 ---- *************** *** 735,739 **** static int LUACALL wxLua_wxMouseState_SetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetX[1] = {{ wxLua_wxMouseState_SetX, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetX }}; - // void SetX(wxCoord x) static int LUACALL wxLua_wxMouseState_SetX(lua_State *L) --- 696,699 ---- *************** *** 753,757 **** static int LUACALL wxLua_wxMouseState_SetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetY[1] = {{ wxLua_wxMouseState_SetY, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetY }}; - // void SetY(wxCoord y) static int LUACALL wxLua_wxMouseState_SetY(lua_State *L) --- 713,716 ---- *************** *** 771,775 **** static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_ShiftDown[1] = {{ wxLua_wxMouseState_ShiftDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_ShiftDown }}; - // bool ShiftDown() static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L) --- 730,733 ---- *************** *** 789,793 **** static int LUACALL wxLua_wxMouseState_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_constructor[1] = {{ wxLua_wxMouseState_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; - // wxMouseState() static int LUACALL wxLua_wxMouseState_constructor(lua_State *L) --- 747,750 ---- *************** *** 838,847 **** int wxMouseState_methodCount = sizeof(wxMouseState_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxMouseState_enums[] = { - { NULL, 0, }, - }; - - int wxMouseState_enumCount = sizeof(wxMouseState_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxCHECK_VERSION(2,7,0) --- 795,798 ---- *************** *** 858,862 **** static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxBusyCursor_Delete[1] = {{ wxLua_wxBusyCursor_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxBusyCursor_Delete }}; - static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L) { --- 809,812 ---- *************** *** 877,881 **** static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxBusyCursor_constructor[1] = {{ wxLua_wxBusyCursor_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxBusyCursor_constructor }}; - // %override wxLua_wxBusyCursor_constructor // wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) --- 827,830 ---- *************** *** 901,904 **** --- 850,854 ---- } + #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) *************** *** 918,927 **** int wxBusyCursor_methodCount = sizeof(wxBusyCursor_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxBusyCursor_enums[] = { - { NULL, 0, }, - }; - - int wxBusyCursor_enumCount = sizeof(wxBusyCursor_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxBusyCursor --- 868,871 ---- *************** *** 938,942 **** static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxBusyInfo_Delete[1] = {{ wxLua_wxBusyInfo_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxBusyInfo_Delete }}; - static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L) { --- 882,885 ---- *************** *** 955,959 **** static int LUACALL wxLua_wxBusyInfo_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxBusyInfo_constructor[1] = {{ wxLua_wxBusyInfo_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxBusyInfo_constructor }}; - // wxBusyInfo(const wxString& message, wxWindow *parent = NULL) static int LUACALL wxLua_wxBusyInfo_constructor(lua_State *L) --- 898,901 ---- *************** *** 991,1000 **** int wxBusyInfo_methodCount = sizeof(wxBusyInfo_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxBusyInfo_enums[] = { - { NULL, 0, }, - }; - - int wxBusyInfo_enumCount = sizeof(wxBusyInfo_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO --- 933,936 ---- Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxlua.cpp 6 Jun 2007 23:43:13 -0000 1.37 --- wxlua.cpp 7 Jun 2007 03:22:08 -0000 1.38 *************** *** 36,40 **** static int LUACALL wxLua_wxLuaState_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaState_Delete[1] = {{ wxLua_wxLuaState_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaState_Delete }}; - static int LUACALL wxLua_wxLuaState_Delete(lua_State *L) { --- 36,39 ---- *************** *** 61,70 **** - wxLuaBindDefine wxLuaState_enums[] = { - { NULL, 0, }, - }; - - int wxLuaState_enumCount = sizeof(wxLuaState_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxLuaObject --- 60,63 ---- *************** *** 77,81 **** static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_Delete[1] = {{ wxLua_wxLuaObject_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_Delete }}; - static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L) { --- 70,73 ---- *************** *** 94,98 **** static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags[1] = {{ wxLua_wxLuaObject_GetAllocationFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags }}; - // int GetAllocationFlags() const static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L) --- 86,89 ---- *************** *** 113,117 **** static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetObject }}; - // %override wxLua_wxLuaObject_GetObject // void *GetObject() const --- 104,107 ---- *************** *** 127,134 **** } static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enum, NULL }; static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }}; - // bool HasAllocationFlag(wxLuaObject_Type flag) static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L) --- 117,124 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enum, NULL }; static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }}; // bool HasAllocationFlag(wxLuaObject_Type flag) static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L) *************** *** 151,155 **** static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag[1] = {{ wxLua_wxLuaObject_SetAllocationFlag, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }}; - // int SetAllocationFlag(wxLuaObject_Type flag, bool set) static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L) --- 141,144 ---- *************** *** 174,178 **** static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxLuaObject_SetObject }}; - // %override wxLua_wxLuaObject_SetObject // void SetObject(void *object) --- 163,166 ---- *************** *** 188,194 **** } static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; - // %override wxLua_wxLuaObject_constructor // wxLuaObject(void *object) --- 176,182 ---- } + static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxLuaObject_constructor // wxLuaObject(void *object) *************** *** 210,213 **** --- 198,202 ---- + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxLuaObject_methods[] = { *************** *** 225,234 **** - wxLuaBindDefine wxLuaObject_enums[] = { - { NULL, 0, }, - }; - - int wxLuaObject_enumCount = sizeof(wxLuaObject_enums)/sizeof(wxLuaBindDefine) - 1; - #if wxLUA_USE_wxLuaPrintout --- 214,217 ---- *************** *** 243,247 **** static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaPrintout_Delete[1] = {{ wxLua_wxLuaPrintout_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaPrintout_Delete }}; - static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L) { --- 226,229 ---- *************** *** 260,264 **** static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaPrintout_GetID[1] = {{ wxLua_wxLuaPrintout_GetID, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaPrintout_GetID }}; - // wxLuaObject *GetID() static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L) --- 242,245 ---- *************** *** 279,283 **** static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo[1] = {{ wxLua_wxLuaPrintout_SetPageInfo, WXLUAMETHOD_METHOD, 3, 5, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }}; - // void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0) static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L) --- 260,263 ---- *************** *** 305,309 **** static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L); st... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-06-07 03:35:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22306/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Use dummy wxLuaBindDefine for class member enums if they don't have any Some formatting fixes for the generated bindings Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** wxbind.h 6 Jun 2007 23:42:58 -0000 1.67 --- wxbind.h 7 Jun 2007 03:21:59 -0000 1.68 *************** *** 687,692 **** extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxExtHelpController_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxExtHelpController_methodCount; - extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxExtHelpController_enums[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxExtHelpController_enumCount; #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) --- 687,690 ---- *************** *** 695,700 **** extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxToolBarSimple_methods[]; [...2592 lines suppressed...] - extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxWizard_enums[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizard_enumCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardEvent; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxWizardEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardEvent_methodCount; - extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxWizardEvent_enums[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardEvent_enumCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPage; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxWizardPage_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPage_methodCount; - extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxWizardPage_enums[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPage_enumCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPageSimple; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxWizardPageSimple_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPageSimple_methodCount; - extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxWizardPageSimple_enums[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPageSimple_enumCount; #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard --- 2393,2405 ---- |
|
From: John L. <jr...@us...> - 2007-06-07 03:35:39
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22306/wxLua/bindings Modified Files: genwxbind.lua Log Message: Use dummy wxLuaBindDefine for class member enums if they don't have any Some formatting fixes for the generated bindings Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** genwxbind.lua 6 Jun 2007 23:42:53 -0000 1.114 --- genwxbind.lua 7 Jun 2007 03:21:59 -0000 1.115 *************** *** 2757,2761 **** CommentBindingTable(codeList, " // return the number of values\n") table.insert(codeList, " return 1;\n") ! table.insert(codeList, "}\n\n") local overload_argListName = "s_wxluatagArray_".. funcName --- 2757,2761 ---- CommentBindingTable(codeList, " // return the number of values\n") table.insert(codeList, " return 1;\n") ! table.insert(codeList, "}\n") local overload_argListName = "s_wxluatagArray_".. funcName *************** *** 2846,2850 **** CommentBindingTable(codeList, " // return the number of values\n") table.insert(codeList, " return 0;\n") ! table.insert(codeList, "}\n\n") local overload_argListName = "s_wxluatagArray_".. funcName --- 2846,2850 ---- CommentBindingTable(codeList, " // return the number of values\n") table.insert(codeList, " return 0;\n") ! table.insert(codeList, "}\n") local overload_argListName = "s_wxluatagArray_".. funcName *************** *** 3464,3468 **** table.insert(codeList, "\n return 1;\n") ! table.insert(codeList, "}\n\n") else -- how we call c-function --- 3464,3468 ---- table.insert(codeList, "\n return 1;\n") ! table.insert(codeList, "}\n") else -- how we call c-function *************** *** 3513,3517 **** table.insert(codeList, " "..functor..";\n") table.insert(codeList, "\n return 0;\n") ! table.insert(codeList, "}\n\n") else -- call function, get return value --- 3513,3517 ---- table.insert(codeList, " "..functor..";\n") table.insert(codeList, "\n return 0;\n") ! table.insert(codeList, "}\n") else -- call function, get return value *************** *** 3563,3567 **** table.insert(codeList, "\n return 1;\n") ! table.insert(codeList, "}\n\n") end end --- 3563,3567 ---- table.insert(codeList, "\n return 1;\n") ! table.insert(codeList, "}\n") end end *************** *** 3617,3620 **** --- 3617,3621 ---- FuncMapName = funcMapName, Map = methodMap, + NotOverload = member.NotOverload, Condition = methodcondition, PreDefineCode = nil, -- set later if necessary *************** *** 3649,3652 **** --- 3650,3667 ---- end + -- Figure out if we really need to have member enums for the class + local enumArrayName = MakeVar(parseObject.Name).."_enums" + local enumArrayCountName = MakeVar(parseObject.Name).."_enumCount" + local ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindDefine "..enumArrayName.."[];\n" + local ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..enumArrayCountName..";\n" + + if enumClassBindingTable[MakeVar(parseObject.Name)] == nil then + enumArrayName = "s_wxluadefineArray_None" + enumArrayCountName = 0 + ExternEnumDeclaration = "" + ExternEnumCountDeclaration = "" + end + + -- Extern Class Tag Declaration local tagcondition = FixCondition(parseObject.Condition) *************** *** 3656,3661 **** ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", ! ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindDefine "..MakeVar(parseObject.Name).."_enums[];\n", ! ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_enumCount;\n", Condition = tagcondition } --- 3671,3676 ---- ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", ! ExternEnumDeclaration = ExternEnumDeclaration, ! ExternEnumCountDeclaration = ExternEnumCountDeclaration, Condition = tagcondition } *************** *** 3699,3703 **** table.insert(codeList, " }\n") table.insert(codeList, " return 0;\n") ! table.insert(codeList, "}\n\n") local funcMapName = "s_wxluafunc_"..funcName --- 3714,3718 ---- table.insert(codeList, " }\n") table.insert(codeList, " return 0;\n") ! table.insert(codeList, "}\n") local funcMapName = "s_wxluafunc_"..funcName *************** *** 3738,3743 **** ..MakeVar(baseclass)..", " .."NULL ," ! ..MakeVar(parseObject.Name).."_enums, " ! ..MakeVar(parseObject.Name).."_enumCount, " .."}, \n", Condition = classcondition --- 3753,3758 ---- ..MakeVar(baseclass)..", " .."NULL ," ! ..enumArrayName..", " ! ..enumArrayCountName..", " .."}, \n", Condition = classcondition *************** *** 3942,3947 **** table.insert(fileData, indent..classTagBinding.ExternMethodDeclaration) table.insert(fileData, indent..classTagBinding.ExternMethodCountDeclaration) ! table.insert(fileData, indent..classTagBinding.ExternEnumDeclaration) ! table.insert(fileData, indent..classTagBinding.ExternEnumCountDeclaration) end --- 3957,3964 ---- table.insert(fileData, indent..classTagBinding.ExternMethodDeclaration) table.insert(fileData, indent..classTagBinding.ExternMethodCountDeclaration) ! if string.len(classTagBinding.ExternEnumCountDeclaration) > 0 then ! table.insert(fileData, indent..classTagBinding.ExternEnumDeclaration) ! table.insert(fileData, indent..classTagBinding.ExternEnumCountDeclaration) ! end end *************** *** 4362,4369 **** --- 4379,4392 ---- local funcType = methodBindings[1].FuncType + local not_overload = 0 + for i = 1, #methodBindings do if methodBindings[i].Method then -- ignore properties overload_count = overload_count + 1 + if methodBindings[i].NotOverload == true then + not_overload = not_overload + 1 + end + if methodBindings[i].ParamCount and (paramCount < methodBindings[i].ParamCount) then paramCount = methodBindings[i].ParamCount *************** *** 4381,4385 **** end ! if overload_count > 1 then --print(n, #methodBindings, methodBindings[1].Map) --- 4404,4408 ---- end ! if (overload_count > 1) and (not_overload < overload_count) then --print(n, #methodBindings, methodBindings[1].Map) *************** *** 4579,4586 **** if functionBinding.FuncMapName then table.insert(fileData, "static int LUACALL "..functionBinding.CFunctionName.."(lua_State *L);\n") ! table.insert(fileData, "static wxLuaBindCFunc "..functionBinding.FuncMapName.."[1] = {"..functionBinding.FuncMap.."};\n\n") end ! table.insert(fileData, table.concat(functionBinding.Method)) end end --- 4602,4609 ---- if functionBinding.FuncMapName then table.insert(fileData, "static int LUACALL "..functionBinding.CFunctionName.."(lua_State *L);\n") ! table.insert(fileData, "static wxLuaBindCFunc "..functionBinding.FuncMapName.."[1] = {"..functionBinding.FuncMap.."};\n") end ! table.insert(fileData, table.concat(functionBinding.Method).."\n") end end *************** *** 4604,4610 **** GenerateProperties(sortedBindings) - - - -- Output Method Map Table CommentBindingTable(fileData, "// Map Lua Class Methods to C Binding Functions\n") --- 4627,4630 ---- *************** *** 4616,4626 **** -- since there may be conditions count them up afterwards ! table.insert(fileData, "int "..MakeVar(ObjectName).."_methodCount = sizeof("..MakeClassVar(ObjectName).."_methods)/sizeof(wxLuaBindMethod) - 1;\n") ! table.insert(fileData, "\n\n") ! ! ! table.insert(fileData, "wxLuaBindDefine "..MakeClassVar(ObjectName).."_enums[] = {\n") -- FIXME use dummy for empty if enumClassBindingTable[MakeClassVar(ObjectName)] then local namedBindingTable = {} GenerateLuaNameFromIndexedTable(enumClassBindingTable[MakeClassVar(ObjectName)], namedBindingTable) --- 4636,4643 ---- -- since there may be conditions count them up afterwards ! table.insert(fileData, "int "..MakeVar(ObjectName).."_methodCount = sizeof("..MakeClassVar(ObjectName).."_methods)/sizeof(wxLuaBindMethod) - 1;\n\n") if enumClassBindingTable[MakeClassVar(ObjectName)] then + table.insert(fileData, "wxLuaBindDefine "..MakeClassVar(ObjectName).."_enums[] = {\n") local namedBindingTable = {} GenerateLuaNameFromIndexedTable(enumClassBindingTable[MakeClassVar(ObjectName)], namedBindingTable) *************** *** 4628,4637 **** local sortedBindings = TableSort(namedBindingTable) GenerateMap(fileData, sortedBindings) - end table.insert(fileData, " { NULL, 0, },\n") ! table.insert(fileData, "};\n\n") -- since there may be conditions count them up afterwards table.insert(fileData, "int "..MakeVar(ObjectName).."_enumCount = sizeof("..MakeClassVar(ObjectName).."_enums)/sizeof(wxLuaBindDefine) - 1;\n") if object.Condition then --- 4645,4654 ---- local sortedBindings = TableSort(namedBindingTable) GenerateMap(fileData, sortedBindings) table.insert(fileData, " { NULL, 0, },\n") ! table.insert(fileData, "};\n") -- since there may be conditions count them up afterwards table.insert(fileData, "int "..MakeVar(ObjectName).."_enumCount = sizeof("..MakeClassVar(ObjectName).."_enums)/sizeof(wxLuaBindDefine) - 1;\n") + end if object.Condition then |
|
From: John L. <jr...@us...> - 2007-06-07 03:35:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22306/wxLua/modules/wxbindstc/include Modified Files: wxbind.h Log Message: Use dummy wxLuaBindDefine for class member enums if they don't have any Some formatting fixes for the generated bindings Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxbind.h 6 Jun 2007 23:43:14 -0000 1.23 --- wxbind.h 7 Jun 2007 03:22:09 -0000 1.24 *************** *** 65,75 **** extern WXDLLIMPEXP_WXBINDSTC wxLuaBindMethod wxStyledTextCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_methodCount; - extern WXDLLIMPEXP_WXBINDSTC wxLuaBindDefine wxStyledTextCtrl_enums[]; - extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_enumCount; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextEvent; extern WXDLLIMPEXP_WXBINDSTC wxLuaBindMethod wxStyledTextEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_methodCount; - extern WXDLLIMPEXP_WXBINDSTC wxLuaBindDefine wxStyledTextEvent_enums[]; - extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_enumCount; --- 65,71 ---- |
|
From: John L. <jr...@us...> - 2007-06-07 03:35:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22306/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: Use dummy wxLuaBindDefine for class member enums if they don't have any Some formatting fixes for the generated bindings Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxstc_bind.cpp 6 Jun 2007 23:43:15 -0000 1.22 --- wxstc_bind.cpp 7 Jun 2007 03:22:09 -0000 1.23 *************** *** 1497,1502 **** static wxLuaBindClass classList[] = { ! { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl", NULL ,wxStyledTextCtrl_enums, wxStyledTextCtrl_enumCount, }, ! { "wxStyledTextEvent", wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, CLASSINFO(wxStyledTextEvent), &s_wxluatag_wxStyledTextEvent, "wxCommandEvent", NULL ,wxStyledTextEvent_enums, wxStyledTextEvent_enumCount, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 1497,1502 ---- static wxLuaBindClass classList[] = { ! { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxStyledTextEvent", wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, CLASSINFO(wxStyledTextEvent), &s_wxluatag_wxStyledTextEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** stc.cpp 6 Jun 2007 23:43:14 -0000 1.35 --- stc.cpp 7 Jun 2007 03:22:09 -0000 1.36 *************** *** 30,34 **** static int LUACALL wxLua_wxStyledTextCtrl_AddRefDocument(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_AddRefDocument[1] = {{ wxLua_wxStyledTextCtrl_AddRefDocument, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStyledTextCtrl_AddRefDocument }}; - // void AddRefDocument(void* docPointer); static int LUACALL wxLua_wxStyledTextCtrl_AddRefDocument(lua_State *L) --- 30,33 ---- *************** *** 48,52 **** static int LUACALL wxLua_wxStyledTextCtrl_AddText(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_AddText[1] = {{ wxLua_wxStyledTextCtrl_AddText, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStyledTextCtrl_AddText }}; [...3945 lines suppressed...] --- 9324,9327 ---- *************** *** 9833,9837 **** static int LUACALL wxLua_wxStyledTextEvent_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextEvent_constructor[1] = {{ wxLua_wxStyledTextEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxStyledTextEvent_constructor }}; - // wxStyledTextEvent(wxEventType commandType = 0, int id = 0) static int LUACALL wxLua_wxStyledTextEvent_constructor(lua_State *L) --- 9341,9344 ---- *************** *** 9919,9926 **** - wxLuaBindDefine wxStyledTextEvent_enums[] = { - { NULL, 0, }, - }; - - int wxStyledTextEvent_enumCount = sizeof(wxStyledTextEvent_enums)/sizeof(wxLuaBindDefine) - 1; - --- 9426,9427 ---- |
|
From: John L. <jr...@us...> - 2007-06-07 03:35:27
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22306/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp wxluasocket_bind.cpp Log Message: Use dummy wxLuaBindDefine for class member enums if they don't have any Some formatting fixes for the generated bindings Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxluasocket_bind.cpp 6 Jun 2007 23:43:17 -0000 1.17 --- wxluasocket_bind.cpp 7 Jun 2007 03:22:10 -0000 1.18 *************** *** 120,125 **** static wxLuaBindClass classList[] = { ! { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL ,wxLuaDebuggerEvent_enums, wxLuaDebuggerEvent_enumCount, }, ! { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &s_wxluatag_wxLuaDebuggerServer, "wxEvtHandler", NULL ,wxLuaDebuggerServer_enums, wxLuaDebuggerServer_enumCount, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 120,125 ---- static wxLuaBindClass classList[] = { ! { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &s_wxluatag_wxLuaDebuggerServer, "wxEvtHandler", NULL ,s_wxluadefineArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxluasocket.cpp 6 Jun 2007 23:43:17 -0000 1.23 --- wxluasocket.cpp 7 Jun 2007 03:22:10 -0000 1.24 *************** *** 30,34 **** static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_AddBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }}; - // bool AddBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) --- 30,33 ---- *************** *** 53,57 **** static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Break[1] = {{ wxLua_wxLuaDebuggerServer_Break, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break }}; - // bool Break() static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) --- 52,55 ---- *************** *** 72,76 **** static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[1] = {{ wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints }}; - // bool ClearAllBreakPoints() static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) --- 70,73 ---- *************** *** 91,95 **** static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue[1] = {{ wxLua_wxLuaDebuggerServer_Continue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue }}; - // bool Continue() static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) --- 88,91 ---- *************** *** 110,114 **** static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete[1] = {{ wxLua_wxLuaDebuggerServer_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Delete }}; - static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L) { --- 106,109 ---- *************** *** 127,131 **** static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog[1] = {{ wxLua_wxLuaDebuggerServer_DisplayStackDialog, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }}; - // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) --- 122,125 ---- *************** *** 149,153 **** static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr[1] = {{ wxLua_wxLuaDebuggerServer_EvaluateExpr, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }}; - // bool EvaluateExpr(int exprRef, const wxString &expr) static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) --- 143,146 ---- *************** *** 172,176 **** static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[1] = {{ wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId }}; - // long GetDebuggeeProcessId() const static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) --- 165,168 ---- *************** *** 190,194 **** static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName[1] = {{ wxLua_wxLuaDebuggerServer_GetNetworkName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; - // static wxString GetNetworkName() static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) --- 182,185 ---- *************** *** 206,210 **** static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName[1] = {{ wxLua_wxLuaDebuggerServer_GetProgramName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; - // static wxString GetProgramName() static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) --- 197,200 ---- *************** *** 223,227 **** static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee[1] = {{ wxLua_wxLuaDebuggerServer_KillDebuggee, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee }}; - // bool KillDebuggee() static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) --- 213,216 ---- *************** *** 242,246 **** static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_RemoveBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }}; - // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) --- 231,234 ---- *************** *** 265,269 **** static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset[1] = {{ wxLua_wxLuaDebuggerServer_Reset, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset }}; - // bool Reset() static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L) --- 253,256 ---- *************** *** 284,288 **** static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }}; - // bool Run(const wxString &file, const wxString &fileName) static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) --- 271,274 ---- *************** *** 307,311 **** static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient[1] = {{ wxLua_wxLuaDebuggerServer_StartClient, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient }}; - // long StartClient() static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) --- 293,296 ---- *************** *** 326,330 **** static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer[1] = {{ wxLua_wxLuaDebuggerServer_StartServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer }}; - // bool StartServer() static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) --- 311,314 ---- *************** *** 345,349 **** static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Step[1] = {{ wxLua_wxLuaDebuggerServer_Step, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step }}; - // bool Step() static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) --- 329,332 ---- *************** *** 364,368 **** static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut[1] = {{ wxLua_wxLuaDebuggerServer_StepOut, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut }}; - // bool StepOut() static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) --- 347,350 ---- *************** *** 383,387 **** static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver[1] = {{ wxLua_wxLuaDebuggerServer_StepOver, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver }}; - // bool StepOver() static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) --- 365,368 ---- *************** *** 402,406 **** static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer[1] = {{ wxLua_wxLuaDebuggerServer_StopServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer }}; - // bool StopServer() static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) --- 383,386 ---- *************** *** 421,425 **** static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor[1] = {{ wxLua_wxLuaDebuggerServer_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }}; - // wxLuaDebuggerServer(int portNumber) static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) --- 401,404 ---- *************** *** 471,480 **** - wxLuaBindDefine wxLuaDebuggerServer_enums[] = { - { NULL, 0, }, - }; - - int wxLuaDebuggerServer_enumCount = sizeof(wxLuaDebuggerServer_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxLuaDebuggerEvent --- 450,453 ---- *************** *** 487,491 **** static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete[1] = {{ wxLua_wxLuaDebuggerEvent_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_Delete }}; - static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L) { --- 460,463 ---- *************** *** 504,508 **** static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName[1] = {{ wxLua_wxLuaDebuggerEvent_GetFileName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName }}; - // wxString GetFileName() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) --- 476,479 ---- *************** *** 523,527 **** static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber[1] = {{ wxLua_wxLuaDebuggerEvent_GetLineNumber, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber }}; - // int GetLineNumber() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) --- 494,497 ---- *************** *** 542,546 **** static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage[1] = {{ wxLua_wxLuaDebuggerEvent_GetMessage, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage }}; - // wxString GetMessage() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L) --- 512,515 ---- *************** *** 561,565 **** static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference[1] = {{ wxLua_wxLuaDebuggerEvent_GetReference, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference }}; - // int GetReference() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) --- 530,533 ---- *************** *** 592,599 **** - wxLuaBindDefine wxLuaDebuggerEvent_enums[] = { - { NULL, 0, }, - }; - - int wxLuaDebuggerEvent_enumCount = sizeof(wxLuaDebuggerEvent_enums)/sizeof(wxLuaBindDefine) - 1; - --- 560,561 ---- |
|
From: John L. <jr...@us...> - 2007-06-07 03:35:21
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26204/wxLua/docs Modified Files: wxlua.html Log Message: Make the properties a little more clear Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxlua.html 6 Jun 2007 15:20:15 -0000 1.20 --- wxlua.html 7 Jun 2007 03:31:50 -0000 1.21 *************** *** 1,16 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> ! <html><head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> ! <title>wxLua Documentation</title><meta content="John Labenski" name="author"></head> <body> [...3573 lines suppressed...] things up for wxLua first.</li> + <li>Returns lua's error code LUA_ERRXXX or 0 on sucess</li> + + </ul> + <li>The other functions are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li> + </ul> ! ! </body> ! </html> |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** xml.cpp 6 Jun 2007 03:53:39 -0000 1.32 --- xml.cpp 6 Jun 2007 23:43:13 -0000 1.33 *************** *** 35,41 **** int s_wxluatag_wxXmlNode = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_AddChild[] = { &s_wxluatag_wxXmlNode, &s_wxluatag_wxXmlNode, 0 }; static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddChild[1] = {{ wxLua_wxXmlNode_AddChild, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddChild }}; // void AddChild(wxXmlNode *child) --- 35,41 ---- int s_wxluatag_wxXmlNode = -1; [...2038 lines suppressed...] ! int wxXmlResource_enumCount = sizeof(wxXmlResource_enums)/sizeof(wxXmlResource_enums[0]) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 2033,2047 ---- #endif // (wxLUA_USE_wxXMLResource && wxUSE_XML) ! { 0, 0, 0, 0 }, }; ! int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxXmlResource_enums[] = { { NULL, 0, }, }; ! int wxXmlResource_enumCount = sizeof(wxXmlResource_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** defsutil.cpp 6 Jun 2007 03:53:36 -0000 1.34 --- defsutil.cpp 6 Jun 2007 23:43:00 -0000 1.35 *************** *** 36,42 **** #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_CloseOutput[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_CloseOutput[1] = {{ wxLua_wxProcess_CloseOutput, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_CloseOutput }}; // void CloseOutput() --- 36,42 ---- #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) [...968 lines suppressed...] --- 982,1000 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxBusyInfo_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBusyInfo_Delete, 1, NULL }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxBusyInfo", s_wxluafunc_wxLua_wxBusyInfo_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxBusyInfo_methodCount = sizeof(wxBusyInfo_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxBusyInfo_enums[] = { { NULL, 0, }, }; ! int wxBusyInfo_enumCount = sizeof(wxBusyInfo_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxlua.cpp 6 Jun 2007 03:53:39 -0000 1.36 --- wxlua.cpp 6 Jun 2007 23:43:13 -0000 1.37 *************** *** 33,39 **** int s_wxluatag_wxLuaState = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaState_Delete[] = { &s_wxluatag_wxLuaState, 0 }; static int LUACALL wxLua_wxLuaState_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaState_Delete[1] = {{ wxLua_wxLuaState_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaState_Delete }}; static int LUACALL wxLua_wxLuaState_Delete(lua_State *L) --- 33,39 ---- int s_wxluatag_wxLuaState = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaState_Delete[] = { &s_wxluatag_wxLuaState, NULL }; static int LUACALL wxLua_wxLuaState_Delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaState_Delete[1] = {{ wxLua_wxLuaState_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaState_Delete }}; static int LUACALL wxLua_wxLuaState_Delete(lua_State *L) *************** *** 53,69 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaState_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaState_Delete, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaState_methods[0]) - 1; ! WXLUADEFINE wxLuaState_enums[] = { { NULL, 0, }, }; ! int wxLuaState_enumCount = sizeof(wxLuaState_enums)/sizeof(wxLuaState_enums[0]) - 1; // --------------------------------------------------------------------------- --- 53,69 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLuaState_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaState_Delete, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxLuaState_enums[] = { { NULL, 0, }, }; ! int wxLuaState_enumCount = sizeof(wxLuaState_enums)/sizeof(wxLuaBindDefine) - 1; // --------------------------------------------------------------------------- *************** *** 74,80 **** int s_wxluatag_wxLuaObject = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_Delete[] = { &s_wxluatag_wxLuaObject, 0 }; static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_Delete[1] = {{ wxLua_wxLuaObject_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_Delete }}; static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L) --- 74,80 ---- int s_wxluatag_wxLuaObject = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_Delete[] = { &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_Delete[1] = {{ wxLua_wxLuaObject_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_Delete }}; static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L) *************** *** 91,97 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags[] = { &s_wxluatag_wxLuaObject, 0 }; static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags[1] = {{ wxLua_wxLuaObject_GetAllocationFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags }}; // int GetAllocationFlags() const --- 91,97 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags[] = { &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags[1] = {{ wxLua_wxLuaObject_GetAllocationFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags }}; // int GetAllocationFlags() const *************** *** 110,116 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetObject[] = { &s_wxluatag_wxLuaObject, 0 }; static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetObject }}; // %override wxLua_wxLuaObject_GetObject --- 110,116 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetObject[] = { &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetObject }}; // %override wxLua_wxLuaObject_GetObject *************** *** 127,133 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enum, 0 }; static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }}; // bool HasAllocationFlag(wxLuaObject_Type flag) --- 127,133 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enum, NULL }; static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }}; // bool HasAllocationFlag(wxLuaObject_Type flag) *************** *** 148,154 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enum, &s_wxluaarg_Boolean, 0 }; static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag[1] = {{ wxLua_wxLuaObject_SetAllocationFlag, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }}; // int SetAllocationFlag(wxLuaObject_Type flag, bool set) --- 148,154 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enum, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag[1] = {{ wxLua_wxLuaObject_SetAllocationFlag, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }}; // int SetAllocationFlag(wxLuaObject_Type flag, bool set) *************** *** 171,177 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxLuaObject_SetObject }}; // %override wxLua_wxLuaObject_SetObject --- 171,177 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxLuaObject_SetObject }}; // %override wxLua_wxLuaObject_SetObject *************** *** 189,193 **** static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxLuaObject_constructor --- 189,193 ---- static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxLuaObject_constructor *************** *** 195,199 **** static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaObject *returns; --- 195,199 ---- static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxLuaObject *returns; *************** *** 211,233 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaObject_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaObject_Delete, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetAllocationFlags", s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetObject", s_wxluafunc_wxLua_wxLuaObject_GetObject, 1, 0 }, ! { WXLUAMETHOD_METHOD, "HasAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetObject", s_wxluafunc_wxLua_wxLuaObject_SetObject, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaObject", s_wxluafunc_wxLua_wxLuaObject_constructor, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxLuaObject_methodCount = sizeof(wxLuaObject_methods)/sizeof(wxLuaObject_methods[0]) - 1; ! WXLUADEFINE wxLuaObject_enums[] = { { NULL, 0, }, }; ! int wxLuaObject_enumCount = sizeof(wxLuaObject_enums)/sizeof(wxLuaObject_enums[0]) - 1; --- 211,233 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLuaObject_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaObject_Delete, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetAllocationFlags", s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetObject", s_wxluafunc_wxLua_wxLuaObject_GetObject, 1, NULL }, ! { WXLUAMETHOD_METHOD, "HasAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetObject", s_wxluafunc_wxLua_wxLuaObject_SetObject, 1, NULL }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaObject", s_wxluafunc_wxLua_wxLuaObject_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxLuaObject_methodCount = sizeof(wxLuaObject_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxLuaObject_enums[] = { { NULL, 0, }, }; ! int wxLuaObject_enumCount = sizeof(wxLuaObject_enums)/sizeof(wxLuaBindDefine) - 1; *************** *** 240,246 **** int s_wxluatag_wxLuaPrintout = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_Delete[] = { &s_wxluatag_wxLuaPrintout, 0 }; static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_Delete[1] = {{ wxLua_wxLuaPrintout_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaPrintout_Delete }}; static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L) --- 240,246 ---- int s_wxluatag_wxLuaPrintout = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_Delete[] = { &s_wxluatag_wxLuaPrintout, NULL }; static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaPrintout_Delete[1] = {{ wxLua_wxLuaPrintout_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaPrintout_Delete }}; static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L) *************** *** 257,263 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_GetID[] = { &s_wxluatag_wxLuaPrintout, 0 }; static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_GetID[1] = {{ wxLua_wxLuaPrintout_GetID, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaPrintout_GetID }}; // wxLuaObject *GetID() --- 257,263 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_GetID[] = { &s_wxluatag_wxLuaPrintout, NULL }; static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaPrintout_GetID[1] = {{ wxLua_wxLuaPrintout_GetID, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaPrintout_GetID }}; // wxLuaObject *GetID() *************** *** 276,282 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo[] = { &s_wxluatag_wxLuaPrintout, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo[1] = {{ wxLua_wxLuaPrintout_SetPageInfo, WXLUAMETHOD_METHOD, 3, 5, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }}; // void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0) --- 276,282 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo[] = { &s_wxluatag_wxLuaPrintout, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo[1] = {{ wxLua_wxLuaPrintout_SetPageInfo, WXLUAMETHOD_METHOD, 3, 5, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }}; // void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0) *************** *** 302,308 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxLuaObject, 0 }; static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_constructor[1] = {{ wxLua_wxLuaPrintout_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }}; // %override wxLua_wxLuaPrintout_constructor --- 302,308 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaPrintout_constructor[1] = {{ wxLua_wxLuaPrintout_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }}; // %override wxLua_wxLuaPrintout_constructor *************** *** 310,314 **** static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaPrintout *returns; --- 310,314 ---- static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxLuaPrintout *returns; *************** *** 333,353 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaPrintout_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaPrintout_Delete, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetID", s_wxluafunc_wxLua_wxLuaPrintout_GetID, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetPageInfo", s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaPrintout", s_wxluafunc_wxLua_wxLuaPrintout_constructor, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxLuaPrintout_methodCount = sizeof(wxLuaPrintout_methods)/sizeof(wxLuaPrintout_methods[0]) - 1; ! WXLUADEFINE wxLuaPrintout_enums[] = { { NULL, 0, }, }; ! int wxLuaPrintout_enumCount = sizeof(wxLuaPrintout_enums)/sizeof(wxLuaPrintout_enums[0]) - 1; #endif // wxLUA_USE_wxLuaPrintout --- 333,353 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLuaPrintout_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaPrintout_Delete, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetID", s_wxluafunc_wxLua_wxLuaPrintout_GetID, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetPageInfo", s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo, 1, NULL }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaPrintout", s_wxluafunc_wxLua_wxLuaPrintout_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxLuaPrintout_methodCount = sizeof(wxLuaPrintout_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxLuaPrintout_enums[] = { { NULL, 0, }, }; ! int wxLuaPrintout_enumCount = sizeof(wxLuaPrintout_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxLuaPrintout *************** *** 362,368 **** #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor[1] = {{ wxLua_wxLuaHtmlWindow_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 6, s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor }}; // %override wxLua_wxLuaHtmlWindow_constructor --- 362,368 ---- #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor[1] = {{ wxLua_wxLuaHtmlWindow_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 6, s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor }}; // %override wxLua_wxLuaHtmlWindow_constructor *************** *** 370,374 **** static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaHtmlWindow *returns; --- 370,374 ---- static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxLuaHtmlWindow *returns; *************** *** 403,422 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaHtmlWindow_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaHtmlWindow", s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor, 1, 0 }, #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxLuaHtmlWindow_methodCount = sizeof(wxLuaHtmlWindow_methods)/sizeof(wxLuaHtmlWindow_methods[0]) - 1; ! WXLUADEFINE wxLuaHtmlWindow_enums[] = { { NULL, 0, }, }; ! int wxLuaHtmlWindow_enumCount = sizeof(wxLuaHtmlWindow_enums)/sizeof(wxLuaHtmlWindow_enums[0]) - 1; #endif // wxLUA_USE_wxLuaHtmlWindow --- 403,422 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLuaHtmlWindow_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaHtmlWindow", s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor, 1, NULL }, #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { 0, 0, 0, 0 }, }; ! int wxLuaHtmlWindow_methodCount = sizeof(wxLuaHtmlWindow_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxLuaHtmlWindow_enums[] = { { NULL, 0, }, }; ! int wxLuaHtmlWindow_enumCount = sizeof(wxLuaHtmlWindow_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 430,436 **** int s_wxluatag_wxLuaHtmlWinTagEvent = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_Delete[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, 0 }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_Delete[1] = {{ wxLua_wxLuaHtmlWinTagEvent_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_Delete }}; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L) --- 430,436 ---- int s_wxluatag_wxLuaHtmlWinTagEvent = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_Delete[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_Delete[1] = {{ wxLua_wxLuaHtmlWinTagEvent_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_Delete }}; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L) *************** *** 449,455 **** #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, 0 }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser }}; // wxHtmlWinParser *GetHtmlParser() const --- 449,455 ---- #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser }}; // wxHtmlWinParser *GetHtmlParser() const *************** *** 468,474 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, 0 }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag }}; // const wxHtmlTag *GetHtmlTag() const --- 468,474 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag }}; // const wxHtmlTag *GetHtmlTag() const *************** *** 489,495 **** #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, 0 }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled }}; // bool GetParseInnerCalled() const --- 489,495 ---- #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, NULL }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled }}; // bool GetParseInnerCalled() const *************** *** 508,514 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, &s_wxluaarg_Boolean, 0 }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[1] = {{ wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }}; // void SetParseInnerCalled(bool fParseInnerCalled = true) --- 508,514 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[1] = {{ wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }}; // void SetParseInnerCalled(bool fParseInnerCalled = true) *************** *** 532,557 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaHtmlWinTagEvent_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_Delete, 1, 0 }, #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! { WXLUAMETHOD_METHOD, "GetHtmlParser", s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetHtmlTag", s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 1, 0 }, #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! { WXLUAMETHOD_METHOD, "GetParseInnerCalled", s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetParseInnerCalled", s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxLuaHtmlWinTagEvent_methodCount = sizeof(wxLuaHtmlWinTagEvent_methods)/sizeof(wxLuaHtmlWinTagEvent_methods[0]) - 1; ! WXLUADEFINE wxLuaHtmlWinTagEvent_enums[] = { { NULL, 0, }, }; ! int wxLuaHtmlWinTagEvent_enumCount = sizeof(wxLuaHtmlWinTagEvent_enums)/sizeof(wxLuaHtmlWinTagEvent_enums[0]) - 1; #endif // wxLUA_USE_wxLuaHtmlWindow --- 532,557 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLuaHtmlWinTagEvent_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_Delete, 1, NULL }, #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! { WXLUAMETHOD_METHOD, "GetHtmlParser", s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetHtmlTag", s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 1, NULL }, #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! { WXLUAMETHOD_METHOD, "GetParseInnerCalled", s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetParseInnerCalled", s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxLuaHtmlWinTagEvent_methodCount = sizeof(wxLuaHtmlWinTagEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxLuaHtmlWinTagEvent_enums[] = { { NULL, 0, }, }; ! int wxLuaHtmlWinTagEvent_enumCount = sizeof(wxLuaHtmlWinTagEvent_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 565,571 **** int s_wxluatag_wxLuaTreeItemData = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaTreeItemData_GetValue[] = { &s_wxluatag_wxLuaTreeItemData, 0 }; static int LUACALL wxLua_wxLuaTreeItemData_GetValue(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaTreeItemData_GetValue[1] = {{ wxLua_wxLuaTreeItemData_GetValue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaTreeItemData_GetValue }}; // double GetValue() const; --- 565,571 ---- int s_wxluatag_wxLuaTreeItemData = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaTreeItemData_GetValue[] = { &s_wxluatag_wxLuaTreeItemData, NULL }; static int LUACALL wxLua_wxLuaTreeItemData_GetValue(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaTreeItemData_GetValue[1] = {{ wxLua_wxLuaTreeItemData_GetValue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaTreeItemData_GetValue }}; // double GetValue() const; *************** *** 584,590 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaTreeItemData_SetValue[] = { &s_wxluatag_wxLuaTreeItemData, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxLuaTreeItemData_SetValue(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaTreeItemData_SetValue[1] = {{ wxLua_wxLuaTreeItemData_SetValue, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaTreeItemData_SetValue }}; // void SetValue(double value); --- 584,590 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaTreeItemData_SetValue[] = { &s_wxluatag_wxLuaTreeItemData, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaTreeItemData_SetValue(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaTreeItemData_SetValue[1] = {{ wxLua_wxLuaTreeItemData_SetValue, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaTreeItemData_SetValue }}; // void SetValue(double value); *************** *** 602,613 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor[] = { &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxLuaTreeItemData_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaTreeItemData_constructor[1] = {{ wxLua_wxLuaTreeItemData_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor }}; // wxLuaTreeItemData(double value = 0) static int LUACALL wxLua_wxLuaTreeItemData_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaTreeItemData *returns; --- 602,613 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor[] = { &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaTreeItemData_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaTreeItemData_constructor[1] = {{ wxLua_wxLuaTreeItemData_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor }}; // wxLuaTreeItemData(double value = 0) static int LUACALL wxLua_wxLuaTreeItemData_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxLuaTreeItemData *returns; *************** *** 628,647 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaTreeItemData_methods[] = { ! { WXLUAMETHOD_METHOD, "GetValue", s_wxluafunc_wxLua_wxLuaTreeItemData_GetValue, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetValue", s_wxluafunc_wxLua_wxLuaTreeItemData_SetValue, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaTreeItemData", s_wxluafunc_wxLua_wxLuaTreeItemData_constructor, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxLuaTreeItemData_methodCount = sizeof(wxLuaTreeItemData_methods)/sizeof(wxLuaTreeItemData_methods[0]) - 1; ! WXLUADEFINE wxLuaTreeItemData_enums[] = { { NULL, 0, }, }; ! int wxLuaTreeItemData_enumCount = sizeof(wxLuaTreeItemData_enums)/sizeof(wxLuaTreeItemData_enums[0]) - 1; #endif // wxLUA_USE_wxTreeCtrl --- 628,647 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLuaTreeItemData_methods[] = { ! { WXLUAMETHOD_METHOD, "GetValue", s_wxluafunc_wxLua_wxLuaTreeItemData_GetValue, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetValue", s_wxluafunc_wxLua_wxLuaTreeItemData_SetValue, 1, NULL }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaTreeItemData", s_wxluafunc_wxLua_wxLuaTreeItemData_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxLuaTreeItemData_methodCount = sizeof(wxLuaTreeItemData_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxLuaTreeItemData_enums[] = { { NULL, 0, }, }; ! int wxLuaTreeItemData_enumCount = sizeof(wxLuaTreeItemData_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxTreeCtrl Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** image.cpp 5 Jun 2007 21:07:23 -0000 1.37 --- image.cpp 6 Jun 2007 23:43:06 -0000 1.38 *************** *** 35,41 **** int s_wxluatag_wxImage = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_AddHandler[] = { &s_wxluatag_wxImageHandler, 0 }; static int LUACALL wxLua_wxImage_AddHandler(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxImage_AddHandler[1] = {{ wxLua_wxImage_AddHandler, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatagArray_wxLua_wxImage_AddHandler }}; // static void AddHandler(wxImageHandler* handler) --- 35,41 ---- int s_wxluatag_wxImage = -1; [...3922 lines suppressed...] #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider) #if (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Push", s_wxluafunc_wxLua_wxArtProvider_Push, 1, NULL }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Remove", s_wxluafunc_wxLua_wxArtProvider_Remove, 1, NULL }, #endif // (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) ! { 0, 0, 0, 0 }, }; ! int wxArtProvider_methodCount = sizeof(wxArtProvider_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxArtProvider_enums[] = { { NULL, 0, }, }; ! int wxArtProvider_enumCount = sizeof(wxArtProvider_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxArtProvider Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** mdi.cpp 6 Jun 2007 03:53:38 -0000 1.34 --- mdi.cpp 6 Jun 2007 23:43:06 -0000 1.35 *************** *** 38,53 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxMDIClientWindow_methods[] = { ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxMDIClientWindow_methodCount = sizeof(wxMDIClientWindow_methods)/sizeof(wxMDIClientWindow_methods[0]) - 1; ! WXLUADEFINE wxMDIClientWindow_enums[] = { [...4201 lines suppressed...] #if (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS) ! { WXLUAMETHOD_METHOD, "UseMenu", s_wxluafunc_wxLua_wxFileHistory_UseMenu, 1, NULL }, #endif // (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS) ! { WXLUAMETHOD_CONSTRUCTOR, "wxFileHistory", s_wxluafunc_wxLua_wxFileHistory_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxFileHistory_methodCount = sizeof(wxFileHistory_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxFileHistory_enums[] = { { NULL, 0, }, }; ! int wxFileHistory_enumCount = sizeof(wxFileHistory_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** config.cpp 5 Jun 2007 21:07:21 -0000 1.36 --- config.cpp 6 Jun 2007 23:42:58 -0000 1.37 *************** *** 36,40 **** static int LUACALL wxLua_wxConfigBase_Create(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Create[1] = {{ wxLua_wxConfigBase_Create, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; // static wxConfigBase* Create() --- 36,40 ---- static int LUACALL wxLua_wxConfigBase_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxConfigBase_Create[1] = {{ wxLua_wxConfigBase_Create, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; [...1057 lines suppressed...] #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG) ! { WXLUAMETHOD_METHOD, "UpdateIfDeleted", s_wxluafunc_wxLua_wxConfigPathChanger_UpdateIfDeleted, 1, NULL }, #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG) ! { WXLUAMETHOD_CONSTRUCTOR, "wxConfigPathChanger", s_wxluafunc_wxLua_wxConfigPathChanger_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxConfigPathChanger_methodCount = sizeof(wxConfigPathChanger_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxConfigPathChanger_enums[] = { { NULL, 0, }, }; ! int wxConfigPathChanger_enumCount = sizeof(wxConfigPathChanger_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** grid.cpp 6 Jun 2007 03:53:37 -0000 1.35 --- grid.cpp 6 Jun 2007 23:43:05 -0000 1.36 *************** *** 35,41 **** int s_wxluatag_wxGridCellWorker = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGridCellWorker_DecRef[] = { &s_wxluatag_wxGridCellWorker, 0 }; static int LUACALL wxLua_wxGridCellWorker_DecRef(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxGridCellWorker_DecRef[1] = {{ wxLua_wxGridCellWorker_DecRef, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxGridCellWorker_DecRef }}; // void DecRef() --- 35,41 ---- int s_wxluatag_wxGridCellWorker = -1; [...8370 lines suppressed...] ! { WXLUAMETHOD_METHOD, "SetControl", s_wxluafunc_wxLua_wxGridEditorCreatedEvent_SetControl, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetRow", s_wxluafunc_wxLua_wxGridEditorCreatedEvent_SetRow, 1, NULL }, #if (wxLUA_USE_wxObject) && (wxLUA_USE_wxGrid && wxUSE_GRID) ! { WXLUAMETHOD_CONSTRUCTOR, "wxGridEditorCreatedEvent", s_wxluafunc_wxLua_wxGridEditorCreatedEvent_constructor, 1, NULL }, #endif // (wxLUA_USE_wxObject) && (wxLUA_USE_wxGrid && wxUSE_GRID) ! { 0, 0, 0, 0 }, }; ! int wxGridEditorCreatedEvent_methodCount = sizeof(wxGridEditorCreatedEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxGridEditorCreatedEvent_enums[] = { { NULL, 0, }, }; ! int wxGridEditorCreatedEvent_enumCount = sizeof(wxGridEditorCreatedEvent_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** file.cpp 6 Jun 2007 03:53:37 -0000 1.44 --- file.cpp 6 Jun 2007 23:43:02 -0000 1.45 *************** *** 34,40 **** #if wxCHECK_VERSION(2,8,0) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_Add2[] = { &s_wxluatag_wxPathList, &s_wxluaarg_LuaTable, 0 }; static int LUACALL wxLua_wxPathList_Add2(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPathList_Add2[1] = {{ wxLua_wxPathList_Add2, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPathList_Add2 }}; // %wxchkver_2_8 void Add(const wxArrayString_FromLuaTable& paths) --- 34,40 ---- #if wxCHECK_VERSION(2,8,0) [...5047 lines suppressed...] ! { WXLUAMETHOD_METHOD, "Write16", s_wxluafunc_wxLua_wxDataOutputStream_Write16, 1, NULL }, ! { WXLUAMETHOD_METHOD, "Write32", s_wxluafunc_wxLua_wxDataOutputStream_Write32, 1, NULL }, ! { WXLUAMETHOD_METHOD, "Write8", s_wxluafunc_wxLua_wxDataOutputStream_Write8, 1, NULL }, ! { WXLUAMETHOD_METHOD, "WriteDouble", s_wxluafunc_wxLua_wxDataOutputStream_WriteDouble, 1, NULL }, ! { WXLUAMETHOD_METHOD, "WriteString", s_wxluafunc_wxLua_wxDataOutputStream_WriteString, 1, NULL }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxDataOutputStream", s_wxluafunc_wxLua_wxDataOutputStream_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxDataOutputStream_methodCount = sizeof(wxDataOutputStream_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxDataOutputStream_enums[] = { { NULL, 0, }, }; ! int wxDataOutputStream_enumCount = sizeof(wxDataOutputStream_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxUSE_STREAMS Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** data.cpp 5 Jun 2007 21:07:21 -0000 1.43 --- data.cpp 6 Jun 2007 23:43:00 -0000 1.44 *************** *** 33,39 **** int s_wxluatag_wxString = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxString_GetData[] = { &s_wxluatag_wxString, 0 }; static int LUACALL wxLua_wxString_GetData(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxString_GetData[1] = {{ wxLua_wxString_GetData, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxString_GetData }}; // wxString GetData() const --- 33,39 ---- int s_wxluatag_wxString = -1; [...3407 lines suppressed...] ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxULongLong_Delete, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetHi", s_wxluafunc_wxLua_wxULongLong_GetHi, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetLo", s_wxluafunc_wxLua_wxULongLong_GetLo, 1, NULL }, ! { WXLUAMETHOD_METHOD, "ToString", s_wxluafunc_wxLua_wxULongLong_ToString, 1, NULL }, ! { WXLUAMETHOD_METHOD, "ToULong", s_wxluafunc_wxLua_wxULongLong_ToULong, 1, NULL }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxULongLong", s_wxluafunc_wxLua_wxULongLong_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxULongLong_methodCount = sizeof(wxULongLong_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxULongLong_enums[] = { { NULL, 0, }, }; ! int wxULongLong_enumCount = sizeof(wxULongLong_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxUSE_LONGLONG Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** controls.cpp 6 Jun 2007 03:53:36 -0000 1.56 --- controls.cpp 6 Jun 2007 23:42:58 -0000 1.57 *************** *** 36,42 **** #if ((wxLUA_USE_wxButton && wxUSE_BUTTON) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxButton_Create[] = { &s_wxluatag_wxButton, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxButton_Create(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxButton_Create[1] = {{ wxLua_wxButton_Create, WXLUAMETHOD_METHOD, 4, 9, s_wxluatagArray_wxLua_wxButton_Create }}; // bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxButton") --- 36,42 ---- #if ((wxLUA_USE_wxButton && wxUSE_BUTTON) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) [...13501 lines suppressed...] ! int wxGenericDirCtrl_enumCount = sizeof(wxGenericDirCtrl_enums)/sizeof(wxGenericDirCtrl_enums[0]) - 1; #endif // wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG --- 14254,14268 ---- #endif // ((wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG))||(wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG) ! { 0, 0, 0, 0 }, }; ! int wxGenericDirCtrl_methodCount = sizeof(wxGenericDirCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxGenericDirCtrl_enums[] = { { NULL, 0, }, }; ! int wxGenericDirCtrl_enumCount = sizeof(wxGenericDirCtrl_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG Index: regex.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/regex.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** regex.cpp 5 Jun 2007 21:07:23 -0000 1.28 --- regex.cpp 6 Jun 2007 23:43:08 -0000 1.29 *************** *** 35,41 **** int s_wxluatag_wxRegEx = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_Compile[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxRegEx_Compile(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_Compile[1] = {{ wxLua_wxRegEx_Compile, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxRegEx_Compile }}; // bool Compile(const wxString& pattern, int flags = wxRE_DEFAULT) --- 35,41 ---- int s_wxluatag_wxRegEx = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_Compile[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxRegEx_Compile(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_Compile[1] = {{ wxLua_wxRegEx_Compile, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxRegEx_Compile }}; // bool Compile(const wxString& pattern, int flags = wxRE_DEFAULT) *************** *** 60,66 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_Delete[] = { &s_wxluatag_wxRegEx, 0 }; static int LUACALL wxLua_wxRegEx_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_Delete[1] = {{ wxLua_wxRegEx_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxRegEx_Delete }}; static int LUACALL wxLua_wxRegEx_Delete(lua_State *L) --- 60,66 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_Delete[] = { &s_wxluatag_wxRegEx, NULL }; static int LUACALL wxLua_wxRegEx_Delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_Delete[1] = {{ wxLua_wxRegEx_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxRegEx_Delete }}; static int LUACALL wxLua_wxRegEx_Delete(lua_State *L) *************** *** 78,84 **** #define wxLua_wxRegEx_GetMatch1 wxLua_wxRegEx_GetMatchIndexes ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatch1[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxRegEx_GetMatch1(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatch1[1] = {{ wxLua_wxRegEx_GetMatch1, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxRegEx_GetMatch1 }}; // %override wxLua_wxRegEx_GetMatchIndexes --- 78,84 ---- #define wxLua_wxRegEx_GetMatch1 wxLua_wxRegEx_GetMatchIndexes ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatch1[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxRegEx_GetMatch1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_GetMatch1[1] = {{ wxLua_wxRegEx_GetMatch1, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxRegEx_GetMatch1 }}; // %override wxLua_wxRegEx_GetMatchIndexes *************** *** 109,115 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatch[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxRegEx_GetMatch(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatch[1] = {{ wxLua_wxRegEx_GetMatch, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxRegEx_GetMatch }}; // wxString GetMatch(const wxString& text, size_t index = 0) const --- 109,115 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatch[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxRegEx_GetMatch(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_GetMatch[1] = {{ wxLua_wxRegEx_GetMatch, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxRegEx_GetMatch }}; // wxString GetMatch(const wxString& text, size_t index = 0) const *************** *** 134,140 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatchCount[] = { &s_wxluatag_wxRegEx, 0 }; static int LUACALL wxLua_wxRegEx_GetMatchCount(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatchCount[1] = {{ wxLua_wxRegEx_GetMatchCount, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxRegEx_GetMatchCount }}; // size_t GetMatchCount() const --- 134,140 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatchCount[] = { &s_wxluatag_wxRegEx, NULL }; static int LUACALL wxLua_wxRegEx_GetMatchCount(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_GetMatchCount[1] = {{ wxLua_wxRegEx_GetMatchCount, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxRegEx_GetMatchCount }}; // size_t GetMatchCount() const *************** *** 153,159 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_IsValid[] = { &s_wxluatag_wxRegEx, 0 }; static int LUACALL wxLua_wxRegEx_IsValid(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_IsValid[1] = {{ wxLua_wxRegEx_IsValid, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxRegEx_IsValid }}; // bool IsValid() const --- 153,159 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_IsValid[] = { &s_wxluatag_wxRegEx, NULL }; static int LUACALL wxLua_wxRegEx_IsValid(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_IsValid[1] = {{ wxLua_wxRegEx_IsValid, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxRegEx_IsValid }}; // bool IsValid() const *************** *** 172,178 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_Matches[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxRegEx_Matches(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_Matches[1] = {{ wxLua_wxRegEx_Matches, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxRegEx_Matches }}; // bool Matches(const wxString &text, int flags = 0) const --- 172,178 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_Matches[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxRegEx_Matches(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_Matches[1] = {{ wxLua_wxRegEx_Matches, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxRegEx_Matches }}; // bool Matches(const wxString &text, int flags = 0) const *************** *** 197,203 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_Replace[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxRegEx_Replace(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_Replace[1] = {{ wxLua_wxRegEx_Replace, WXLUAMETHOD_METHOD, 3, 4, s_wxluatagArray_wxLua_wxRegEx_Replace }}; // %override wxLua_wxRegEx_Replace --- 197,203 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_Replace[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxRegEx_Replace(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_Replace[1] = {{ wxLua_wxRegEx_Replace, WXLUAMETHOD_METHOD, 3, 4, s_wxluatagArray_wxLua_wxRegEx_Replace }}; // %override wxLua_wxRegEx_Replace *************** *** 227,233 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_ReplaceAll[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxRegEx_ReplaceAll(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_ReplaceAll[1] = {{ wxLua_wxRegEx_ReplaceAll, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxRegEx_ReplaceAll }}; // %override wxLua_wxRegEx_ReplaceAll --- 227,233 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_ReplaceAll[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxRegEx_ReplaceAll(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_ReplaceAll[1] = {{ wxLua_wxRegEx_ReplaceAll, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxRegEx_ReplaceAll }}; // %override wxLua_wxRegEx_ReplaceAll *************** *** 253,259 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_ReplaceFirst[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxRegEx_ReplaceFirst(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_ReplaceFirst[1] = {{ wxLua_wxRegEx_ReplaceFirst, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxRegEx_ReplaceFirst }}; // %override wxLua_wxRegEx_ReplaceFirst --- 253,259 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_ReplaceFirst[] = { &s_wxluatag_wxRegEx, &s_wxluaarg_String, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxRegEx_ReplaceFirst(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_ReplaceFirst[1] = {{ wxLua_wxRegEx_ReplaceFirst, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxRegEx_ReplaceFirst }}; // %override wxLua_wxRegEx_ReplaceFirst *************** *** 279,290 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_constructor1[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxRegEx_constructor1(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_constructor1[1] = {{ wxLua_wxRegEx_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxRegEx_constructor1 }}; // wxRegEx(const wxString& expr, int flags = wxRE_DEFAULT) static int LUACALL wxLua_wxRegEx_constructor1(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxRegEx *returns; --- 279,290 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_constructor1[] = { &s_wxluaarg_String, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxRegEx_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_constructor1[1] = {{ wxLua_wxRegEx_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxRegEx_constructor1 }}; // wxRegEx(const wxString& expr, int flags = wxRE_DEFAULT) static int LUACALL wxLua_wxRegEx_constructor1(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxRegEx *returns; *************** *** 306,315 **** static int LUACALL wxLua_wxRegEx_constructor(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_constructor[1] = {{ wxLua_wxRegEx_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; // wxRegEx() static int LUACALL wxLua_wxRegEx_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxRegEx *returns; --- 306,315 ---- static int LUACALL wxLua_wxRegEx_constructor(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_constructor[1] = {{ wxLua_wxRegEx_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; // wxRegEx() static int LUACALL wxLua_wxRegEx_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxRegEx *returns; *************** *** 330,334 **** static int LUACALL wxLua_wxRegEx_GetMatch_overload(lua_State *L); // function overload table ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatch_overload[] = { { wxLua_wxRegEx_GetMatch_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 1, 3, s_wxluaargArray_None }, --- 330,334 ---- static int LUACALL wxLua_wxRegEx_GetMatch_overload(lua_State *L); // function overload table ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRegEx_GetMatch_overload[] = { { wxLua_wxRegEx_GetMatch_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 1, 3, s_wxluaargArray_No... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxstc_bind.cpp 31 May 2007 17:18:54 -0000 1.21 --- wxstc_bind.cpp 6 Jun 2007 23:43:15 -0000 1.22 *************** *** 24,30 **** // --------------------------------------------------------------------------- ! WXLUAEVENT* wxLuaGetEventList_wxstc(size_t &count) { ! static WXLUAEVENT eventList[] = { { &wxEVT_STC_AUTOCOMP_SELECTION, "wxEVT_STC_AUTOCOMP_SELECTION", &s_wxluatag_wxStyledTextEvent }, --- 24,30 ---- // --------------------------------------------------------------------------- ! wxLuaBindEvent* wxLuaGetEventList_wxstc(size_t &count) { ! static wxLuaBindEvent eventList[] = { { &wxEVT_STC_AUTOCOMP_SELECTION, "wxEVT_STC_AUTOCOMP_SELECTION", &s_wxluatag_wxStyledTextEvent }, *************** *** 62,66 **** { 0, 0, 0 }, }; ! count = (sizeof(eventList)/sizeof(eventList[0])) - 1; return eventList; } --- 62,66 ---- { 0, 0, 0 }, }; ! count = sizeof(eventList)/sizeof(wxLuaBindEvent) - 1; return eventList; } *************** *** 70,76 **** // --------------------------------------------------------------------------- ! WXLUADEFINE* wxLuaGetDefineList_wxstc(size_t &count) { ! static WXLUADEFINE defineList[] = { { "wxSTC_ADA_CHARACTER", wxSTC_ADA_CHARACTER }, --- 70,76 ---- // --------------------------------------------------------------------------- ! wxLuaBindDefine* wxLuaGetDefineList_wxstc(size_t &count) { ! static wxLuaBindDefine defineList[] = { { "wxSTC_ADA_CHARACTER", wxSTC_ADA_CHARACTER }, *************** *** 1433,1437 **** { 0, 0 }, }; ! count = (sizeof(defineList)/sizeof(defineList[0])) - 1; return defineList; } --- 1433,1437 ---- { 0, 0 }, }; ! count = sizeof(defineList)/sizeof(wxLuaBindDefine) - 1; return defineList; } *************** *** 1442,1453 **** // --------------------------------------------------------------------------- ! WXLUASTRING* wxLuaGetStringList_wxstc(size_t &count) { ! static WXLUASTRING stringList[] = { { 0, 0 }, }; ! count = (sizeof(stringList)/sizeof(stringList[0])) - 1; return stringList; } --- 1442,1453 ---- // --------------------------------------------------------------------------- ! wxLuaBindString* wxLuaGetStringList_wxstc(size_t &count) { ! static wxLuaBindString stringList[] = { { 0, 0 }, }; ! count = sizeof(stringList)/sizeof(wxLuaBindString) - 1; return stringList; } *************** *** 1457,1468 **** // --------------------------------------------------------------------------- ! WXLUAOBJECT* wxLuaGetObjectList_wxstc(size_t &count) { ! static WXLUAOBJECT objectList[] = { { 0, 0, 0, 0 }, }; ! count = (sizeof(objectList)/sizeof(objectList[0])) - 1; return objectList; } --- 1457,1468 ---- // --------------------------------------------------------------------------- ! wxLuaBindObject* wxLuaGetObjectList_wxstc(size_t &count) { ! static wxLuaBindObject objectList[] = { { 0, 0, 0, 0 }, }; ! count = sizeof(objectList)/sizeof(wxLuaBindObject) - 1; return objectList; } *************** *** 1476,1487 **** // --------------------------------------------------------------------------- ! WXLUAMETHOD* wxLuaGetFunctionList_wxstc(size_t &count) { ! static WXLUAMETHOD functionList[] = { ! { WXLUAMETHOD_CFUNCTION, 0, 0, 0 }, }; ! count = (sizeof(functionList)/sizeof(functionList[0])) - 1; return functionList; } --- 1476,1487 ---- // --------------------------------------------------------------------------- ! wxLuaBindMethod* wxLuaGetFunctionList_wxstc(size_t &count) { ! static wxLuaBindMethod functionList[] = { ! { 0, 0, 0, 0 }, }; ! count = sizeof(functionList)/sizeof(wxLuaBindMethod) - 1; return functionList; } *************** *** 1493,1499 **** // --------------------------------------------------------------------------- ! WXLUACLASS* wxLuaGetClassList_wxstc(size_t &count) { ! static WXLUACLASS classList[] = { { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl", NULL ,wxStyledTextCtrl_enums, wxStyledTextCtrl_enumCount, }, --- 1493,1499 ---- // --------------------------------------------------------------------------- ! wxLuaBindClass* wxLuaGetClassList_wxstc(size_t &count) { ! static wxLuaBindClass classList[] = { { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl", NULL ,wxStyledTextCtrl_enums, wxStyledTextCtrl_enumCount, }, *************** *** 1502,1506 **** { 0, 0, 0, 0, 0, 0, 0 }, }; ! count = (sizeof(classList)/sizeof(classList[0])) - 1; return classList; --- 1502,1506 ---- { 0, 0, 0, 0, 0, 0, 0 }, }; ! count = sizeof(classList)/sizeof(wxLuaBindClass) - 1; return classList; *************** *** 1513,1522 **** // binding class ! extern WXLUACLASS *wxLuaGetClassList_wxstc(size_t &count); ! extern WXLUADEFINE *wxLuaGetDefineList_wxstc(size_t &count); ! extern WXLUASTRING *wxLuaGetStringList_wxstc(size_t &count); ! extern WXLUAEVENT *wxLuaGetEventList_wxstc(size_t &count); ! extern WXLUAOBJECT *wxLuaGetObjectList_wxstc(size_t &count); ! extern WXLUAMETHOD *wxLuaGetFunctionList_wxstc(size_t &count); --- 1513,1522 ---- // binding class ! extern wxLuaBindClass *wxLuaGetClassList_wxstc(size_t &count); ! extern wxLuaBindDefine *wxLuaGetDefineList_wxstc(size_t &count); ! extern wxLuaBindString *wxLuaGetStringList_wxstc(size_t &count); ! extern wxLuaBindEvent *wxLuaGetEventList_wxstc(size_t &count); ! extern wxLuaBindObject *wxLuaGetObjectList_wxstc(size_t &count); ! extern wxLuaBindMethod *wxLuaGetFunctionList_wxstc(size_t &count); *************** *** 1525,1536 **** wxLuaBinding_wxstc::wxLuaBinding_wxstc() : wxLuaBinding() { ! m_bindingName = wxT("wxstc"); ! m_nameSpace = wxT("wx"); ! m_classList = wxLuaGetClassList_wxstc(m_classCount); ! m_defineList = wxLuaGetDefineList_wxstc(m_defineCount); ! m_stringList = wxLuaGetStringList_wxstc(m_stringCount); ! m_eventList = wxLuaGetEventList_wxstc(m_eventCount); ! m_objectList = wxLuaGetObjectList_wxstc(m_objectCount); ! m_functionList = wxLuaGetFunctionList_wxstc(m_functionCount); } --- 1525,1536 ---- wxLuaBinding_wxstc::wxLuaBinding_wxstc() : wxLuaBinding() { ! m_bindingName = wxT("wxstc"); ! m_nameSpace = wxT("wx"); ! m_classArray = wxLuaGetClassList_wxstc(m_classCount); ! m_defineArray = wxLuaGetDefineList_wxstc(m_defineCount); ! m_stringArray = wxLuaGetStringList_wxstc(m_stringCount); ! m_eventArray = wxLuaGetEventList_wxstc(m_eventCount); ! m_objectArray = wxLuaGetObjectList_wxstc(m_objectCount); ! m_functionArray = wxLuaGetFunctionList_wxstc(m_functionCount); } Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** stc.cpp 6 Jun 2007 03:53:39 -0000 1.34 --- stc.cpp 6 Jun 2007 23:43:14 -0000 1.35 *************** *** 27,33 **** int s_wxluatag_wxStyledTextCtrl = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_AddRefDocument[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxStyledTextCtrl_AddRefDocument(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextCtrl_AddRefDocument[1] = {{ wxLua_wxStyledTextCtrl_AddRefDocument, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStyledTextCtrl_AddRefDocument }}; // void AddRefDocument(void* docPointer); --- 27,33 ---- int s_wxluatag_wxStyledTextCtrl = -1; [...9600 lines suppressed...] ! { WXLUAMETHOD_METHOD, "SetModificationType", s_wxluafunc_wxLua_wxStyledTextEvent_SetModificationType, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetModifiers", s_wxluafunc_wxLua_wxStyledTextEvent_SetModifiers, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetPosition", s_wxluafunc_wxLua_wxStyledTextEvent_SetPosition, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetText", s_wxluafunc_wxLua_wxStyledTextEvent_SetText, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetWParam", s_wxluafunc_wxLua_wxStyledTextEvent_SetWParam, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetX", s_wxluafunc_wxLua_wxStyledTextEvent_SetX, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetY", s_wxluafunc_wxLua_wxStyledTextEvent_SetY, 1, NULL }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxStyledTextEvent", s_wxluafunc_wxLua_wxStyledTextEvent_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxStyledTextEvent_methodCount = sizeof(wxStyledTextEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxStyledTextEvent_enums[] = { { NULL, 0, }, }; ! int wxStyledTextEvent_enumCount = sizeof(wxStyledTextEvent_enums)/sizeof(wxLuaBindDefine) - 1; |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:47
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/modules/wxbindstc/include Modified Files: wxbind.h Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxbind.h 5 Jun 2007 21:07:24 -0000 1.22 --- wxbind.h 6 Jun 2007 23:43:14 -0000 1.23 *************** *** 26,32 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 8 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 8 // --------------------------------------------------------------------------- --- 26,32 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 9 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 9 // --------------------------------------------------------------------------- *************** *** 63,74 **** extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextCtrl; ! extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_methodCount; ! extern WXDLLIMPEXP_WXBINDSTC WXLUADEFINE wxStyledTextCtrl_enums[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_enumCount; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextEvent; ! extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_methodCount; ! extern WXDLLIMPEXP_WXBINDSTC WXLUADEFINE wxStyledTextEvent_enums[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_enumCount; --- 63,74 ---- extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextCtrl; ! extern WXDLLIMPEXP_WXBINDSTC wxLuaBindMethod wxStyledTextCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_methodCount; ! extern WXDLLIMPEXP_WXBINDSTC wxLuaBindDefine wxStyledTextCtrl_enums[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_enumCount; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextEvent; ! extern WXDLLIMPEXP_WXBINDSTC wxLuaBindMethod wxStyledTextEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_methodCount; ! extern WXDLLIMPEXP_WXBINDSTC wxLuaBindDefine wxStyledTextEvent_enums[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_enumCount; |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:31
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/docs Modified Files: binding.html changelog.txt Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** changelog.txt 31 May 2007 21:38:40 -0000 1.32 --- changelog.txt 6 Jun 2007 23:42:56 -0000 1.33 *************** *** 67,70 **** --- 67,76 ---- functions. + - Renamed WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT + structs to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, + wxLuaBindString, and wxLuaBindEvent. + - Renamed the GetLua[Class]List functions in wxLuaBindings to + Get[Class]Array, since they're C arrays not wxLists. + version 2.8.0.0 (released 24/12/2006) -------------------------------------------------------------------- Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** binding.html 31 May 2007 17:18:47 -0000 1.17 --- binding.html 6 Jun 2007 23:42:56 -0000 1.18 *************** *** 1,14 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> ! <html> ! <head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> ! <title>wxLua Binding HowTo</title> ! ! ! <meta content="John Labenski" name="author"> - </head> <body> --- 1,10 ---- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> ! <html><head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> ! + <title>wxLua Binding HowTo</title><meta content="John Labenski" name="author"></head> <body> *************** *** 334,338 **** <li>int s_wxluatag_CLASS_NAME for each class that is mapped ! through the WXLUACLASS struct and when the binding is initialized will contain the tag index that lua assigns to the class for the userdata.</li> --- 330,334 ---- <li>int s_wxluatag_CLASS_NAME for each class that is mapped ! through the wxLuaBindClass struct and when the binding is initialized will contain the tag index that lua assigns to the class for the userdata.</li> *************** *** 341,345 **** class methods.</li> ! <li>A WXLUAMETHOD struct for each class to map the method function names to the C functions.</li> --- 337,341 ---- class methods.</li> ! <li>A wxLuaBindMethod struct for each class to map the method function names to the C functions.</li> *************** *** 353,380 **** <ul> ! <li>A WXLUAEVENT struct that contains all the wxEventType values and their associated wxEvent classes to push into the lua binding table.</li> ! <li>A WXLUADEFINE struct that contains all the numerical values to push into the lua binding table.</li> ! <li>A ! WXLUASTRING struct that contains all the strings to push into the lua binding table.</li> ! <li>A WXLUAOBJECT struct that contains all the objects to push as userdata into the lua binding table.</li> ! <li>A ! WXLUAMETHOD struct that contains all the global C functions to push into the lua binding table.</li> ! <li>A ! WXLUACLASS struct that contains the class names, all ! the WXLUAMETHOD structs from each *.i generated cpp files, and their tags.</li> --- 349,373 ---- <ul> ! <li>A wxLuaBindEvent struct that contains all the wxEventType values and their associated wxEvent classes to push into the lua binding table.</li> ! <li>A wxLuaBindDefine struct that contains all the numerical values to push into the lua binding table.</li> ! <li>A wxLuaBindString struct that contains all the strings to push into the lua binding table.</li> ! <li>A wxLuaBindObject struct that contains all the objects to push as userdata into the lua binding table.</li> ! <li>A wxLuaBindMethod struct that contains all the global C functions to push into the lua binding table.</li> ! <li>A wxLuaBindClass struct that contains the class names, all ! the wxLuaBindMethod structs from each *.i generated cpp files, and their tags.</li> *************** *** 577,581 **** function.</li> ! </ul> <li><i><b>LuaTable --- 570,577 ---- function.</li> ! </ul><li style="font-weight: bold; font-style: italic;">IntArray_FromLuaTable</li><ul><li>The ! binding generator will read from lua a numerically indexed table of ! integers and create two parameters (int count, int* array) to pass ! to a function.</li><li>The int* array will be automatically deleted and the function should not take ownership of it and delete it itself.</li></ul> <li><i><b>LuaTable *************** *** 687,694 **** <br> - <b><i>%builtin - DEPRECATED - use %function</i><br> - - </b><br> - <i><b>%class [%delete] [%noclassinfo] [%encapsulate] ClassName [, BaseClassName] <br> --- 683,686 ---- *************** *** 1422,1425 **** <br> ! </body> ! </html> --- 1414,1416 ---- <br> ! </body></html> \ No newline at end of file |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:31
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** wxbind.h 5 Jun 2007 21:07:20 -0000 1.66 --- wxbind.h 6 Jun 2007 23:42:58 -0000 1.67 *************** *** 43,49 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 8 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 8 // --------------------------------------------------------------------------- --- 43,49 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' [...5157 lines suppressed...] ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxWizard_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizard_methodCount; ! extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxWizard_enums[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizard_enumCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardEvent; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxWizardEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardEvent_methodCount; ! extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxWizardEvent_enums[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardEvent_enumCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPage; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxWizardPage_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPage_methodCount; ! extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxWizardPage_enums[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPage_enumCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPageSimple; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxWizardPageSimple_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPageSimple_methodCount; ! extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxWizardPageSimple_enums[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPageSimple_enumCount; #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:30
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/bindings/wxwidgets Modified Files: appframe.i override.hpp wx_datatypes.lua Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** appframe.i 1 Jun 2007 18:19:46 -0000 1.34 --- appframe.i 6 Jun 2007 23:42:54 -0000 1.35 *************** *** 289,295 **** virtual void SetStatusText(const wxString& text, int number = 0) ! // %override void wxFrame::SetStatusWidths(lua table with number indexes and values) // C++ Func: virtual void SetStatusWidths(int n, int *widths) ! virtual void SetStatusWidths(LuaTable intTable) void SetToolBar(wxToolBar* toolBar) --- 289,295 ---- virtual void SetStatusText(const wxString& text, int number = 0) ! // void wxFrame::SetStatusWidths(lua table with number indexes and values) // C++ Func: virtual void SetStatusWidths(int n, int *widths) ! virtual void SetStatusWidths(IntArray_FromLuaTable intTable) void SetToolBar(wxToolBar* toolBar) *************** *** 346,356 **** virtual void SetStatusText(const wxString& text, int i = 0) ! // %override void wxStatusBar::SetStatusWidths(lua table with number indexes and values) // C++ Func: virtual void SetStatusWidths(int n, int *widths) ! virtual void SetStatusWidths(LuaTable intTable) ! // %override void wxStatusBar::SetStatusStyles(lua table with number indexes and values) // C++ Func: virtual void SetStatusStyles(int n, int *styles) ! virtual void SetStatusStyles(LuaTable intTable) %endclass --- 346,356 ---- virtual void SetStatusText(const wxString& text, int i = 0) ! // void wxStatusBar::SetStatusWidths(lua table with number indexes and values) // C++ Func: virtual void SetStatusWidths(int n, int *widths) ! virtual void SetStatusWidths(IntArray_FromLuaTable intTable) ! // void wxStatusBar::SetStatusStyles(lua table with number indexes and values) // C++ Func: virtual void SetStatusStyles(int n, int *styles) ! virtual void SetStatusStyles(IntArray_FromLuaTable intTable) %endclass Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** wx_datatypes.lua 19 May 2007 02:05:45 -0000 1.61 --- wx_datatypes.lua 6 Jun 2007 23:42:56 -0000 1.62 *************** *** 49,52 **** --- 49,57 ---- Name = "HANDLE", }, + IntArray_FromLuaTable = { + DefType = "special", + IsNumber = true, + Name = "IntArray_FromLuaTable", + }, LPCVOID = { DefType = "number", Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** override.hpp 5 Jun 2007 21:07:20 -0000 1.68 --- override.hpp 6 Jun 2007 23:42:54 -0000 1.69 *************** *** 25,58 **** %end - %override wxLua_wxFrame_SetStatusWidths - // virtual void SetStatusWidths(int n, int *widths) - static int LUACALL wxLua_wxFrame_SetStatusWidths(lua_State *L) - { - wxLuaState wxlState(L); - int count = 0; wxLuaSmartIntArray ptr; int *choices; ptr = choices = wxlState.GetIntArray(2, count); - // get this - wxFrame *self = (wxFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxFrame); - // call SetStatusWidths - self->SetStatusWidths(count, choices); - // return the number of parameters - return 0; - } - %end - - %override wxLua_wxStatusBar_SetStatusWidths - // virtual void SetStatusWidths(int n, int *widths) - static int LUACALL wxLua_wxStatusBar_SetStatusWidths(lua_State *L) - { - wxLuaState wxlState(L); - int count = 0; wxLuaSmartIntArray ptr; int *choices; ptr = choices = wxlState.GetIntArray(2, count); - // get this - wxStatusBar *self = (wxStatusBar *)wxlState.GetUserDataType(1, s_wxluatag_wxStatusBar); - // call SetStatusWidths - self->SetStatusWidths(count, choices); - // return the number of parameters - return 0; - } - %end - %override wxLua_wxStatusBar_SetFieldsCount // virtual void SetFieldsCount(int number = 1, int* widths = NULL) --- 25,28 ---- *************** *** 79,102 **** %end - %override wxLua_wxStatusBar_SetStatusStyles - // virtual void SetStatusStyles(int n, int* styles) - static int LUACALL wxLua_wxStatusBar_SetStatusStyles(lua_State *L) - { - wxLuaState wxlState(L); - int count = 0; wxLuaSmartIntArray ptr; int *styles; ptr = styles = wxlState.GetIntArray(2, count); - // get this - wxStatusBar *self = (wxStatusBar *)wxlState.GetUserDataType(1, s_wxluatag_wxStatusBar); - // call SetStatusStyles - self->SetStatusStyles(count, styles); - // return the number of parameters - return 0; - } - %end - %override wxLua_wxAcceleratorTable_constructor // wxAcceleratorTable(int n, wxAcceleratorEntry* entries) static int LUACALL wxLua_wxAcceleratorTable_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxAcceleratorEntry *pItems = NULL; --- 49,57 ---- %end %override wxLua_wxAcceleratorTable_constructor // wxAcceleratorTable(int n, wxAcceleratorEntry* entries) static int LUACALL wxLua_wxAcceleratorTable_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxAcceleratorEntry *pItems = NULL; *************** *** 894,898 **** static int LUACALL wxLua_wxString_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxString* returns; --- 849,853 ---- static int LUACALL wxLua_wxString_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxString* returns; *************** *** 916,920 **** static int LUACALL wxLua_wxClassInfo_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxClassInfo *returns; --- 871,875 ---- static int LUACALL wxLua_wxClassInfo_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxClassInfo *returns; *************** *** 949,953 **** wxObject *pObject = (wxObject *)wxlState.ttouserdata( 1 ); ! const WXLUACLASS *pClass = wxlState.GetLuaClass(className); if (pClass && pClass->pClassInfo) { --- 904,908 ---- wxObject *pObject = (wxObject *)wxlState.ttouserdata( 1 ); ! const wxLuaBindClass *pClass = wxlState.GetLuaClass(className); if (pClass && pClass->pClassInfo) { *************** *** 991,995 **** static int LUACALL wxLua_wxTextValidator_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxTextValidator *returns; --- 946,950 ---- static int LUACALL wxLua_wxTextValidator_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxTextValidator *returns; *************** *** 1081,1085 **** static int LUACALL wxLua_wxGenericValidatorBool_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxGenericValidator *returns; --- 1036,1040 ---- static int LUACALL wxLua_wxGenericValidatorBool_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxGenericValidator *returns; *************** *** 1101,1105 **** static int LUACALL wxLua_wxGenericValidatorString_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxGenericValidator *returns; --- 1056,1060 ---- static int LUACALL wxLua_wxGenericValidatorString_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxGenericValidator *returns; *************** *** 1121,1125 **** static int LUACALL wxLua_wxGenericValidatorInt_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxGenericValidator *returns; --- 1076,1080 ---- static int LUACALL wxLua_wxGenericValidatorInt_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxGenericValidator *returns; *************** *** 1141,1145 **** static int LUACALL wxLua_wxGenericValidatorArray_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxGenericValidator *returns; --- 1096,1100 ---- static int LUACALL wxLua_wxGenericValidatorArray_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxGenericValidator *returns; *************** *** 1183,1187 **** static int LUACALL wxLua_wxStringList_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxStringList *returns; --- 1138,1142 ---- static int LUACALL wxLua_wxStringList_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxStringList *returns; *************** *** 1401,1405 **** static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxBusyCursor *returns; --- 1356,1360 ---- static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxBusyCursor *returns; *************** *** 1503,1507 **** static int LUACALL wxLua_wxSingleChoiceDialog_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxSingleChoiceDialog *returns; --- 1458,1462 ---- static int LUACALL wxLua_wxSingleChoiceDialog_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxSingleChoiceDialog *returns; *************** *** 2426,2430 **** static int LUACALL wxLua_wxBitmapFromData_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxBitmap *returns; --- 2381,2385 ---- static int LUACALL wxLua_wxBitmapFromData_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxBitmap *returns; *************** *** 2457,2461 **** static int LUACALL wxLua_wxBitmapFromXPMData_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxBitmap *returns; --- 2412,2416 ---- static int LUACALL wxLua_wxBitmapFromXPMData_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxBitmap *returns; *************** *** 3077,3081 **** static int LUACALL wxLua_wxImageFromData_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxImage *returns; --- 3032,3036 ---- static int LUACALL wxLua_wxImageFromData_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxImage *returns; *************** *** 3105,3109 **** static int LUACALL wxLua_wxImageFromBitmap_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxImage *returns; --- 3060,3064 ---- static int LUACALL wxLua_wxImageFromBitmap_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxImage *returns; *************** *** 3443,3447 **** static int LUACALL wxLua_wxCreateMenu_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxMenu *returns; --- 3398,3402 ---- static int LUACALL wxLua_wxCreateMenu_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxMenu *returns; *************** *** 3569,3573 **** static int LUACALL wxLua_wxMenuItem_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxMenuItem *returns; --- 3524,3528 ---- static int LUACALL wxLua_wxMenuItem_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxMenuItem *returns; *************** *** 3734,3738 **** static int LUACALL wxLua_wxPrintPreview_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxPrintPreview *returns; --- 3689,3693 ---- static int LUACALL wxLua_wxPrintPreview_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxPrintPreview *returns; *************** *** 4394,4398 **** static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaObject *returns; --- 4349,4353 ---- static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxLuaObject *returns; *************** *** 4440,4444 **** static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaPrintout *returns; --- 4395,4399 ---- static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxLuaPrintout *returns; *************** *** 4464,4468 **** static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaHtmlWindow *returns; --- 4419,4423 ---- static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxLuaHtmlWindow *returns; |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:29
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan_bind.cpp Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxluacan.cpp 5 Jun 2007 21:07:20 -0000 1.27 --- wxluacan.cpp 6 Jun 2007 23:42:53 -0000 1.28 *************** *** 27,33 **** int s_wxluatag_wxlCanObj = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxlCanObj, 0 }; static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_AddObject }}; // void AddObject( wxlCanObj *canobj ) --- 27,33 ---- int s_wxluatag_wxlCanObj = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_AddObject }}; // void AddObject( wxlCanObj *canobj ) *************** *** 45,51 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetX[] = { &s_wxluatag_wxlCanObj, 0 }; static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetX }}; // double GetX() --- 45,51 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetX[] = { &s_wxluatag_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetX }}; // double GetX() *************** *** 64,70 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetY[] = { &s_wxluatag_wxlCanObj, 0 }; static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetY }}; // double GetY() --- 64,70 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetY[] = { &s_wxluatag_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetY }}; // double GetY() *************** *** 85,91 **** #if wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxBrush, 0 }; static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }}; // void SetBrush( const wxBrush& brush ) --- 85,91 ---- #if wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxBrush, NULL }; static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }}; // void SetBrush( const wxBrush& brush ) *************** *** 103,109 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxPen, 0 }; static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPen }}; // void SetPen( const wxPen& pen ) --- 103,109 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxPen, NULL }; static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPen }}; // void SetPen( const wxPen& pen ) *************** *** 123,129 **** #endif // wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Boolean, 0 }; static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPending }}; // void SetPending( bool pending = true ) --- 123,129 ---- #endif // wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPending }}; // void SetPending( bool pending = true ) *************** *** 143,149 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxlCanObj_SetPos }}; // void SetPos( double x, double y ) --- 143,149 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxlCanObj_SetPos }}; // void SetPos( double x, double y ) *************** *** 163,174 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxlCanObj_constructor }}; // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObj *returns; --- 163,174 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxlCanObj_constructor }}; // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxlCanObj *returns; *************** *** 190,217 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxlCanObj_methods[] = { ! { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCanObj_AddObject, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxlCanObj_GetX, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxlCanObj_GetY, 1, 0 }, #if wxLUA_USE_wxColourPenBrush ! { WXLUAMETHOD_METHOD, "SetBrush", s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetPen", s_wxluafunc_wxLua_wxlCanObj_SetPen, 1, 0 }, #endif // wxLUA_USE_wxColourPenBrush ! { WXLUAMETHOD_METHOD, "SetPending", s_wxluafunc_wxLua_wxlCanObj_SetPending, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetPos", s_wxluafunc_wxLua_wxlCanObj_SetPos, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObj", s_wxluafunc_wxLua_wxlCanObj_constructor, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]) - 1; ! WXLUADEFINE wxlCanObj_enums[] = { { NULL, 0, }, }; ! int wxlCanObj_enumCount = sizeof(wxlCanObj_enums)/sizeof(wxlCanObj_enums[0]) - 1; // --------------------------------------------------------------------------- --- 190,217 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxlCanObj_methods[] = { ! { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCanObj_AddObject, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxlCanObj_GetX, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxlCanObj_GetY, 1, NULL }, #if wxLUA_USE_wxColourPenBrush ! { WXLUAMETHOD_METHOD, "SetBrush", s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetPen", s_wxluafunc_wxLua_wxlCanObj_SetPen, 1, NULL }, #endif // wxLUA_USE_wxColourPenBrush ! { WXLUAMETHOD_METHOD, "SetPending", s_wxluafunc_wxLua_wxlCanObj_SetPending, 1, NULL }, ! { WXLUAMETHOD_METHOD, "SetPos", s_wxluafunc_wxLua_wxlCanObj_SetPos, 1, NULL }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObj", s_wxluafunc_wxLua_wxlCanObj_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxlCanObj_enums[] = { { NULL, 0, }, }; ! int wxlCanObj_enumCount = sizeof(wxlCanObj_enums)/sizeof(wxLuaBindDefine) - 1; // --------------------------------------------------------------------------- *************** *** 222,233 **** int s_wxluatag_wxlCanObjRect = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjRect_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }}; // wxlCanObjRect( double x, double y, double w, double h ) static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjRect *returns; --- 222,233 ---- int s_wxluatag_wxlCanObjRect = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjRect_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }}; // wxlCanObjRect( double x, double y, double w, double h ) static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjRect *returns; *************** *** 251,267 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxlCanObjRect_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjRect", s_wxluafunc_wxLua_wxlCanObjRect_constructor, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]) - 1; ! WXLUADEFINE wxlCanObjRect_enums[] = { { NULL, 0, }, }; ! int wxlCanObjRect_enumCount = sizeof(wxlCanObjRect_enums)/sizeof(wxlCanObjRect_enums[0]) - 1; // --------------------------------------------------------------------------- --- 251,267 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxlCanObjRect_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjRect", s_wxluafunc_wxLua_wxlCanObjRect_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxlCanObjRect_enums[] = { { NULL, 0, }, }; ! int wxlCanObjRect_enumCount = sizeof(wxlCanObjRect_enums)/sizeof(wxLuaBindDefine) - 1; // --------------------------------------------------------------------------- *************** *** 272,283 **** int s_wxluatag_wxlCanObjCircle = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjCircle_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }}; // wxlCanObjCircle( double x, double y, double r ) static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjCircle *returns; --- 272,283 ---- int s_wxluatag_wxlCanObjCircle = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjCircle_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }}; // wxlCanObjCircle( double x, double y, double r ) static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjCircle *returns; *************** *** 299,315 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxlCanObjCircle_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjCircle", s_wxluafunc_wxLua_wxlCanObjCircle_constructor, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]) - 1; ! WXLUADEFINE wxlCanObjCircle_enums[] = { { NULL, 0, }, }; ! int wxlCanObjCircle_enumCount = sizeof(wxlCanObjCircle_enums)/sizeof(wxlCanObjCircle_enums[0]) - 1; // --------------------------------------------------------------------------- --- 299,315 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxlCanObjCircle_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjCircle", s_wxluafunc_wxLua_wxlCanObjCircle_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxlCanObjCircle_enums[] = { { NULL, 0, }, }; ! int wxlCanObjCircle_enumCount = sizeof(wxlCanObjCircle_enums)/sizeof(wxLuaBindDefine) - 1; // --------------------------------------------------------------------------- *************** *** 320,331 **** int s_wxluatag_wxlCanObjScript = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }}; // wxlCanObjScript( double x, double y, const wxString& name ) static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjScript *returns; --- 320,331 ---- int s_wxluatag_wxlCanObjScript = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }}; // wxlCanObjScript( double x, double y, const wxString& name ) static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjScript *returns; *************** *** 347,363 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxlCanObjScript_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjScript", s_wxluafunc_wxLua_wxlCanObjScript_constructor, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]) - 1; ! WXLUADEFINE wxlCanObjScript_enums[] = { { NULL, 0, }, }; ! int wxlCanObjScript_enumCount = sizeof(wxlCanObjScript_enums)/sizeof(wxlCanObjScript_enums[0]) - 1; // --------------------------------------------------------------------------- --- 347,363 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxlCanObjScript_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjScript", s_wxluafunc_wxLua_wxlCanObjScript_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxlCanObjScript_enums[] = { { NULL, 0, }, }; ! int wxlCanObjScript_enumCount = sizeof(wxlCanObjScript_enums)/sizeof(wxLuaBindDefine) - 1; // --------------------------------------------------------------------------- *************** *** 368,374 **** int s_wxluatag_wxlCanObjAddScript = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluatag_wxlCanObjAddScript, &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }}; // void SetScript( const wxString& script ) --- 368,374 ---- int s_wxluatag_wxlCanObjAddScript = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluatag_wxlCanObjAddScript, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }}; // void SetScript( const wxString& script ) *************** *** 386,397 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }}; // wxlCanObjAddScript( double x, double y, const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjAddScript *returns; --- 386,397 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }}; // wxlCanObjAddScript( double x, double y, const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjAddScript *returns; *************** *** 413,430 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxlCanObjAddScript_methods[] = { ! { WXLUAMETHOD_METHOD, "SetScript", s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjAddScript", s_wxluafunc_wxLua_wxlCanObjAddScript_constructor, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]) - 1; ! WXLUADEFINE wxlCanObjAddScript_enums[] = { { NULL, 0, }, }; ! int wxlCanObjAddScript_enumCount = sizeof(wxlCanObjAddScript_enums)/sizeof(wxlCanObjAddScript_enums[0]) - 1; // --------------------------------------------------------------------------- --- 413,430 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxlCanObjAddScript_methods[] = { ! { WXLUAMETHOD_METHOD, "SetScript", s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript, 1, NULL }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjAddScript", s_wxluafunc_wxLua_wxlCanObjAddScript_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxlCanObjAddScript_enums[] = { { NULL, 0, }, }; ! int wxlCanObjAddScript_enumCount = sizeof(wxlCanObjAddScript_enums)/sizeof(wxLuaBindDefine) - 1; // --------------------------------------------------------------------------- *************** *** 435,441 **** int s_wxluatag_wxlCan = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_AddObject[] = { &s_wxluatag_wxlCan, &s_wxluatag_wxlCanObj, 0 }; static int LUACALL wxLua_wxlCan_AddObject(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCan_AddObject }}; // void AddObject( wxlCanObj *canobj ) --- 435,441 ---- int s_wxluatag_wxlCan = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_AddObject[] = { &s_wxluatag_wxlCan, &s_wxluatag_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCan_AddObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCan_AddObject }}; // void AddObject( wxlCanObj *canobj ) *************** *** 453,459 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetCmdh[] = { &s_wxluatag_wxlCan, 0 }; static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetCmdh }}; // wxlLuaCanCmd* GetCmdh() --- 453,459 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetCmdh[] = { &s_wxluatag_wxlCan, NULL }; static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetCmdh }}; // wxlLuaCanCmd* GetCmdh() *************** *** 472,478 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetYaxis[] = { &s_wxluatag_wxlCan, 0 }; static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetYaxis }}; // bool GetYaxis() --- 472,478 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetYaxis[] = { &s_wxluatag_wxlCan, NULL }; static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetYaxis }}; // bool GetYaxis() *************** *** 493,504 **** #if wxLUA_USE_wxPointSizeRect ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, 0 }; static int LUACALL wxLua_wxlCan_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 4, s_wxluatagArray_wxLua_wxlCan_constructor }}; // wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) static int LUACALL wxLua_wxlCan_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCan *returns; --- 493,504 ---- #if wxLUA_USE_wxPointSizeRect ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, NULL }; static int LUACALL wxLua_wxlCan_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 4, s_wxluatagArray_wxLua_wxlCan_constructor }}; // wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) static int LUACALL wxLua_wxlCan_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxlCan *returns; *************** *** 526,549 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxlCan_methods[] = { ! { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCan_AddObject, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetCmdh", s_wxluafunc_wxLua_wxlCan_GetCmdh, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetYaxis", s_wxluafunc_wxLua_wxlCan_GetYaxis, 1, 0 }, #if wxLUA_USE_wxPointSizeRect ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCan", s_wxluafunc_wxLua_wxlCan_constructor, 1, 0 }, #endif // wxLUA_USE_wxPointSizeRect ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]) - 1; ! WXLUADEFINE wxlCan_enums[] = { { NULL, 0, }, }; ! int wxlCan_enumCount = sizeof(wxlCan_enums)/sizeof(wxlCan_enums[0]) - 1; // --------------------------------------------------------------------------- --- 526,549 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxlCan_methods[] = { ! { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCan_AddObject, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetCmdh", s_wxluafunc_wxLua_wxlCan_GetCmdh, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetYaxis", s_wxluafunc_wxLua_wxlCan_GetYaxis, 1, NULL }, #if wxLUA_USE_wxPointSizeRect ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCan", s_wxluafunc_wxLua_wxlCan_constructor, 1, NULL }, #endif // wxLUA_USE_wxPointSizeRect ! { 0, 0, 0, 0 }, }; ! int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxlCan_enums[] = { { NULL, 0, }, }; ! int wxlCan_enumCount = sizeof(wxlCan_enums)/sizeof(wxLuaBindDefine) - 1; // --------------------------------------------------------------------------- *************** *** 554,560 **** int s_wxluatag_wxlLuaCanCmd = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluatag_wxlLuaCanCmd, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }}; // void MoveObject( int index, double x, double y ) --- 554,560 ---- int s_wxluatag_wxlLuaCanCmd = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluatag_wxlLuaCanCmd, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }}; // void MoveObject( int index, double x, double y ) *************** *** 576,587 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }}; // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlLuaCanCmd *returns; --- 576,587 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }}; // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxlLuaCanCmd *returns; *************** *** 603,619 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxlLuaCanCmd_methods[] = { ! { WXLUAMETHOD_METHOD, "MoveObject", s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlLuaCanCmd", s_wxluafunc_wxLua_wxlLuaCanCmd_constructor, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]) - 1; ! WXLUADEFINE wxlLuaCanCmd_enums[] = { { NULL, 0, }, }; ! int wxlLuaCanCmd_enumCount = sizeof(wxlLuaCanCmd_enums)/sizeof(wxlLuaCanCmd_enums[0]) - 1; --- 603,619 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxlLuaCanCmd_methods[] = { ! { WXLUAMETHOD_METHOD, "MoveObject", s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject, 1, NULL }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlLuaCanCmd", s_wxluafunc_wxLua_wxlLuaCanCmd_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxlLuaCanCmd_enums[] = { { NULL, 0, }, }; ! int wxlLuaCanCmd_enumCount = sizeof(wxlLuaCanCmd_enums)/sizeof(wxLuaBindDefine) - 1; Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxluacan_bind.cpp 5 Jun 2007 21:07:20 -0000 1.19 --- wxluacan_bind.cpp 6 Jun 2007 23:42:53 -0000 1.20 *************** *** 24,35 **** // --------------------------------------------------------------------------- ! WXLUAEVENT* wxLuaGetEventList_wxluacan(size_t &count) { ! static WXLUAEVENT eventList[] = { { 0, 0, 0 }, }; ! count = (sizeof(eventList)/sizeof(eventList[0])) - 1; return eventList; } --- 24,35 ---- // --------------------------------------------------------------------------- ! wxLuaBindEvent* wxLuaGetEventList_wxluacan(size_t &count) { ! static wxLuaBindEvent eventList[] = { { 0, 0, 0 }, }; ! count = sizeof(eventList)/sizeof(wxLuaBindEvent) - 1; return eventList; } *************** *** 39,50 **** // --------------------------------------------------------------------------- ! WXLUADEFINE* wxLuaGetDefineList_wxluacan(size_t &count) { ! static WXLUADEFINE defineList[] = { { 0, 0 }, }; ! count = (sizeof(defineList)/sizeof(defineList[0])) - 1; return defineList; } --- 39,50 ---- // --------------------------------------------------------------------------- ! wxLuaBindDefine* wxLuaGetDefineList_wxluacan(size_t &count) { ! static wxLuaBindDefine defineList[] = { { 0, 0 }, }; ! count = sizeof(defineList)/sizeof(wxLuaBindDefine) - 1; return defineList; } *************** *** 55,66 **** // --------------------------------------------------------------------------- ! WXLUASTRING* wxLuaGetStringList_wxluacan(size_t &count) { ! static WXLUASTRING stringList[] = { { 0, 0 }, }; ! count = (sizeof(stringList)/sizeof(stringList[0])) - 1; return stringList; } --- 55,66 ---- // --------------------------------------------------------------------------- ! wxLuaBindString* wxLuaGetStringList_wxluacan(size_t &count) { ! static wxLuaBindString stringList[] = { { 0, 0 }, }; ! count = sizeof(stringList)/sizeof(wxLuaBindString) - 1; return stringList; } *************** *** 70,81 **** // --------------------------------------------------------------------------- ! WXLUAOBJECT* wxLuaGetObjectList_wxluacan(size_t &count) { ! static WXLUAOBJECT objectList[] = { { 0, 0, 0, 0 }, }; ! count = (sizeof(objectList)/sizeof(objectList[0])) - 1; return objectList; } --- 70,81 ---- // --------------------------------------------------------------------------- ! wxLuaBindObject* wxLuaGetObjectList_wxluacan(size_t &count) { ! static wxLuaBindObject objectList[] = { { 0, 0, 0, 0 }, }; ! count = sizeof(objectList)/sizeof(wxLuaBindObject) - 1; return objectList; } *************** *** 98,102 **** } ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; // %function wxlLuaCanCmd* GetCmdhMain() --- 98,102 ---- } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; // %function wxlLuaCanCmd* GetCmdhMain() *************** *** 113,117 **** } ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; // --------------------------------------------------------------------------- --- 113,117 ---- } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; // --------------------------------------------------------------------------- *************** *** 119,132 **** // --------------------------------------------------------------------------- ! WXLUAMETHOD* wxLuaGetFunctionList_wxluacan(size_t &count) { ! static WXLUAMETHOD functionList[] = { ! { WXLUAMETHOD_CFUNCTION, "GetCan", s_wxluafunc_wxLua_function_GetCan, 1, 0 }, ! { WXLUAMETHOD_CFUNCTION, "GetCmdhMain", s_wxluafunc_wxLua_function_GetCmdhMain, 1, 0 }, ! { WXLUAMETHOD_CFUNCTION, 0, 0, 0 }, }; ! count = (sizeof(functionList)/sizeof(functionList[0])) - 1; return functionList; } --- 119,132 ---- // --------------------------------------------------------------------------- ! wxLuaBindMethod* wxLuaGetFunctionList_wxluacan(size_t &count) { ! static wxLuaBindMethod functionList[] = { ! { WXLUAMETHOD_CFUNCTION, "GetCan", s_wxluafunc_wxLua_function_GetCan, 1, NULL }, ! { WXLUAMETHOD_CFUNCTION, "GetCmdhMain", s_wxluafunc_wxLua_function_GetCmdhMain, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! count = sizeof(functionList)/sizeof(wxLuaBindMethod) - 1; return functionList; } *************** *** 138,144 **** // --------------------------------------------------------------------------- ! WXLUACLASS* wxLuaGetClassList_wxluacan(size_t &count) { ! static WXLUACLASS classList[] = { { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL ,wxlCan_enums, wxlCan_enumCount, }, --- 138,144 ---- // --------------------------------------------------------------------------- ! wxLuaBindClass* wxLuaGetClassList_wxluacan(size_t &count) { ! static wxLuaBindClass classList[] = { { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL ,wxlCan_enums, wxlCan_enumCount, }, *************** *** 152,156 **** { 0, 0, 0, 0, 0, 0, 0 }, }; ! count = (sizeof(classList)/sizeof(classList[0])) - 1; return classList; --- 152,156 ---- { 0, 0, 0, 0, 0, 0, 0 }, }; ! count = sizeof(classList)/sizeof(wxLuaBindClass) - 1; return classList; *************** *** 163,172 **** // binding class ! extern WXLUACLASS *wxLuaGetClassList_wxluacan(size_t &count); ! extern WXLUADEFINE *wxLuaGetDefineList_wxluacan(size_t &count); ! extern WXLUASTRING *wxLuaGetStringList_wxluacan(size_t &count); ! extern WXLUAEVENT *wxLuaGetEventList_wxluacan(size_t &count); ! extern WXLUAOBJECT *wxLuaGetObjectList_wxluacan(size_t &count); ! extern WXLUAMETHOD *wxLuaGetFunctionList_wxluacan(size_t &count); --- 163,172 ---- // binding class ! extern wxLuaBindClass *wxLuaGetClassList_wxluacan(size_t &count); ! extern wxLuaBindDefine *wxLuaGetDefineList_wxluacan(size_t &count); ! extern wxLuaBindString *wxLuaGetStringList_wxluacan(size_t &count); ! extern wxLuaBindEvent *wxLuaGetEventList_wxluacan(size_t &count); ! extern wxLuaBindObject *wxLuaGetObjectList_wxluacan(size_t &count); ! extern wxLuaBindMethod *wxLuaGetFunctionList_wxluacan(size_t &count); *************** *** 175,186 **** wxLuaBinding_wxluacan::wxLuaBinding_wxluacan() : wxLuaBinding() { ! m_bindingName = wxT("wxluacan"); ! m_nameSpace = wxT("wxluacan"); ! m_classList = wxLuaGetClassList_wxluacan(m_classCount); ! m_defineList = wxLuaGetDefineList_wxluacan(m_defineCount); ! m_stringList = wxLuaGetStringList_wxluacan(m_stringCount); ! m_eventList = wxLuaGetEventList_wxluacan(m_eventCount); ! m_objectList = wxLuaGetObjectList_wxluacan(m_objectCount); ! m_functionList = wxLuaGetFunctionList_wxluacan(m_functionCount); } --- 175,186 ---- wxLuaBinding_wxluacan::wxLuaBinding_wxluacan() : wxLuaBinding() { ! m_bindingName = wxT("wxluacan"); ! m_nameSpace = wxT("wxluacan"); ! m_classArray = wxLuaGetClassList_wxluacan(m_classCount); ! m_defineArray = wxLuaGetDefineList_wxluacan(m_defineCount); ! m_stringArray = wxLuaGetStringList_wxluacan(m_stringCount); ! m_eventArray = wxLuaGetEventList_wxluacan(m_eventCount); ! m_objectArray = wxLuaGetObjectList_wxluacan(m_objectCount); ! m_functionArray = wxLuaGetFunctionList_wxluacan(m_functionCount); } Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxluacan.h 5 Jun 2007 21:07:20 -0000 1.24 --- wxluacan.h 6 Jun 2007 23:42:53 -0000 1.25 *************** *** 18,24 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 8 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 8 // --------------------------------------------------------------------------- --- 18,24 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 9 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 9 // --------------------------------------------------------------------------- *************** *** 58,94 **** extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCan_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObj_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjAddScript_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjCircle_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjRect_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjScript_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd; ! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; ! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlLuaCanCmd_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_enumCount; --- 58,94 ---- extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCan_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObj_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjAddScript_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjCircle_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjRect_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjScript_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; ! extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlLuaCanCmd_enums[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_enumCount; |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:28
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/bindings Modified Files: genwxbind.lua Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** genwxbind.lua 6 Jun 2007 03:46:37 -0000 1.113 --- genwxbind.lua 6 Jun 2007 23:42:53 -0000 1.114 *************** *** 18,22 **** -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 8 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. --- 18,22 ---- -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 9 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. *************** *** 269,272 **** --- 269,273 ---- AllocDataType("wxArrayString_FromLuaTable", "special", true) AllocDataType("wxArrayInt_FromLuaTable", "special", true) + AllocDataType("IntArray_FromLuaTable", "special", true) -- attributes that can precede a data type (must set equal to true) *************** *** 2762,2766 **** overload_argListName = "s_wxluaargArray_None" else ! overload_argList = "{ "..overload_argList.."0 }" end --- 2763,2767 ---- overload_argListName = "s_wxluaargArray_None" else ! overload_argList = "{ "..overload_argList.."NULL }" end *************** *** 2778,2782 **** FuncMap = "{ "..funcName..", WXLUAMETHOD_METHOD, 1, 1, "..overload_argListName.." }", FuncMapName = funcMapName, ! Map = " { WXLUAMETHOD_METHOD, \""..memberGetFunc.."\", "..funcMapName..", 1, 0 },\n", Condition = membercondition } --- 2779,2783 ---- FuncMap = "{ "..funcName..", WXLUAMETHOD_METHOD, 1, 1, "..overload_argListName.." }", FuncMapName = funcMapName, ! Map = " { WXLUAMETHOD_METHOD, \""..memberGetFunc.."\", "..funcMapName..", 1, NULL },\n", Condition = membercondition } *************** *** 2787,2791 **** LuaName = member.Name, FuncType = "WXLUAMETHOD_GETPROP", ! Map = " { WXLUAMETHOD_GETPROP, \""..member.Name.."\", "..funcMapName..", 1, 0 },\n", Condition = membercondition } --- 2788,2792 ---- LuaName = member.Name, FuncType = "WXLUAMETHOD_GETPROP", ! Map = " { WXLUAMETHOD_GETPROP, \""..member.Name.."\", "..funcMapName..", 1, NULL },\n", Condition = membercondition } *************** *** 2851,2855 **** overload_argListName = "s_wxluaargArray_None" else ! overload_argList = "{ "..overload_argList.."0 }" end --- 2852,2856 ---- overload_argListName = "s_wxluaargArray_None" else ! overload_argList = "{ "..overload_argList.."NULL }" end *************** *** 2867,2871 **** FuncMap = "{ "..funcName..", WXLUAMETHOD_METHOD, 2, 2, "..overload_argListName.." }", -- FIXME make sure this is right FuncMapName = funcMapName, ! Map = " { WXLUAMETHOD_METHOD, \""..memberSetFunc.."\", "..funcMapName..", 1, 0 },\n", Condition = membercondition } --- 2868,2872 ---- FuncMap = "{ "..funcName..", WXLUAMETHOD_METHOD, 2, 2, "..overload_argListName.." }", -- FIXME make sure this is right FuncMapName = funcMapName, ! Map = " { WXLUAMETHOD_METHOD, \""..memberSetFunc.."\", "..funcMapName..", 1, NULL },\n", Condition = membercondition } *************** *** 2876,2880 **** LuaName = member.Name, FuncType = "WXLUAMETHOD_SETPROP", ! Map = " { WXLUAMETHOD_SETPROP, \""..member.Name.."\", "..funcMapName..", 1, 0 },\n", Condition = fullcondition } --- 2877,2881 ---- LuaName = member.Name, FuncType = "WXLUAMETHOD_SETPROP", ! Map = " { WXLUAMETHOD_SETPROP, \""..member.Name.."\", "..funcMapName..", 1, NULL },\n", Condition = fullcondition } *************** *** 2980,2984 **** { LuaName = luaname, ! Map = " { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", &"..member.Name..", 0 },\n", Condition = fullcondition } --- 2981,2985 ---- { LuaName = luaname, ! Map = " { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", &"..member.Name..", NULL },\n", Condition = fullcondition } *************** *** 2995,2999 **** { LuaName = luaname, ! Map = " { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", 0, (const void **) &"..member.Name.." },\n", Condition = fullcondition } --- 2996,3000 ---- { LuaName = luaname, ! Map = " { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", NULL, (const void **) &"..member.Name.." },\n", Condition = fullcondition } *************** *** 3084,3087 **** --- 3085,3093 ---- argItem = "wxArrayInt(); wxlState.GetwxArrayInt("..argNum..", "..argName..")" declare = "wxArrayInt " + elseif argType == "IntArray_FromLuaTable" then + overload_argList = overload_argList.."&s_wxluaarg_LuaTable, " + argItem = "NULL; ptr = "..argName.." = wxlState.GetIntArray("..argNum..", count_)" + declare = "int count_ = 0; wxLuaSmartIntArray ptr; int*" + argList = argList.."count_, " elseif argType == "LuaTable" then -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList *************** *** 3334,3338 **** table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n") if member.IsConstructor then ! table.insert(codeList, " wxlua_removetableforcall(L);\n") end table.insert(codeList, " wxLuaState wxlState(L);\n") --- 3340,3344 ---- table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n") if member.IsConstructor then ! table.insert(codeList, " wxluabind_removetableforcall(L);\n") end table.insert(codeList, " wxLuaState wxlState(L);\n") *************** *** 3565,3569 **** overload_argListName = "s_wxluaargArray_None" else ! overload_argList = "{ "..overload_argList.."0 }" end --- 3571,3575 ---- overload_argListName = "s_wxluaargArray_None" else ! overload_argList = "{ "..overload_argList.."NULL }" end *************** *** 3571,3575 **** local funcMapName = "s_wxluafunc_"..funcName local funcMap = "{ "..funcName..", "..funcType..", "..tostring(requiredParamCount)..", "..tostring(paramCount)..", "..overload_argListName.." }" ! local methodMap = " { "..funcType..", \""..funcLuaCall.."\", "..funcMapName..", 1, 0 },\n" -- build method condition --- 3577,3581 ---- local funcMapName = "s_wxluafunc_"..funcName local funcMap = "{ "..funcName..", "..funcType..", "..tostring(requiredParamCount)..", "..tostring(paramCount)..", "..overload_argListName.." }" ! local methodMap = " { "..funcType..", \""..funcLuaCall.."\", "..funcMapName..", 1, NULL },\n" -- build method condition *************** *** 3648,3654 **** { ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ! ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." WXLUAMETHOD "..MakeVar(parseObject.Name).."_methods[];\n", ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", ! ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." WXLUADEFINE "..MakeVar(parseObject.Name).."_enums[];\n", ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_enumCount;\n", Condition = tagcondition --- 3654,3660 ---- { ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ! ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", ! ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindDefine "..MakeVar(parseObject.Name).."_enums[];\n", ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_enumCount;\n", Condition = tagcondition *************** *** 3698,3702 **** local overload_argListName = "s_wxluatagArray_".. funcName ! local overload_argList = "{ &s_wxluatag_"..MakeClassVar(parseObject.Name)..", 0 }" local condition = FixCondition(parseObject.Condition) --- 3704,3708 ---- local overload_argListName = "s_wxluatagArray_".. funcName ! local overload_argList = "{ &s_wxluatag_"..MakeClassVar(parseObject.Name)..", NULL }" local condition = FixCondition(parseObject.Condition) *************** *** 3714,3718 **** ParamCount = 1, RequiredParamCount = 1, ! Map = " { WXLUAMETHOD_METHOD, \"Delete\", "..funcMapName..", 1, 0 },\n", Condition = condition } --- 3720,3724 ---- ParamCount = 1, RequiredParamCount = 1, ! Map = " { WXLUAMETHOD_METHOD, \"Delete\", "..funcMapName..", 1, NULL },\n", Condition = condition } *************** *** 4031,4036 **** table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! table.insert(fileData, "WXLUACLASS* "..hook_cpp_class_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static WXLUACLASS classList[] =\n {\n") local namedBindingTable = {} --- 4037,4042 ---- table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! table.insert(fileData, "wxLuaBindClass* "..hook_cpp_class_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static wxLuaBindClass classList[] =\n {\n") local namedBindingTable = {} *************** *** 4044,4048 **** table.insert(fileData, " { 0, 0, 0, 0, 0, 0, 0 }, \n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = (sizeof(classList)/sizeof(classList[0])) - 1;\n\n") table.insert(fileData, " return classList;\n") table.insert(fileData, "}\n") --- 4050,4054 ---- table.insert(fileData, " { 0, 0, 0, 0, 0, 0, 0 }, \n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = sizeof(classList)/sizeof(wxLuaBindClass) - 1;\n\n") table.insert(fileData, " return classList;\n") table.insert(fileData, "}\n") *************** *** 4059,4068 **** table.insert(fileData, "// binding class\n") ! table.insert(fileData, "extern WXLUACLASS *"..hook_cpp_class_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern WXLUADEFINE *"..hook_cpp_define_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern WXLUASTRING *"..hook_cpp_string_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern WXLUAEVENT *"..hook_cpp_event_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern WXLUAOBJECT *"..hook_cpp_object_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern WXLUAMETHOD *"..hook_cpp_function_funcname.."(size_t &count);\n") table.insert(fileData, "\n\n") table.insert(fileData, "IMPLEMENT_DYNAMIC_CLASS("..hook_cpp_binding_classname..", wxLuaBinding)\n") --- 4065,4074 ---- table.insert(fileData, "// binding class\n") ! table.insert(fileData, "extern wxLuaBindClass *"..hook_cpp_class_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern wxLuaBindDefine *"..hook_cpp_define_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern wxLuaBindString *"..hook_cpp_string_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern wxLuaBindEvent *"..hook_cpp_event_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern wxLuaBindObject *"..hook_cpp_object_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern wxLuaBindMethod *"..hook_cpp_function_funcname.."(size_t &count);\n") table.insert(fileData, "\n\n") table.insert(fileData, "IMPLEMENT_DYNAMIC_CLASS("..hook_cpp_binding_classname..", wxLuaBinding)\n") *************** *** 4070,4081 **** table.insert(fileData, ""..hook_cpp_binding_classname.."::"..hook_cpp_binding_classname.."() : wxLuaBinding()\n") table.insert(fileData, "{\n") ! table.insert(fileData, " m_bindingName = wxT(\""..hook_cpp_namespace.."\");\n") ! table.insert(fileData, " m_nameSpace = wxT(\""..hook_lua_namespace.."\");\n") ! table.insert(fileData, " m_classList = "..hook_cpp_class_funcname.."(m_classCount);\n") ! table.insert(fileData, " m_defineList = "..hook_cpp_define_funcname.."(m_defineCount);\n") ! table.insert(fileData, " m_stringList = "..hook_cpp_string_funcname.."(m_stringCount);\n") ! table.insert(fileData, " m_eventList = "..hook_cpp_event_funcname.."(m_eventCount);\n") ! table.insert(fileData, " m_objectList = "..hook_cpp_object_funcname.."(m_objectCount);\n") ! table.insert(fileData, " m_functionList = "..hook_cpp_function_funcname.."(m_functionCount);\n") table.insert(fileData, "}\n") table.insert(fileData, "\n") --- 4076,4087 ---- table.insert(fileData, ""..hook_cpp_binding_classname.."::"..hook_cpp_binding_classname.."() : wxLuaBinding()\n") table.insert(fileData, "{\n") ! table.insert(fileData, " m_bindingName = wxT(\""..hook_cpp_namespace.."\");\n") ! table.insert(fileData, " m_nameSpace = wxT(\""..hook_lua_namespace.."\");\n") ! table.insert(fileData, " m_classArray = "..hook_cpp_class_funcname.."(m_classCount);\n") ! table.insert(fileData, " m_defineArray = "..hook_cpp_define_funcname.."(m_defineCount);\n") ! table.insert(fileData, " m_stringArray = "..hook_cpp_string_funcname.."(m_stringCount);\n") ! table.insert(fileData, " m_eventArray = "..hook_cpp_event_funcname.."(m_eventCount);\n") ! table.insert(fileData, " m_objectArray = "..hook_cpp_object_funcname.."(m_objectCount);\n") ! table.insert(fileData, " m_functionArray = "..hook_cpp_function_funcname.."(m_functionCount);\n") table.insert(fileData, "}\n") table.insert(fileData, "\n") *************** *** 4173,4180 **** table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! table.insert(fileData, "WXLUADEFINE* "..hook_cpp_define_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static WXLUADEFINE defineList[] =\n {\n") ! -- mix the %define and %enums together since they're both in the same WXLUADEFINE struct local namedBindingTable = {} GenerateLuaNameFromIndexedTable(defineBindingTable, namedBindingTable) --- 4179,4186 ---- table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! table.insert(fileData, "wxLuaBindDefine* "..hook_cpp_define_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static wxLuaBindDefine defineList[] =\n {\n") ! -- mix the %define and %enums together since they're both in the same wxLuaBindDefine struct local namedBindingTable = {} GenerateLuaNameFromIndexedTable(defineBindingTable, namedBindingTable) *************** *** 4188,4192 **** table.insert(fileData, " { 0, 0 },\n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = (sizeof(defineList)/sizeof(defineList[0])) - 1;\n") table.insert(fileData, " return defineList;\n") table.insert(fileData, "}\n\n") --- 4194,4198 ---- table.insert(fileData, " { 0, 0 },\n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = sizeof(defineList)/sizeof(wxLuaBindDefine) - 1;\n") table.insert(fileData, " return defineList;\n") table.insert(fileData, "}\n\n") *************** *** 4199,4204 **** table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! table.insert(fileData, "WXLUASTRING* "..hook_cpp_string_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static WXLUASTRING stringList[] =\n {\n") local namedBindingTable = {} --- 4205,4210 ---- table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! table.insert(fileData, "wxLuaBindString* "..hook_cpp_string_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static wxLuaBindString stringList[] =\n {\n") local namedBindingTable = {} *************** *** 4212,4216 **** table.insert(fileData, " { 0, 0 },\n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = (sizeof(stringList)/sizeof(stringList[0])) - 1;\n") table.insert(fileData, " return stringList;\n") table.insert(fileData, "}\n\n") --- 4218,4222 ---- table.insert(fileData, " { 0, 0 },\n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = sizeof(stringList)/sizeof(wxLuaBindString) - 1;\n") table.insert(fileData, " return stringList;\n") table.insert(fileData, "}\n\n") *************** *** 4232,4239 **** -- GetObjectList -- ------------------------------------------------------------------------ ! table.insert(fileData, "WXLUAOBJECT* "..hook_cpp_object_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static WXLUAOBJECT objectList[] =\n {\n") ! -- mix %object and %pointer together since they're both in the same WXLUAOBJECT struct local namedBindingTable = {} GenerateLuaNameFromIndexedTable(objectBindingTable, namedBindingTable) --- 4238,4245 ---- -- GetObjectList -- ------------------------------------------------------------------------ ! table.insert(fileData, "wxLuaBindObject* "..hook_cpp_object_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static wxLuaBindObject objectList[] =\n {\n") ! -- mix %object and %pointer together since they're both in the same wxLuaBindObject struct local namedBindingTable = {} GenerateLuaNameFromIndexedTable(objectBindingTable, namedBindingTable) *************** *** 4247,4251 **** table.insert(fileData, " { 0, 0, 0, 0 },\n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = (sizeof(objectList)/sizeof(objectList[0])) - 1;\n") table.insert(fileData, " return objectList;\n") table.insert(fileData, "}\n\n") --- 4253,4257 ---- table.insert(fileData, " { 0, 0, 0, 0 },\n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = sizeof(objectList)/sizeof(wxLuaBindObject) - 1;\n") table.insert(fileData, " return objectList;\n") table.insert(fileData, "}\n\n") *************** *** 4267,4272 **** -- GetEventList -- ------------------------------------------------------------------------ ! table.insert(fileData, "WXLUAEVENT* "..hook_cpp_event_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static WXLUAEVENT eventList[] =\n {\n") local namedBindingTable = {} --- 4273,4278 ---- -- GetEventList -- ------------------------------------------------------------------------ ! table.insert(fileData, "wxLuaBindEvent* "..hook_cpp_event_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static wxLuaBindEvent eventList[] =\n {\n") local namedBindingTable = {} *************** *** 4279,4283 **** table.insert(fileData, " { 0, 0, 0 },\n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = (sizeof(eventList)/sizeof(eventList[0])) - 1;\n") table.insert(fileData, " return eventList;\n") table.insert(fileData, "}\n\n") --- 4285,4289 ---- table.insert(fileData, " { 0, 0, 0 },\n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = sizeof(eventList)/sizeof(wxLuaBindEvent) - 1;\n") table.insert(fileData, " return eventList;\n") table.insert(fileData, "}\n\n") *************** *** 4313,4317 **** if functionBinding.FuncMapName then ! table.insert(fileData, "static WXLUAMETHOD_CFUNC "..functionBinding.FuncMapName.."[1] = {"..functionBinding.FuncMap.."};\n\n") end end --- 4319,4323 ---- if functionBinding.FuncMapName then ! table.insert(fileData, "static wxLuaBindCFunc "..functionBinding.FuncMapName.."[1] = {"..functionBinding.FuncMap.."};\n\n") end end *************** *** 4327,4339 **** table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! table.insert(fileData, "WXLUAMETHOD* "..hook_cpp_function_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static WXLUAMETHOD functionList[] =\n {\n") GenerateMap(fileData, sortedBindings, " ") table.insert(fileData, "\n") ! table.insert(fileData, " { WXLUAMETHOD_CFUNCTION, 0, 0, 0 }, \n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = (sizeof(functionList)/sizeof(functionList[0])) - 1;\n") table.insert(fileData, " return functionList;\n") table.insert(fileData, "}\n\n") --- 4333,4345 ---- table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! table.insert(fileData, "wxLuaBindMethod* "..hook_cpp_function_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static wxLuaBindMethod functionList[] =\n {\n") GenerateMap(fileData, sortedBindings, " ") table.insert(fileData, "\n") ! table.insert(fileData, " { 0, 0, 0, 0 }, \n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = sizeof(functionList)/sizeof(wxLuaBindMethod) - 1;\n") table.insert(fileData, " return functionList;\n") table.insert(fileData, "}\n\n") *************** *** 4398,4402 **** CommentBindingTable(funcMap, "// function overload table\n") ! table.insert(funcMap, "static WXLUAMETHOD_CFUNC "..funcMapName.."[] =\n{\n") table.insert(funcMap, " { "..funcName..", WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, "..tostring(requiredParamCount)..", "..tostring(paramCount)..", s_wxluaargArray_None },\n") for i = 1, #methodBindings do --- 4404,4408 ---- CommentBindingTable(funcMap, "// function overload table\n") ! table.insert(funcMap, "static wxLuaBindCFunc "..funcMapName.."[] =\n{\n") table.insert(funcMap, " { "..funcName..", WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, "..tostring(requiredParamCount)..", "..tostring(paramCount)..", s_wxluaargArray_None },\n") for i = 1, #methodBindings do *************** *** 4413,4417 **** table.insert(funcMap, "};\n") ! table.insert(funcMap, "static int "..funcMapName.."_count = sizeof("..funcMapName..")/sizeof("..funcMapName.."[0]);\n") local methodMap = " { "..funcType..", \""..methodBindings[1].LuaName.."\", "..funcMapName..", "..funcMapName.."_count, 0 }" --- 4419,4423 ---- table.insert(funcMap, "};\n") ! table.insert(funcMap, "static int "..funcMapName.."_count = sizeof("..funcMapName..")/sizeof(wxLuaBindCFunc);\n") local methodMap = " { "..funcType..", \""..methodBindings[1].LuaName.."\", "..funcMapName..", "..funcMapName.."_count, 0 }" *************** *** 4422,4426 **** table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n") table.insert(codeList, " wxLuaState wxlState(L);\n") ! table.insert(codeList, " static WXLUAMETHOD overload_method = \n") table.insert(codeList, " "..methodMap..";\n") table.insert(codeList, " return wxlState.CallOverloadedFunction(&overload_method);\n") --- 4428,4432 ---- table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n") table.insert(codeList, " wxLuaState wxlState(L);\n") ! table.insert(codeList, " static wxLuaBindMethod overload_method = \n") table.insert(codeList, " "..methodMap..";\n") table.insert(codeList, " return wxlState.CallOverloadedFunction(&overload_method);\n") *************** *** 4573,4577 **** if functionBinding.FuncMapName then table.insert(fileData, "static int LUACALL "..functionBinding.CFunctionName.."(lua_State *L);\n") ! table.insert(fileData, "static WXLUAMETHOD_CFUNC "..functionBinding.FuncMapName.."[1] = {"..functionBinding.FuncMap.."};\n\n") end --- 4579,4583 ---- if functionBinding.FuncMapName then table.insert(fileData, "static int LUACALL "..functionBinding.CFunctionName.."(lua_State *L);\n") ! table.insert(fileData, "static wxLuaBindCFunc "..functionBinding.FuncMapName.."[1] = {"..functionBinding.FuncMap.."};\n\n") end *************** *** 4604,4618 **** CommentBindingTable(fileData, "// Map Lua Class Methods to C Binding Functions\n") ! table.insert(fileData, "WXLUAMETHOD "..MakeClassVar(ObjectName).."_methods[] = {\n") GenerateMap(fileData, sortedBindings, "", nil, false, object.Condition) ! table.insert(fileData, " { WXLUAMETHOD_METHOD, 0, 0, 0 },\n") table.insert(fileData, "};\n\n") -- since there may be conditions count them up afterwards ! table.insert(fileData, "int "..MakeVar(ObjectName).."_methodCount = sizeof("..MakeClassVar(ObjectName).."_methods)/sizeof("..MakeClassVar(ObjectName).."_methods[0]) - 1;\n") table.insert(fileData, "\n\n") ! table.insert(fileData, "WXLUADEFINE "..MakeClassVar(ObjectName).."_enums[] = {\n") -- FIXME use dummy for empty if enumClassBindingTable[MakeClassVar(ObjectName)] then --- 4610,4624 ---- CommentBindingTable(fileData, "// Map Lua Class Methods to C Binding Functions\n") ! table.insert(fileData, "wxLuaBindMethod "..MakeClassVar(ObjectName).."_methods[] = {\n") GenerateMap(fileData, sortedBindings, "", nil, false, object.Condition) ! table.insert(fileData, " { 0, 0, 0, 0 },\n") table.insert(fileData, "};\n\n") -- since there may be conditions count them up afterwards ! table.insert(fileData, "int "..MakeVar(ObjectName).."_methodCount = sizeof("..MakeClassVar(ObjectName).."_methods)/sizeof(wxLuaBindMethod) - 1;\n") table.insert(fileData, "\n\n") ! table.insert(fileData, "wxLuaBindDefine "..MakeClassVar(ObjectName).."_enums[] = {\n") -- FIXME use dummy for empty if enumClassBindingTable[MakeClassVar(ObjectName)] then *************** *** 4627,4631 **** -- since there may be conditions count them up afterwards ! table.insert(fileData, "int "..MakeVar(ObjectName).."_enumCount = sizeof("..MakeClassVar(ObjectName).."_enums)/sizeof("..MakeClassVar(ObjectName).."_enums[0]) - 1;\n") if object.Condition then --- 4633,4637 ---- -- since there may be conditions count them up afterwards ! table.insert(fileData, "int "..MakeVar(ObjectName).."_enumCount = sizeof("..MakeClassVar(ObjectName).."_enums)/sizeof(wxLuaBindDefine) - 1;\n") if object.Condition then *************** *** 4637,4650 **** end ! RemoveExtraWXLUAMETHOD_CFUNC(fileData) return fileData end ! function RemoveExtraWXLUAMETHOD_CFUNC(fileData) local cfuncTable = {} for n = 1, #fileData do ! if string.find(fileData[n], "static WXLUAMETHOD_CFUNC s_wxluafunc", 1, 1) then local a, b = string.find(fileData[n], "s_wxluafunc", 1, 1) local s = string.sub(fileData[n], a) --- 4643,4656 ---- end ! RemoveExtra_wxLuaBindCFunc(fileData) return fileData end ! function RemoveExtra_wxLuaBindCFunc(fileData) local cfuncTable = {} for n = 1, #fileData do ! if string.find(fileData[n], "static wxLuaBindCFunc s_wxluafunc", 1, 1) then local a, b = string.find(fileData[n], "s_wxluafunc", 1, 1) local s = string.sub(fileData[n], a) |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:28
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** wxstc_datatypes.lua 31 May 2007 17:18:46 -0000 1.51 --- wxstc_datatypes.lua 6 Jun 2007 23:42:54 -0000 1.52 *************** *** 49,52 **** --- 49,57 ---- Name = "HANDLE", }, + IntArray_FromLuaTable = { + DefType = "special", + IsNumber = true, + Name = "IntArray_FromLuaTable", + }, LPCVOID = { DefType = "number", |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:28
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/apps/wxlua/src Modified Files: editor.h Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** editor.h 5 Jun 2007 21:07:19 -0000 1.37 --- editor.h 6 Jun 2007 23:42:52 -0000 1.38 *************** *** 10,15 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 90507; ! const unsigned char wxLuaEditor[90508] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, --- 10,15 ---- extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 90424; ! const unsigned char wxLuaEditor[90425] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, *************** *** 200,204 **** 115,116, 97,116,117,115, 66, 97,114, 32, 61, 32,102,114, 97,109,101, 58, 67,114,101, 97,116,101, 83,116, 97,116,117,115, 66, 97,114, 40, 32, 52, 32, 41, 10, 108,111, 99, 97,108, 32,115,116, 97,116,117,115, 95,116,120,116, 95,119,105,100,116,104, 32, 61, 32,115,116, 97,116,117,115, 66, 97,114, 58, 71,101,116, 84,101,120,116, 69,120,116,101,110,116, 40, 34, 79, 86, 82, 87, 34, 41, 10, ! 102,114, 97,109,101, 58, 83,101,116, 83,116, 97,116,117,115, 87,105,100,116,104,115,123, 45, 49, 44, 32,115,116, 97,116,117,115, 95,116,120,116, 95,119,105,100,116,104, 44, 32,115,116, 97,116,117,115, 95,116,120,116, 95,119,105,100,116,104, 44, 32,115,116, 97,116,117,115, 95,116,120,116, 95,119,105,100,116,104, 42, 53,125, 10, 102,114, 97,109,101, 58, 83,101,116, 83,116, 97,116,117,115, 84,101,120,116, 40, 34, 87,101,108, 99,111,109,101, 32,116,111, 32,119,120, 76,117, 97, 34, 41, 10, 10, --- 200,204 ---- 115,116, 97,116,117,115, 66, 97,114, 32, 61, 32,102,114, 97,109,101, 58, 67,114,101, 97,116,101, 83,116, 97,116,117,115, 66, 97,114, 40, 32, 52, 32, 41, 10, 108,111, 99, 97,108, 32,115,116, 97,116,117,115, 95,116,120,116, 95,119,105,100,116,104, 32, 61, 32,115,116, 97,116,117,115, 66, 97,114, 58, 71,101,116, 84,101,120,116, 69,120,116,101,110,116, 40, 34, 79, 86, 82, 87, 34, 41, 10, ! 102,114, 97,109,101, 58, 83,101,116, 83,116, 97,116,117,115, 87,105,100,116,104,115, 40,123, 45, 49, 44, 32,115,116, 97,116,117,115, 95,116,120,116, 95,119,105,100,116,104, 44, 32,115,116, 97,116,117,115, 95,116,120,116, 95,119,105,100,116,104, 44, 32,115,116, 97,116,117,115, 95,116,120,116, 95,119,105,100,116,104, 42, 53,125, 41, 10, 102,114, 97,109,101, 58, 83,101,116, 83,116, 97,116,117,115, 84,101,120,116, 40, 34, 87,101,108, 99,111,109,101, 32,116,111, 32,119,120, 76,117, 97, 34, 41, 10, 10, *************** *** 773,779 **** 32, 32, 32, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 65, 68, 68, 87, 65, 84, 67, 72, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,114,111,119, 32, 61, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 73,110,115,101,114,116, 83,116,114,105,110,103, 73,116,101,109, 40,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 71,101,116, 73,116,101,109, 67,111,117,110,116, 40, 41, 44, 32, 34, 69,120,112,114, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 83,101,116, 83,116,114,105,110,103, 73,116,101,109, 40,114,111,119, 44, 32, 48, 44, 32, 34, 69,120,112,114, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 83,101,116, 83,116,114,105,110,103, 73,116,101,109, 40,114,111,119, 44, 32, 49, 44, 32, 34, 86, 97,108,117,101, 34, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 69,100,105,116, 76, 97, 98,101,108, 40,114,111,119, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, --- 773,779 ---- 32, 32, 32, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 65, 68, 68, 87, 65, 84, 67, 72, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,114,111,119, 32, 61, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 73,110,115,101,114,116, 73,116,101,109, 40,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 71,101,116, 73,116,101,109, 67,111,117,110,116, 40, 41, 44, 32, 34, 69,120,112,114, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 83,101,116, 73,116,101,109, 40,114,111,119, 44, 32, 48, 44, 32, 34, 69,120,112,114, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 83,101,116, 73,116,101,109, 40,114,111,119, 44, 32, 49, 44, 32, 34, 86, 97,108,117,101, 34, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 69,100,105,116, 76, 97, 98,101,108, 40,114,111,119, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, *************** *** 814,819 **** 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 76, 73, 83, 84, 95, 69, 78, 68, 95, 76, 65, 66, 69, 76, 95, 69, 68, 73, 84, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 83,101,116, 83,116,114,105,110,103, 73,116,101,109, 40,101,118,101,110,116, 58, 71,101,116, 73,110,100,101,120, 40, 41, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 48, 44, 32,101,118,101,110,116, 58, 71,101,116, 84,101,120,116, 40, 41, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 80,114,111, 99,101,115,115, 87, 97,116, 99,104,101,115, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 83,107,105,112, 40, 41, 10, --- 814,818 ---- 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 76, 73, 83, 84, 95, 69, 78, 68, 95, 76, 65, 66, 69, 76, 95, 69, 68, 73, 84, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 83,101,116, 73,116,101,109, 40,101,118,101,110,116, 58, 71,101,116, 73,110,100,101,120, 40, 41, 44, 32, 48, 44, 32,101,118,101,110,116, 58, 71,101,116, 84,101,120,116, 40, 41, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 80,114,111, 99,101,115,115, 87, 97,116, 99,104,101,115, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 83,107,105,112, 40, 41, 10, *************** *** 2008,2014 **** 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 83,101,116, 83,116,114,105,110,103, 73,116,101,109, 40,101,118,101,110,116, 58, 71,101,116, 82,101,102,101,114,101,110, 99,101, 40, 41, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 49, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 71,101,116, 77,101,115,115, 97,103,101, 40, 41, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, --- 2007,2013 ---- 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 83,101,116, 73,116,101,109, 40,101,118,101,110,116, 58, 71,101,116, 82,101,102,101,114,101,110, 99,101, 40, 41, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 49, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 71,101,116, 77,101,115,115, 97,103,101, 40, 41, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, *************** *** 2035,2038 **** --- 2034,2038 ---- 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 69, 86, 84, 95, 73, 68, 76, 69, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 40,101,118,101,110,116, 41, 10, + 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32, 40,100,101, 98,117,103,103,101,114, 95,100,101,115,116,114,111,121, 32, 62, 32, 48, 41, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103,103,101,114, 95,100,101,115,116,114,111,121, 32, 61, 32,100,101, 98,117,103,103,101,114, 95,100,101,115,116,114,111,121, 32, 43, 32, 49, 10, |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/modules/wxluasocket/src Modified Files: wxldserv.cpp wxluasocket.cpp wxluasocket_bind.cpp Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxluasocket_bind.cpp 31 May 2007 17:18:55 -0000 1.16 --- wxluasocket_bind.cpp 6 Jun 2007 23:43:17 -0000 1.17 *************** *** 24,30 **** // --------------------------------------------------------------------------- ! WXLUAEVENT* wxLuaGetEventList_wxluasocket(size_t &count) { ! static WXLUAEVENT eventList[] = { { &wxEVT_WXLUA_DEBUGGER_BREAK, "wxEVT_WXLUA_DEBUGGER_BREAK", &s_wxluatag_wxLuaDebuggerEvent }, --- 24,30 ---- // --------------------------------------------------------------------------- ! wxLuaBindEvent* wxLuaGetEventList_wxluasocket(size_t &count) { ! static wxLuaBindEvent eventList[] = { { &wxEVT_WXLUA_DEBUGGER_BREAK, "wxEVT_WXLUA_DEBUGGER_BREAK", &s_wxluatag_wxLuaDebuggerEvent }, *************** *** 41,45 **** { 0, 0, 0 }, }; ! count = (sizeof(eventList)/sizeof(eventList[0])) - 1; return eventList; } --- 41,45 ---- { 0, 0, 0 }, }; ! count = sizeof(eventList)/sizeof(wxLuaBindEvent) - 1; return eventList; } *************** *** 49,60 **** // --------------------------------------------------------------------------- ! WXLUADEFINE* wxLuaGetDefineList_wxluasocket(size_t &count) { ! static WXLUADEFINE defineList[] = { { 0, 0 }, }; ! count = (sizeof(defineList)/sizeof(defineList[0])) - 1; return defineList; } --- 49,60 ---- // --------------------------------------------------------------------------- ! wxLuaBindDefine* wxLuaGetDefineList_wxluasocket(size_t &count) { ! static wxLuaBindDefine defineList[] = { { 0, 0 }, }; ! count = sizeof(defineList)/sizeof(wxLuaBindDefine) - 1; return defineList; } *************** *** 65,76 **** // --------------------------------------------------------------------------- ! WXLUASTRING* wxLuaGetStringList_wxluasocket(size_t &count) { ! static WXLUASTRING stringList[] = { { 0, 0 }, }; ! count = (sizeof(stringList)/sizeof(stringList[0])) - 1; return stringList; } --- 65,76 ---- // --------------------------------------------------------------------------- ! wxLuaBindString* wxLuaGetStringList_wxluasocket(size_t &count) { ! static wxLuaBindString stringList[] = { { 0, 0 }, }; ! count = sizeof(stringList)/sizeof(wxLuaBindString) - 1; return stringList; } *************** *** 80,91 **** // --------------------------------------------------------------------------- ! WXLUAOBJECT* wxLuaGetObjectList_wxluasocket(size_t &count) { ! static WXLUAOBJECT objectList[] = { { 0, 0, 0, 0 }, }; ! count = (sizeof(objectList)/sizeof(objectList[0])) - 1; return objectList; } --- 80,91 ---- // --------------------------------------------------------------------------- ! wxLuaBindObject* wxLuaGetObjectList_wxluasocket(size_t &count) { ! static wxLuaBindObject objectList[] = { { 0, 0, 0, 0 }, }; ! count = sizeof(objectList)/sizeof(wxLuaBindObject) - 1; return objectList; } *************** *** 99,110 **** // --------------------------------------------------------------------------- ! WXLUAMETHOD* wxLuaGetFunctionList_wxluasocket(size_t &count) { ! static WXLUAMETHOD functionList[] = { ! { WXLUAMETHOD_CFUNCTION, 0, 0, 0 }, }; ! count = (sizeof(functionList)/sizeof(functionList[0])) - 1; return functionList; } --- 99,110 ---- // --------------------------------------------------------------------------- ! wxLuaBindMethod* wxLuaGetFunctionList_wxluasocket(size_t &count) { ! static wxLuaBindMethod functionList[] = { ! { 0, 0, 0, 0 }, }; ! count = sizeof(functionList)/sizeof(wxLuaBindMethod) - 1; return functionList; } *************** *** 116,122 **** // --------------------------------------------------------------------------- ! WXLUACLASS* wxLuaGetClassList_wxluasocket(size_t &count) { ! static WXLUACLASS classList[] = { { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL ,wxLuaDebuggerEvent_enums, wxLuaDebuggerEvent_enumCount, }, --- 116,122 ---- // --------------------------------------------------------------------------- ! wxLuaBindClass* wxLuaGetClassList_wxluasocket(size_t &count) { ! static wxLuaBindClass classList[] = { { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL ,wxLuaDebuggerEvent_enums, wxLuaDebuggerEvent_enumCount, }, *************** *** 125,129 **** { 0, 0, 0, 0, 0, 0, 0 }, }; ! count = (sizeof(classList)/sizeof(classList[0])) - 1; return classList; --- 125,129 ---- { 0, 0, 0, 0, 0, 0, 0 }, }; ! count = sizeof(classList)/sizeof(wxLuaBindClass) - 1; return classList; *************** *** 136,145 **** // binding class ! extern WXLUACLASS *wxLuaGetClassList_wxluasocket(size_t &count); ! extern WXLUADEFINE *wxLuaGetDefineList_wxluasocket(size_t &count); ! extern WXLUASTRING *wxLuaGetStringList_wxluasocket(size_t &count); ! extern WXLUAEVENT *wxLuaGetEventList_wxluasocket(size_t &count); ! extern WXLUAOBJECT *wxLuaGetObjectList_wxluasocket(size_t &count); ! extern WXLUAMETHOD *wxLuaGetFunctionList_wxluasocket(size_t &count); --- 136,145 ---- // binding class ! extern wxLuaBindClass *wxLuaGetClassList_wxluasocket(size_t &count); ! extern wxLuaBindDefine *wxLuaGetDefineList_wxluasocket(size_t &count); ! extern wxLuaBindString *wxLuaGetStringList_wxluasocket(size_t &count); ! extern wxLuaBindEvent *wxLuaGetEventList_wxluasocket(size_t &count); ! extern wxLuaBindObject *wxLuaGetObjectList_wxluasocket(size_t &count); ! extern wxLuaBindMethod *wxLuaGetFunctionList_wxluasocket(size_t &count); *************** *** 148,159 **** wxLuaBinding_wxluasocket::wxLuaBinding_wxluasocket() : wxLuaBinding() { ! m_bindingName = wxT("wxluasocket"); ! m_nameSpace = wxT("wx"); ! m_classList = wxLuaGetClassList_wxluasocket(m_classCount); ! m_defineList = wxLuaGetDefineList_wxluasocket(m_defineCount); ! m_stringList = wxLuaGetStringList_wxluasocket(m_stringCount); ! m_eventList = wxLuaGetEventList_wxluasocket(m_eventCount); ! m_objectList = wxLuaGetObjectList_wxluasocket(m_objectCount); ! m_functionList = wxLuaGetFunctionList_wxluasocket(m_functionCount); } --- 148,159 ---- wxLuaBinding_wxluasocket::wxLuaBinding_wxluasocket() : wxLuaBinding() { ! m_bindingName = wxT("wxluasocket"); ! m_nameSpace = wxT("wx"); ! m_classArray = wxLuaGetClassList_wxluasocket(m_classCount); ! m_defineArray = wxLuaGetDefineList_wxluasocket(m_defineCount); ! m_stringArray = wxLuaGetStringList_wxluasocket(m_stringCount); ! m_eventArray = wxLuaGetEventList_wxluasocket(m_eventCount); ! m_objectArray = wxLuaGetObjectList_wxluasocket(m_objectCount); ! m_functionArray = wxLuaGetFunctionList_wxluasocket(m_functionCount); } Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** wxldserv.cpp 24 May 2007 00:59:47 -0000 1.42 --- wxldserv.cpp 6 Jun 2007 23:43:17 -0000 1.43 *************** *** 765,775 **** m_shutdown = true; // close the session socket, but first NULL it so we won't try to use it ! m_acceptSockCritSect.Enter(); wxLuaSocket *acceptedSocket = m_acceptedSocket; ! m_acceptedSocket = NULL; ! m_acceptSockCritSect.Leave(); if (acceptedSocket != NULL) ! { if (!acceptedSocket->Shutdown(SD_BOTH)) { --- 765,783 ---- m_shutdown = true; + // try to nicely stop the socket if it exists + if (m_acceptedSocket) + { + Reset(); + wxMilliSleep(500); + } + // close the session socket, but first NULL it so we won't try to use it ! //m_acceptSockCritSect.Enter(); wxLuaSocket *acceptedSocket = m_acceptedSocket; ! //m_acceptedSocket = NULL; ! //m_acceptSockCritSect.Leave(); ! if (acceptedSocket != NULL) ! { if (!acceptedSocket->Shutdown(SD_BOTH)) { *************** *** 779,785 **** } ! wxMilliSleep(100); ! ! delete acceptedSocket; } --- 787,793 ---- } ! wxMilliSleep(500); ! //m_acceptedSocket = NULL; ! //delete acceptedSocket; } *************** *** 858,862 **** // lock the critical section while we access it wxCriticalSectionLocker locker(m_acceptSockCritSect); ! if ((m_acceptedSocket == NULL) || !m_acceptedSocket->ReadCmd(debug_event)) { m_shutdown = true; --- 866,870 ---- // lock the critical section while we access it wxCriticalSectionLocker locker(m_acceptSockCritSect); ! if (m_shutdown || (m_acceptedSocket == NULL) || !m_acceptedSocket->ReadCmd(debug_event)) { m_shutdown = true; Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxluasocket.cpp 5 Jun 2007 21:07:25 -0000 1.22 --- wxluasocket.cpp 6 Jun 2007 23:43:17 -0000 1.23 *************** *** 27,33 **** int s_wxluatag_wxLuaDebuggerServer = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_AddBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }}; // bool AddBreakPoint(const wxString &fileName, int lineNumber) --- 27,33 ---- int s_wxluatag_wxLuaDebuggerServer = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_AddBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }}; // bool AddBreakPoint(const wxString &fileName, int lineNumber) *************** *** 50,56 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Break[1] = {{ wxLua_wxLuaDebuggerServer_Break, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break }}; // bool Break() --- 50,56 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Break[1] = {{ wxLua_wxLuaDebuggerServer_Break, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break }}; // bool Break() *************** *** 69,75 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[1] = {{ wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints }}; // bool ClearAllBreakPoints() --- 69,75 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[1] = {{ wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints }}; // bool ClearAllBreakPoints() *************** *** 88,94 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue[1] = {{ wxLua_wxLuaDebuggerServer_Continue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue }}; // bool Continue() --- 88,94 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue[1] = {{ wxLua_wxLuaDebuggerServer_Continue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue }}; // bool Continue() *************** *** 107,113 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Delete[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete[1] = {{ wxLua_wxLuaDebuggerServer_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Delete }}; static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L) --- 107,113 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Delete[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete[1] = {{ wxLua_wxLuaDebuggerServer_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Delete }}; static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L) *************** *** 124,130 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog[1] = {{ wxLua_wxLuaDebuggerServer_DisplayStackDialog, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }}; // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) --- 124,130 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluatag_wxWindow, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog[1] = {{ wxLua_wxLuaDebuggerServer_DisplayStackDialog, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }}; // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) *************** *** 146,152 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr[1] = {{ wxLua_wxLuaDebuggerServer_EvaluateExpr, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }}; // bool EvaluateExpr(int exprRef, const wxString &expr) --- 146,152 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr[1] = {{ wxLua_wxLuaDebuggerServer_EvaluateExpr, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }}; // bool EvaluateExpr(int exprRef, const wxString &expr) *************** *** 169,175 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[1] = {{ wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId }}; // long GetDebuggeeProcessId() const --- 169,175 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[1] = {{ wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId }}; // long GetDebuggeeProcessId() const *************** *** 189,193 **** static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName[1] = {{ wxLua_wxLuaDebuggerServer_GetNetworkName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; // static wxString GetNetworkName() --- 189,193 ---- static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName[1] = {{ wxLua_wxLuaDebuggerServer_GetNetworkName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; // static wxString GetNetworkName() *************** *** 205,209 **** static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName[1] = {{ wxLua_wxLuaDebuggerServer_GetProgramName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; // static wxString GetProgramName() --- 205,209 ---- static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName[1] = {{ wxLua_wxLuaDebuggerServer_GetProgramName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; // static wxString GetProgramName() *************** *** 220,226 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee[1] = {{ wxLua_wxLuaDebuggerServer_KillDebuggee, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee }}; // bool KillDebuggee() --- 220,226 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee[1] = {{ wxLua_wxLuaDebuggerServer_KillDebuggee, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee }}; // bool KillDebuggee() *************** *** 239,245 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_RemoveBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }}; // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) --- 239,245 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_RemoveBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }}; // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) *************** *** 262,268 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset[1] = {{ wxLua_wxLuaDebuggerServer_Reset, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset }}; // bool Reset() --- 262,268 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset[1] = {{ wxLua_wxLuaDebuggerServer_Reset, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset }}; // bool Reset() *************** *** 281,287 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }}; // bool Run(const wxString &file, const wxString &fileName) --- 281,287 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }}; // bool Run(const wxString &file, const wxString &fileName) *************** *** 304,310 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient[1] = {{ wxLua_wxLuaDebuggerServer_StartClient, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient }}; // long StartClient() --- 304,310 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient[1] = {{ wxLua_wxLuaDebuggerServer_StartClient, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient }}; // long StartClient() *************** *** 323,329 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer[1] = {{ wxLua_wxLuaDebuggerServer_StartServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer }}; // bool StartServer() --- 323,329 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer[1] = {{ wxLua_wxLuaDebuggerServer_StartServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer }}; // bool StartServer() *************** *** 342,348 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Step[1] = {{ wxLua_wxLuaDebuggerServer_Step, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step }}; // bool Step() --- 342,348 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Step[1] = {{ wxLua_wxLuaDebuggerServer_Step, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step }}; // bool Step() *************** *** 361,367 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut[1] = {{ wxLua_wxLuaDebuggerServer_StepOut, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut }}; // bool StepOut() --- 361,367 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut[1] = {{ wxLua_wxLuaDebuggerServer_StepOut, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut }}; // bool StepOut() *************** *** 380,386 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver[1] = {{ wxLua_wxLuaDebuggerServer_StepOver, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver }}; // bool StepOver() --- 380,386 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver[1] = {{ wxLua_wxLuaDebuggerServer_StepOver, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver }}; // bool StepOver() *************** *** 399,405 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer[] = { &s_wxluatag_wxLuaDebuggerServer, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer[1] = {{ wxLua_wxLuaDebuggerServer_StopServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer }}; // bool StopServer() --- 399,405 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer[1] = {{ wxLua_wxLuaDebuggerServer_StopServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer }}; // bool StopServer() *************** *** 418,429 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor[1] = {{ wxLua_wxLuaDebuggerServer_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }}; // wxLuaDebuggerServer(int portNumber) static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) { ! wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaDebuggerServer *returns; --- 418,429 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor[1] = {{ wxLua_wxLuaDebuggerServer_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }}; // wxLuaDebuggerServer(int portNumber) static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) { ! wxluabind_removetableforcall(L); wxLuaState wxlState(L); wxLuaDebuggerServer *returns; *************** *** 443,479 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaDebuggerServer_methods[] = { ! { WXLUAMETHOD_METHOD, "AddBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint, 1, 0 }, ! { WXLUAMETHOD_METHOD, "Break", s_wxluafunc_wxLua_wxLuaDebuggerServer_Break, 1, 0 }, ! { WXLUAMETHOD_METHOD, "ClearAllBreakPoints", s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 1, 0 }, ! { WXLUAMETHOD_METHOD, "Continue", s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue, 1, 0 }, ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete, 1, 0 }, ! { WXLUAMETHOD_METHOD, "DisplayStackDialog", s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1, 0 }, ! { WXLUAMETHOD_METHOD, "EvaluateExpr", s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetDebuggeeProcessId", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 1, 0 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetNetworkName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName, 1, 0 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetProgramName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName, 1, 0 }, ! { WXLUAMETHOD_METHOD, "KillDebuggee", s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee, 1, 0 }, ! { WXLUAMETHOD_METHOD, "RemoveBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 1, 0 }, ! { WXLUAMETHOD_METHOD, "Reset", s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset, 1, 0 }, ! { WXLUAMETHOD_METHOD, "Run", s_wxluafunc_wxLua_wxLuaDebuggerServer_Run, 1, 0 }, ! { WXLUAMETHOD_METHOD, "StartClient", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient, 1, 0 }, ! { WXLUAMETHOD_METHOD, "StartServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer, 1, 0 }, ! { WXLUAMETHOD_METHOD, "Step", s_wxluafunc_wxLua_wxLuaDebuggerServer_Step, 1, 0 }, ! { WXLUAMETHOD_METHOD, "StepOut", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut, 1, 0 }, ! { WXLUAMETHOD_METHOD, "StepOver", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver, 1, 0 }, ! { WXLUAMETHOD_METHOD, "StopServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaDebuggerServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]) - 1; ! WXLUADEFINE wxLuaDebuggerServer_enums[] = { { NULL, 0, }, }; ! int wxLuaDebuggerServer_enumCount = sizeof(wxLuaDebuggerServer_enums)/sizeof(wxLuaDebuggerServer_enums[0]) - 1; // --------------------------------------------------------------------------- --- 443,479 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLuaDebuggerServer_methods[] = { ! { WXLUAMETHOD_METHOD, "AddBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint, 1, NULL }, ! { WXLUAMETHOD_METHOD, "Break", s_wxluafunc_wxLua_wxLuaDebuggerServer_Break, 1, NULL }, ! { WXLUAMETHOD_METHOD, "ClearAllBreakPoints", s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 1, NULL }, ! { WXLUAMETHOD_METHOD, "Continue", s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue, 1, NULL }, ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete, 1, NULL }, ! { WXLUAMETHOD_METHOD, "DisplayStackDialog", s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1, NULL }, ! { WXLUAMETHOD_METHOD, "EvaluateExpr", s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetDebuggeeProcessId", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 1, NULL }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetNetworkName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName, 1, NULL }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetProgramName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName, 1, NULL }, ! { WXLUAMETHOD_METHOD, "KillDebuggee", s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee, 1, NULL }, ! { WXLUAMETHOD_METHOD, "RemoveBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 1, NULL }, ! { WXLUAMETHOD_METHOD, "Reset", s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset, 1, NULL }, ! { WXLUAMETHOD_METHOD, "Run", s_wxluafunc_wxLua_wxLuaDebuggerServer_Run, 1, NULL }, ! { WXLUAMETHOD_METHOD, "StartClient", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient, 1, NULL }, ! { WXLUAMETHOD_METHOD, "StartServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer, 1, NULL }, ! { WXLUAMETHOD_METHOD, "Step", s_wxluafunc_wxLua_wxLuaDebuggerServer_Step, 1, NULL }, ! { WXLUAMETHOD_METHOD, "StepOut", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut, 1, NULL }, ! { WXLUAMETHOD_METHOD, "StepOver", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver, 1, NULL }, ! { WXLUAMETHOD_METHOD, "StopServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer, 1, NULL }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaDebuggerServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxLuaDebuggerServer_enums[] = { { NULL, 0, }, }; ! int wxLuaDebuggerServer_enumCount = sizeof(wxLuaDebuggerServer_enums)/sizeof(wxLuaBindDefine) - 1; // --------------------------------------------------------------------------- *************** *** 484,490 **** int s_wxluatag_wxLuaDebuggerEvent = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_Delete[] = { &s_wxluatag_wxLuaDebuggerEvent, 0 }; static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete[1] = {{ wxLua_wxLuaDebuggerEvent_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_Delete }}; static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L) --- 484,490 ---- int s_wxluatag_wxLuaDebuggerEvent = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_Delete[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete[1] = {{ wxLua_wxLuaDebuggerEvent_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_Delete }}; static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L) *************** *** 501,507 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName[] = { &s_wxluatag_wxLuaDebuggerEvent, 0 }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName[1] = {{ wxLua_wxLuaDebuggerEvent_GetFileName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName }}; // wxString GetFileName() const --- 501,507 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName[1] = {{ wxLua_wxLuaDebuggerEvent_GetFileName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName }}; // wxString GetFileName() const *************** *** 520,526 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber[] = { &s_wxluatag_wxLuaDebuggerEvent, 0 }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber[1] = {{ wxLua_wxLuaDebuggerEvent_GetLineNumber, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber }}; // int GetLineNumber() const --- 520,526 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber[1] = {{ wxLua_wxLuaDebuggerEvent_GetLineNumber, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber }}; // int GetLineNumber() const *************** *** 539,545 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage[] = { &s_wxluatag_wxLuaDebuggerEvent, 0 }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage[1] = {{ wxLua_wxLuaDebuggerEvent_GetMessage, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage }}; // wxString GetMessage() const --- 539,545 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage[1] = {{ wxLua_wxLuaDebuggerEvent_GetMessage, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage }}; // wxString GetMessage() const *************** *** 558,564 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference[] = { &s_wxluatag_wxLuaDebuggerEvent, 0 }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference[1] = {{ wxLua_wxLuaDebuggerEvent_GetReference, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference }}; // int GetReference() const --- 558,564 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference[1] = {{ wxLua_wxLuaDebuggerEvent_GetReference, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference }}; // int GetReference() const *************** *** 580,599 **** // Map Lua Class Methods to C Binding Functions ! WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetFileName", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetLineNumber", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetMessage", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetReference", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference, 1, 0 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; ! int wxLuaDebuggerEvent_methodCount = sizeof(wxLuaDebuggerEvent_methods)/sizeof(wxLuaDebuggerEvent_methods[0]) - 1; ! WXLUADEFINE wxLuaDebuggerEvent_enums[] = { { NULL, 0, }, }; ! int wxLuaDebuggerEvent_enumCount = sizeof(wxLuaDebuggerEvent_enums)/sizeof(wxLuaDebuggerEvent_enums[0]) - 1; --- 580,599 ---- // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLuaDebuggerEvent_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetFileName", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetLineNumber", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetMessage", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage, 1, NULL }, ! { WXLUAMETHOD_METHOD, "GetReference", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference, 1, NULL }, ! { 0, 0, 0, 0 }, }; ! int wxLuaDebuggerEvent_methodCount = sizeof(wxLuaDebuggerEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! wxLuaBindDefine wxLuaDebuggerEvent_enums[] = { { NULL, 0, }, }; ! int wxLuaDebuggerEvent_enumCount = sizeof(wxLuaDebuggerEvent_enums)/sizeof(wxLuaBindDefine) - 1; |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** wxlstate.cpp 6 Jun 2007 18:03:48 -0000 1.102 --- wxlstate.cpp 6 Jun 2007 23:43:16 -0000 1.103 *************** *** 467,475 **** } ! int LUACALL wxlua_iswxluatype(int luatype, int wxluaarg_type) { int ret = -1; // unknown wxlua arg type ! switch (wxluaarg_type) { case WXLUAARG_None : --- 467,475 ---- } ! int LUACALL wxlua_iswxluatype(int luatype, int wxluaarg_tag) { int ret = -1; // unknown wxlua arg type ! switch (wxluaarg_tag) { case WXLUAARG_None : *************** *** 519,525 **** } ! wxString wxlua_getwxluatypename(int wxluaarg_type) { ! switch (wxluaarg_type) { case WXLUAARG_None : return wxT("none"); --- 519,525 ---- } ! wxString wxlua_getwxluatypename(int wxluaarg_tag) { ! switch (wxluaarg_tag) { case WXLUAARG_None : return wxT("none"); *************** *** 1732,1740 **** wxLuaBinding* binding = node->GetData(); ! WXLUACLASS* pClass = (WXLUACLASS *)binding->GetLuaClassList(); ! size_t i, class_count = binding->GetLuaClassCount(); for (i = 0; i < class_count; i++) { ! WXLUACLASS* pLuaClass = pClass + i; // pLuaClass->baseclass = NULL; FIXME --- 1732,1740 ---- wxLuaBinding* binding = node->GetData(); ! wxLuaBindClass* pClass = (wxLuaBindClass *)binding->GetClassArray(); ! size_t i, class_count = binding->GetClassCount(); for (i = 0; i < class_count; i++) { ! wxLuaBindClass* pLuaClass = pClass + i; // pLuaClass->baseclass = NULL; FIXME *************** *** 1781,1785 **** } ! const WXLUACLASS* wxLuaState::GetLuaClass(int iClassTag) const { wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState")); --- 1781,1785 ---- } ! const wxLuaBindClass* wxLuaState::GetLuaClass(int iClassTag) const { wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState")); *************** *** 1789,1795 **** if (wxlua_tget(L, iClassTag) && lua_istable(L, -1)) { ! lua_pushstring(L, "WXLUACLASS"); // t[iClassTag] = { __gc = WXLUACLASS (or nil if not a class tag) lua_rawget(L, -2); ! const WXLUACLASS* wxlClass = (WXLUACLASS *)lua_touserdata(L, -1); // actually lightuserdata lua_pop(L, 2); // pop wxLuaReferences table and lightuserdata (or nil if none) --- 1789,1795 ---- if (wxlua_tget(L, iClassTag) && lua_istable(L, -1)) { ! lua_pushstring(L, "wxLuaBindClass"); // t[iClassTag] = { __gc = wxLuaBindClass (or nil if not a class tag) lua_rawget(L, -2); ! const wxLuaBindClass* wxlClass = (wxLuaBindClass *)lua_touserdata(L, -1); // actually lightuserdata lua_pop(L, 2); // pop wxLuaReferences table and lightuserdata (or nil if none) *************** *** 1802,1806 **** /* ! WXLUACLASS classItem; classItem.class_tag = &iClassTag; --- 1802,1806 ---- /* ! wxLuaBindClass classItem; classItem.class_tag = &iClassTag; *************** *** 1812,1819 **** // this relies on LUA allocating tags in ascending order of definition // if LUA stops doing this, then the search may break. ! const WXLUACLASS *pLuaClass = (WXLUACLASS *) bsearch(&classItem, binding->GetLuaClassList(), binding->GetLuaClassCount(), ! sizeof(WXLUACLASS), wxLuaClassListCompareByTag); if (pLuaClass) --- 1812,1819 ---- // this relies on LUA allocating tags in ascending order of definition // if LUA stops doing this, then the search may break. ! const wxLuaBindClass *pLuaClass = (wxLuaBindClass *) bsearch(&classItem, binding->GetLuaClassList(), binding->GetLuaClassCount(), ! sizeof(wxLuaBindClass), wxLuaClassListCompareByTag); if (pLuaClass) *************** *** 1825,1829 **** } ! const WXLUACLASS* wxLuaState::GetLuaClass(const char* className) const { wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState")); --- 1825,1829 ---- } ! const wxLuaBindClass* wxLuaState::GetLuaClass(const char* className) const { wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState")); *************** *** 1834,1840 **** lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the classes table) ! lua_pushstring(L, className); // t["className"] = WXLUACLASS (or nil if not a class tag) lua_rawget(L, -2); ! const WXLUACLASS* wxlClass = (WXLUACLASS *)lua_touserdata(L, -1); // actually lightuserdata lua_pop(L, 2); // pop wxLuaClasses table and lightuserdata --- 1834,1840 ---- lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the classes table) ! lua_pushstring(L, className); // t["className"] = wxLuaBindClass (or nil if not a class tag) lua_rawget(L, -2); ! const wxLuaBindClass* wxlClass = (wxLuaBindClass *)lua_touserdata(L, -1); // actually lightuserdata lua_pop(L, 2); // pop wxLuaClasses table and lightuserdata *************** *** 1843,1847 **** } ! const WXLUACLASS* wxLuaState::GetLuaClass(const WXLUAMETHOD* method) const { wxLuaBindingList::compatibility_iterator node; --- 1843,1847 ---- } ! const wxLuaBindClass* wxLuaState::GetLuaClass(const wxLuaBindMethod* method) const { wxLuaBindingList::compatibility_iterator node; *************** *** 1850,1854 **** wxLuaBinding* binding = node->GetData(); ! const WXLUACLASS *pLuaClass = binding->GetLuaClass(method); if (pLuaClass) return pLuaClass; --- 1850,1854 ---- wxLuaBinding* binding = node->GetData(); ! const wxLuaBindClass *pLuaClass = binding->GetLuaClass(method); if (pLuaClass) return pLuaClass; *************** *** 1857,1861 **** return NULL; } ! const WXLUACLASS* wxLuaState::GetLuaClass(const WXLUAMETHOD_CFUNC* method_cfunc) const { wxLuaBindingList::compatibility_iterator node; --- 1857,1861 ---- return NULL; } ! const wxLuaBindClass* wxLuaState::GetLuaClass(const wxLuaBindCFunc* method_cfunc) const { wxLuaBindingList::compatibility_iterator node; *************** *** 1864,1868 **** wxLuaBinding* binding = node->GetData(); ! const WXLUACLASS *pLuaClass = binding->GetLuaClass(method_cfunc); if (pLuaClass) return pLuaClass; --- 1864,1868 ---- wxLuaBinding* binding = node->GetData(); ! const wxLuaBindClass *pLuaClass = binding->GetLuaClass(method_cfunc); if (pLuaClass) return pLuaClass; *************** *** 1877,1881 **** return true; ! const WXLUACLASS *pLuaClass = GetLuaClass(iClassTag); if (pLuaClass && pLuaClass->baseclass) return IsDerivedClass(*pLuaClass->baseclass->class_tag, iBaseClassTag); --- 1877,1881 ---- return true; ! const wxLuaBindClass *pLuaClass = GetLuaClass(iClassTag); if (pLuaClass && pLuaClass->baseclass) return IsDerivedClass(*pLuaClass->baseclass->class_tag, iBaseClassTag); *************** *** 1884,1888 **** } ! const WXLUAEVENT* wxLuaState::GetLuaEvent(wxEventType eventType_) const { wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState")); --- 1884,1888 ---- } ! const wxLuaBindEvent* wxLuaState::GetLuaEvent(wxEventType eventType_) const { wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState")); *************** *** 1892,1896 **** { wxLuaBinding* binding = node->GetData(); ! const WXLUAEVENT *pLuaEvent = binding->GetEvent(eventType_); if (pLuaEvent) --- 1892,1896 ---- { wxLuaBinding* binding = node->GetData(); ! const wxLuaBindEvent *pLuaEvent = binding->GetEvent(eventType_); if (pLuaEvent) *************** *** 1933,1937 **** if (M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxEvent == 0) { ! const WXLUACLASS* luaClass = GetLuaClass("wxEvent"); wxCHECK_MSG(luaClass, 0, wxT("wxEvent lua tag is missing in wxLuaState, forgot to add wxWidgets binding?")); M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxEvent = *luaClass->class_tag; --- 1933,1937 ---- if (M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxEvent == 0) { ! const wxLuaBindClass* luaClass = GetLuaClass("wxEvent"); wxCHECK_MSG(luaClass, 0, wxT("wxEvent lua tag is missing in wxLuaState, forgot to add wxWidgets binding?")); M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxEvent = *luaClass->class_tag; *************** *** 1947,1951 **** if (M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxWindow == 0) { ! const WXLUACLASS* luaClass = GetLuaClass("wxWindow"); wxCHECK_MSG(luaClass, 0, wxT("wxWindow lua tag is missing in wxLuaState, forgot to add wxWidgets binding?")); M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxWindow = *luaClass->class_tag; --- 1947,1951 ---- if (M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxWindow == 0) { ! const wxLuaBindClass* luaClass = GetLuaClass("wxWindow"); wxCHECK_MSG(luaClass, 0, wxT("wxWindow lua tag is missing in wxLuaState, forgot to add wxWidgets binding?")); M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxWindow = *luaClass->class_tag; *************** *** 1961,1965 **** if (M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxString == 0) { ! const WXLUACLASS* luaClass = GetLuaClass("wxString"); wxCHECK_MSG(luaClass, 0, wxT("wxString lua tag is missing in wxLuaState, forgot to add wxWidgets binding?")); M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxString = *luaClass->class_tag; --- 1961,1965 ---- if (M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxString == 0) { ! const wxLuaBindClass* luaClass = GetLuaClass("wxString"); wxCHECK_MSG(luaClass, 0, wxT("wxString lua tag is missing in wxLuaState, forgot to add wxWidgets binding?")); M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxString = *luaClass->class_tag; *************** *** 2398,2402 **** return wxT("wxLuaFunction"); ! const WXLUACLASS *pClass = GetLuaClass(tag); if (pClass) return lua2wx(pClass->name); --- 2398,2402 ---- return wxT("wxLuaFunction"); ! const wxLuaBindClass *pClass = GetLuaClass(tag); if (pClass) return lua2wx(pClass->name); *************** *** 2405,2415 **** } ! WXLUAMETHOD* wxLuaState::GetLuaMethod(const WXLUACLASS *wxlClass, const char *methodName) { int i_method, method_count = wxlClass->methods_n; // find a method in the class, recurse through classes from which this class is derived. for (i_method = 0; i_method < method_count; ++i_method) { ! WXLUAMETHOD *wxlMethod = wxlClass->methods + i_method; if (WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_METHOD | WXLUAMETHOD_GETPROP) && (strcmp(wxlMethod->name, methodName) == 0)) --- 2405,2417 ---- } ! wxLuaBindMethod* wxLuaState::GetLuaMethod(const wxLuaBindClass *wxlClass, const char *methodName, bool search_baseclasses) { + wxCHECK_MSG(wxlClass, NULL, wxT("Invalid wxLuaBindClass to find method from.")); + int i_method, method_count = wxlClass->methods_n; // find a method in the class, recurse through classes from which this class is derived. for (i_method = 0; i_method < method_count; ++i_method) { ! wxLuaBindMethod *wxlMethod = wxlClass->methods + i_method; if (WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_METHOD | WXLUAMETHOD_GETPROP) && (strcmp(wxlMethod->name, methodName) == 0)) *************** *** 2419,2430 **** if (!WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_OVERLOAD_BASE)) { ! WXLUACLASS *baseClass = wxlClass->baseclass; ! WXLUAMETHOD *parentMethod = wxlMethod; while (baseClass) { ! parentMethod->type |= WXLUAMETHOD_OVERLOAD_BASE; ! WXLUAMETHOD* baseMethod = GetLuaMethod(baseClass, methodName); if (baseMethod) { --- 2421,2432 ---- if (!WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_OVERLOAD_BASE)) { ! wxLuaBindClass *baseClass = wxlClass->baseclass; ! wxLuaBindMethod *parentMethod = wxlMethod; while (baseClass) { ! parentMethod->type |= WXLUAMETHOD_OVERLOAD_BASE; // have checked this ! wxLuaBindMethod* baseMethod = GetLuaMethod(baseClass, methodName, false); if (baseMethod) { *************** *** 2445,2449 **** } ! if (wxlClass->baseclass) return GetLuaMethod(wxlClass->baseclass, methodName); --- 2447,2451 ---- } ! if (search_baseclasses && wxlClass->baseclass) return GetLuaMethod(wxlClass->baseclass, methodName); *************** *** 2451,2457 **** } ! WXLUAMETHOD* wxLuaState::GetLuaProperty(const WXLUACLASS *wxlClass, const char *propName, bool isLuaSetProp) { ! wxCHECK_MSG(wxlClass, NULL, wxT("Invalid WXLUACLASS in wxLuaState::GetLuaProperty")); int i_method, method_count = wxlClass->methods_n; --- 2453,2459 ---- } ! wxLuaBindMethod* wxLuaState::GetLuaProperty(const wxLuaBindClass *wxlClass, const char *propName, bool isLuaSetProp) { ! wxCHECK_MSG(wxlClass, NULL, wxT("Invalid wxLuaBindClass in wxLuaState::GetLuaProperty")); int i_method, method_count = wxlClass->methods_n; *************** *** 2459,2463 **** for (i_method = 0; i_method < method_count; ++i_method) { ! WXLUAMETHOD *wxlMethod = wxlClass->methods + i_method; if (isLuaSetProp) { --- 2461,2465 ---- for (i_method = 0; i_method < method_count; ++i_method) { ! wxLuaBindMethod *wxlMethod = wxlClass->methods + i_method; if (isLuaSetProp) { *************** *** 3255,3259 **** ! wxArrayString wxLuaState::CreateMethodArgTagsMsg(struct WXLUAMETHOD* wxlMethod) { wxArrayString overloadMethodArray; --- 3257,3261 ---- ! wxArrayString wxLuaState::CreateMethodArgTagsMsg(struct wxLuaBindMethod* wxlMethod) { wxArrayString overloadMethodArray; *************** *** 3261,3274 **** int i_func = 0; // count total number of overloads ! WXLUAMETHOD* method = wxlMethod; // traverse the methods down the baseclass methods if any while (method) { ! WXLUAMETHOD_CFUNC* funcs = method->funcs; int i, arg, funcs_count = wxlMethod->funcs_n; wxString className; ! const WXLUACLASS* wxlClass = GetLuaClass(method); if (wxlClass) className = lua2wx(wxlClass->name) + wxT("::"); --- 3263,3276 ---- int i_func = 0; // count total number of overloads ! wxLuaBindMethod* method = wxlMethod; // traverse the methods down the baseclass methods if any while (method) { ! wxLuaBindCFunc* funcs = method->funcs; int i, arg, funcs_count = wxlMethod->funcs_n; wxString className; ! const wxLuaBindClass* wxlClass = GetLuaClass(method); if (wxlClass) className = lua2wx(wxlClass->name) + wxT("::"); *************** *** 3329,3338 **** // Redirect lua function call to 1 method from a list of overloaded functions ! int LUACALL wxLuaState::CallOverloadedFunction(struct WXLUAMETHOD* wxlMethod) { wxCHECK_MSG(wxlMethod, 0, wxT("Invalid overloaded method table")); // don't remove the table, but do skip past it when counting args ! bool remove_table = wxlua_removetableforcall(GetLuaState(), true); int i, arg; --- 3331,3340 ---- // Redirect lua function call to 1 method from a list of overloaded functions ! int LUACALL wxLuaState::CallOverloadedFunction(struct wxLuaBindMethod* wxlMethod) { wxCHECK_MSG(wxlMethod, 0, wxT("Invalid overloaded method table")); // don't remove the table, but do skip past it when counting args ! bool remove_table = wxluabind_removetableforcall(GetLuaState(), true); int i, arg; *************** *** 3351,3355 **** // only look at the methods that could possibly work and traverse base classes wxArrayPtrVoid funcArray; ! WXLUAMETHOD* method = wxlMethod; while (method) { --- 3353,3357 ---- // only look at the methods that could possibly work and traverse base classes wxArrayPtrVoid funcArray; ! wxLuaBindMethod* method = wxlMethod; while (method) { *************** *** 3368,3372 **** } ! WXLUAMETHOD_CFUNC* bestFunc = NULL; // store the last function that worked. // Look at the available functions in parallel, per arg --- 3370,3374 ---- } ! wxLuaBindCFunc* bestFunc = NULL; // store the last function that worked. // Look at the available functions in parallel, per arg *************** *** 3378,3382 **** for (i = 0; i < (int)funcArray.GetCount(); i++) { ! WXLUAMETHOD_CFUNC* func = (WXLUAMETHOD_CFUNC*)funcArray[i]; bestFunc = func; invalidArg = arg; --- 3380,3384 ---- for (i = 0; i < (int)funcArray.GetCount(); i++) { ! wxLuaBindCFunc* func = (wxLuaBindCFunc*)funcArray[i]; bestFunc = func; invalidArg = arg; *************** *** 3422,3426 **** if (funcArray.GetCount() > 0) { ! lua_CFunction func = ((WXLUAMETHOD_CFUNC*)funcArray[0])->func; // successfully found overloaded function to handle wxLua call --- 3424,3428 ---- if (funcArray.GetCount() > 0) { ! lua_CFunction func = ((wxLuaBindCFunc*)funcArray[0])->func; // successfully found overloaded function to handle wxLua call Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** wxlbind.cpp 6 Jun 2007 18:03:48 -0000 1.64 --- wxlbind.cpp 6 Jun 2007 23:43:16 -0000 1.65 *************** *** 33,37 **** wxLuaArgTag s_wxluaargArray_None[1] = {0}; ! WXLUADEFINE s_wxluadefineArray_None[1] = {{0, 0}}; int s_wxluaarg_None = WXLUAARG_None; --- 33,37 ---- wxLuaArgTag s_wxluaargArray_None[1] = {0}; ! wxLuaBindDefine s_wxluadefineArray_None[1] = {{0, 0}}; int s_wxluaarg_None = WXLUAARG_None; *************** *** 94,97 **** --- 94,98 ---- // remove the userdata *this from the stack + // can't do this for static and nonstatic overloaded functions //if (pFunction->m_wxlMethod && WXLUA_HASBIT(pFunction->m_wxlMethod->type, WXLUAMETHOD_STATIC)) // lua_remove(L, 1); *************** *** 258,265 **** // ---------------------------------------------------------------------------- ! // wxlua_garbageCollect - if the class defines a gc function, then call it. // ---------------------------------------------------------------------------- ! int LUACALL wxlua_garbageCollect(lua_State *L) { wxLuaState wxlState(L); --- 259,266 ---- // ---------------------------------------------------------------------------- ! // wxluabind_garbageCollect - if the class defines a gc function, then call it. // ---------------------------------------------------------------------------- ! int LUACALL wxluabind_garbageCollect(lua_State *L) { wxLuaState wxlState(L); *************** *** 267,271 **** int retVal = 0; ! WXLUACLASS *wxlClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); //bool tracked = false; --- 268,272 ---- int retVal = 0; ! wxLuaBindClass *wxlClass = (wxLuaBindClass *)lua_touserdata(L, lua_upvalueindex(1)); //bool tracked = false; *************** *** 277,281 **** key = (long)wxlState.ttouserdata(1, true); ! wxCHECK_MSG(key != 0, 0, wxT("NULL user data in wxlua_garbageCollect")); //tracked = --- 278,282 ---- key = (long)wxlState.ttouserdata(1, true); ! wxCHECK_MSG(key != 0, 0, wxT("NULL user data in wxluabind_garbageCollect")); //tracked = *************** *** 316,320 **** } ! //wxPrintf(wxT("wxlua_garbageCollect - '%s' tag %d lua %d key %ld tracked %d return value %d\n"), // lua2wx(wxlClass ? wxlClass->name : "").c_str(), wxlClass ? *wxlClass->class_tag : 0, (int)L, key, (int)tracked, retVal); --- 317,321 ---- } ! //wxPrintf(wxT("wxluabind_garbageCollect - '%s' tag %d lua %d key %ld tracked %d return value %d\n"), // lua2wx(wxlClass ? wxlClass->name : "").c_str(), wxlClass ? *wxlClass->class_tag : 0, (int)L, key, (int)tracked, retVal); *************** *** 323,327 **** // ---------------------------------------------------------------------------- ! // wxlua_getTableFunc // // Called by LUA to find the method that corresponds to a given method name. --- 324,328 ---- // ---------------------------------------------------------------------------- ! // wxluabind_getTableFunc // // Called by LUA to find the method that corresponds to a given method name. *************** *** 335,339 **** #define CALL_BASECLASS_FUNC_LEN 5 ! int LUACALL wxlua_getTableFunc(lua_State *L) { wxLuaState wxlState(L); --- 336,340 ---- #define CALL_BASECLASS_FUNC_LEN 5 ! int LUACALL wxluabind_getTableFunc(lua_State *L) { wxLuaState wxlState(L); *************** *** 354,358 **** bool found = false; int result = 0; ! WXLUACLASS *wxlClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); const char *name = "{unknown}"; wxCharBuffer funcName; --- 355,359 ---- bool found = false; int result = 0; ! wxLuaBindClass *wxlClass = (wxLuaBindClass *)lua_touserdata(L, lua_upvalueindex(1)); const char *name = "{unknown}"; wxCharBuffer funcName; *************** *** 387,391 **** if (!found) { ! WXLUAMETHOD* wxlMethod = wxlState.GetLuaMethod(wxlClass, name); if (wxlMethod != NULL) { --- 388,392 ---- if (!found) { ! wxLuaBindMethod* wxlMethod = wxlState.GetLuaMethod(wxlClass, name); if (wxlMethod != NULL) { *************** *** 432,436 **** //if (lua2wx(funcName).Find(wxT("OnBeginDocument")) != -1) ! // wxPrintf(wxT("wxlua_getTableFunc func '%s' wxlClass %d '%s', userdata %d, lightuserdata %d, ttag %d, class_tag %d lua_State %d wxLuaStateRefData %d call base %d\n"), // lua2wx(funcName).c_str(), (long)wxlClass, wxlClass ? lua2wx(wxlClass->name).c_str() : wxT(""), init_isuserdata, init_islightuserdata, init_ttag, init_class_tag, (long)L, (long)wxlState.GetRefData(), (int)wxlState.GetCallBaseClassFunction()); --- 433,437 ---- //if (lua2wx(funcName).Find(wxT("OnBeginDocument")) != -1) ! // wxPrintf(wxT("wxluabind_getTableFunc func '%s' wxlClass %d '%s', userdata %d, lightuserdata %d, ttag %d, class_tag %d lua_State %d wxLuaStateRefData %d call base %d\n"), // lua2wx(funcName).c_str(), (long)wxlClass, wxlClass ? lua2wx(wxlClass->name).c_str() : wxT(""), init_isuserdata, init_islightuserdata, init_ttag, init_class_tag, (long)L, (long)wxlState.GetRefData(), (int)wxlState.GetCallBaseClassFunction()); *************** *** 442,446 **** // ---------------------------------------------------------------------------- ! // wxlua_setTableFunc // // Called by LUA to find the method that corresponds to a given method name. --- 443,447 ---- // ---------------------------------------------------------------------------- ! // wxluabind_setTableFunc // // Called by LUA to find the method that corresponds to a given method name. *************** *** 449,462 **** // ---------------------------------------------------------------------------- ! int LUACALL wxlua_setTableFunc(lua_State *L) { wxLuaState wxlState(L); wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! WXLUACLASS *wxlClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); const char *name = lua_tostring(L, 2); bool found = false; ! //wxPrintf(wxT("wxlua_setTableFunc '%s'\n"), lua2wx(name).c_str()); if ((wxlClass != NULL) && lua_isuserdata(L, 1) && --- 450,463 ---- // ---------------------------------------------------------------------------- ! int LUACALL wxluabind_setTableFunc(lua_State *L) { wxLuaState wxlState(L); wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! wxLuaBindClass *wxlClass = (wxLuaBindClass *)lua_touserdata(L, lua_upvalueindex(1)); const char *name = lua_tostring(L, 2); bool found = false; ! //wxPrintf(wxT("wxluabind_setTableFunc '%s'\n"), lua2wx(name).c_str()); if ((wxlClass != NULL) && lua_isuserdata(L, 1) && *************** *** 464,469 **** (wxlState.ttag(1) == *wxlClass->class_tag)) { ! // See if there is a WXLUAMETHOD_SETPROP in the WXLUACLASS's WXLUAMETHODs ! WXLUAMETHOD *wxlMethod = wxlState.GetLuaProperty(wxlClass, name, true); if (wxlMethod != NULL) { --- 465,470 ---- (wxlState.ttag(1) == *wxlClass->class_tag)) { ! // See if there is a WXLUAMETHOD_SETPROP in the wxLuaBindClass's wxLuaBindMethods ! wxLuaBindMethod *wxlMethod = wxlState.GetLuaProperty(wxlClass, name, true); if (wxlMethod != NULL) { *************** *** 483,487 **** //wxPrintf(wxT("'%s' %d\n"), lua2wx(str).c_str(), lua_gettop(L)); ! //wxLuaCheckStack stk(L, wxT("wxlua_setTableFunc")); //stk.DumpStack(); --- 484,488 ---- //wxPrintf(wxT("'%s' %d\n"), lua2wx(str).c_str(), lua_gettop(L)); ! //wxLuaCheckStack stk(L, wxT("wxluabind_setTableFunc")); //stk.DumpStack(); *************** *** 543,556 **** } ! static int wxlua_checkremovetable = 0; ! int wxlua_removetableforcall(lua_State* L, bool only_check) { //void* p = (void *)lua_tocfunction(L, lua_upvalueindex(1)); void* p = (void *)lua_touserdata(L, lua_upvalueindex(1)); ! if (!only_check && (p == &wxlua_checkremovetable)) lua_remove(L, 1); ! return p == &wxlua_checkremovetable; } --- 544,557 ---- } ! static int wxluabind_checkremovetable = 0; ! int wxluabind_removetableforcall(lua_State* L, bool only_check) { //void* p = (void *)lua_tocfunction(L, lua_upvalueindex(1)); void* p = (void *)lua_touserdata(L, lua_upvalueindex(1)); ! if (!only_check && (p == &wxluabind_checkremovetable)) lua_remove(L, 1); ! return p == &wxluabind_checkremovetable; } *************** *** 560,564 **** int wxLuaEventListCompareFn(const void *p1, const void *p2) { ! return (*((const WXLUAEVENT *) p1)->eventType) - (*((const WXLUAEVENT *) p2)->eventType); } --- 561,565 ---- int wxLuaEventListCompareFn(const void *p1, const void *p2) { ! return (*((const wxLuaBindEvent *) p1)->eventType) - (*((const wxLuaBindEvent *) p2)->eventType); } *************** *** 568,572 **** int wxLuaClassListCompareByTag(const void *p1, const void *p2) { ! return (*((const WXLUACLASS *) p1)->class_tag) - (*((const WXLUACLASS *) p2)->class_tag); } --- 569,573 ---- int wxLuaClassListCompareByTag(const void *p1, const void *p2) { ! return (*((const wxLuaBindClass *) p1)->class_tag) - (*((const wxLuaBindClass *) p2)->class_tag); } *************** *** 580,588 **** wxLuaBinding::wxLuaBinding() : wxObject(), ! m_classCount(0), m_classList(NULL), ! m_defineCount(0), m_defineList(NULL), ! m_eventCount(0), m_eventList(NULL), ! m_objectCount(0), m_objectList(NULL), ! m_functionCount(0), m_functionList(NULL), m_bindings_registered(false), m_startTag(0), --- 581,589 ---- wxLuaBinding::wxLuaBinding() : wxObject(), ! m_classCount(0), m_classArray(NULL), ! m_defineCount(0), m_defineArray(NULL), ! m_eventCount(0), m_eventArray(NULL), ! m_objectCount(0), m_objectArray(NULL), ! m_functionCount(0), m_functionArray(NULL), m_bindings_registered(false), m_startTag(0), *************** *** 694,700 **** static const luaL_reg s_funcTable[] = { ! {"__gc", wxlua_garbageCollect }, ! {"__index", wxlua_getTableFunc }, ! {"__newindex", wxlua_setTableFunc } }; static const size_t s_funcCount = sizeof(s_funcTable)/sizeof(s_funcTable[0]); --- 695,701 ---- static const luaL_reg s_funcTable[] = { ! {"__gc", wxluabind_garbageCollect }, ! {"__index", wxluabind_getTableFunc }, ! {"__newindex", wxluabind_setTableFunc } }; static const size_t s_funcCount = sizeof(s_funcTable)/sizeof(s_funcTable[0]); *************** *** 713,717 **** for (size_t i_class = 0; i_class < m_classCount; ++i_class) { ! WXLUACLASS *wxlClass = m_classList + i_class; // Create a new tag if registering types, else use tag already set --- 714,718 ---- for (size_t i_class = 0; i_class < m_classCount; ++i_class) { ! wxLuaBindClass *wxlClass = m_classArray + i_class; // Create a new tag if registering types, else use tag already set *************** *** 724,735 **** iTag = *wxlClass->class_tag; ! // store a lookup table for the class tags to WXLUACLASS structs wxlua_tget(L, *wxlClass->class_tag); ! lua_pushstring(L, "WXLUACLASS"); lua_pushlightuserdata(L, (void *)wxlClass); lua_rawset(L, -3); // t[name] = tag lua_remove(L, -1); // remove wxLua's registry wxLuaClasses table ! // store a lookup table for the class names to WXLUACLASS structs wxlua_pushstring_wxLuaClasses(L); lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the classes table) --- 725,736 ---- iTag = *wxlClass->class_tag; ! // store a lookup table for the class tags to wxLuaBindClass structs wxlua_tget(L, *wxlClass->class_tag); ! lua_pushstring(L, "wxLuaBindClass"); lua_pushlightuserdata(L, (void *)wxlClass); lua_rawset(L, -3); // t[name] = tag lua_remove(L, -1); // remove wxLua's registry wxLuaClasses table ! // store a lookup table for the class names to wxLuaBindClass structs wxlua_pushstring_wxLuaClasses(L); lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the classes table) *************** *** 746,750 **** } - int i_method, method_count = wxlClass->methods_n; --- 747,750 ---- *************** *** 776,780 **** for (i_method = 0; i_method < method_count; ++i_method) { ! WXLUAMETHOD *wxlMethod = wxlClass->methods + i_method; if (WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_CONSTRUCTOR | WXLUAMETHOD_CFUNCTION)) { --- 776,780 ---- for (i_method = 0; i_method < method_count; ++i_method) { ! wxLuaBindMethod *wxlMethod = wxlClass->methods + i_method; if (WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_CONSTRUCTOR | WXLUAMETHOD_CFUNCTION)) { *************** *** 798,803 **** lua_pushstring(L, "__call"); //lua_pushcfunction(L, wxlMethod->func); ! lua_pushlightuserdata(L, &wxlua_checkremovetable); // push tag to recognize table call ! lua_pushcclosure(L, wxlMethod->funcs[0].func, 1); // push func with tag as upvalue lua_rawset(L, -3); --- 798,803 ---- lua_pushstring(L, "__call"); //lua_pushcfunction(L, wxlMethod->func); ! lua_pushlightuserdata(L, &wxluabind_checkremovetable); // push tag to recognize table call ! lua_pushcclosure(L, wxlMethod->funcs[0].func, 1); // push func with tag as upvalue lua_rawset(L, -3); *************** *** 844,853 **** for (size_t i = 0; i < m_functionCount; ++i) { ! if (strcmp(m_functionList[i].name, "wxGetCwd") == 0) { ! wxPrintf(wxT("Adding wxGetCwd '%s' %p\n"), lua2wx(m_functionList[i].name).c_str(), m_functionList[i].func); ! lua_pushstring(L, m_functionList[i].name); ! lua_pushcfunction(L, m_functionList[i].func); lua_rawset(L, -3); // same as lua_setfield(L, -2, "key") --- 844,853 ---- for (size_t i = 0; i < m_functionCount; ++i) { ! if (strcmp(m_functionArray[i].name, "wxGetCwd") == 0) { ! wxPrintf(wxT("Adding wxGetCwd '%s' %p\n"), lua2wx(m_functionArray[i].name).c_str(), m_functionArray[i].func); ! lua_pushstring(L, m_functionArray[i].name); ! lua_pushcfunction(L, m_functionArray[i].func); lua_rawset(L, -3); // same as lua_setfield(L, -2, "key") *************** *** 882,886 **** for (size_t i_func = 0; i_func < m_functionCount; ++i_func) { ! WXLUAMETHOD *wxlMethod = m_functionList + i_func; lua_pushstring(L, wxlMethod->name); lua_pushcfunction(L, wxlMethod->funcs[0].func); --- 882,886 ---- for (size_t i_func = 0; i_func < m_functionCount; ++i_func) { ! wxLuaBindMethod *wxlMethod = m_functionArray + i_func; lua_pushstring(L, wxlMethod->name); lua_pushcfunction(L, wxlMethod->funcs[0].func); *************** *** 899,903 **** for (size_t i_define = 0; i_define < m_defineCount; ++i_define) { ! WXLUADEFINE *pDefine = m_defineList + i_define; lua_pushstring(L, pDefine->name); lua_pushnumber(L, pDefine->value); --- 899,903 ---- for (size_t i_define = 0; i_define < m_defineCount; ++i_define) { ! wxLuaBindDefine *pDefine = m_defineArray + i_define; lua_pushstring(L, pDefine->name); lua_pushnumber(L, pDefine->value); *************** *** 908,912 **** for (size_t i_string = 0; i_string < m_stringCount; ++i_string) { ! WXLUASTRING *pString = m_stringList + i_string; lua_pushstring(L, pString->name); lua_pushstring(L, wx2lua(pString->value)); --- 908,912 ---- for (size_t i_string = 0; i_string < m_stringCount; ++i_string) { ! wxLuaBindString *pString = m_stringArray + i_string; lua_pushstring(L, pString->name); lua_pushstring(L, wx2lua(pString->value)); *************** *** 917,921 **** for (size_t i_object = 0; i_object < m_objectCount; ++i_object) { ! WXLUAOBJECT *pObject = m_objectList + i_object; lua_pushstring(L, pObject->name); --- 917,921 ---- for (size_t i_object = 0; i_object < m_objectCount; ++i_object) { ! wxLuaBindObject *pObject = m_objectArray + i_object; lua_pushstring(L, pObject->name); *************** *** 931,935 **** for (size_t i_event = 0; i_event < m_eventCount; ++i_event) { ! WXLUAEVENT *pEvent = m_eventList + i_event; lua_pushstring(L, pEvent->name); lua_pushnumber(L, *pEvent->eventType); --- 931,935 ---- for (size_t i_event = 0; i_event < m_eventCount; ++i_event) { ! wxLuaBindEvent *pEvent = m_eventArray + i_event; lua_pushstring(L, pEvent->name); lua_pushnumber(L, *pEvent->eventType); *************** *** 938,945 **** // sort the event list into order for faster lookup. ! qsort(m_eventList, m_eventCount, sizeof(WXLUAEVENT), wxLuaEventListCompareFn); } ! bool wxLuaBinding::SetBaseClass(WXLUACLASS *wxlClass) { if (!wxlClass->baseclassName) // check if there is a baseclassName at all --- 938,945 ---- // sort the event list into order for faster lookup. ! qsort(m_eventArray, m_eventCount, sizeof(wxLuaBindEvent), wxLuaEventListCompareFn); } ! bool wxLuaBinding::SetBaseClass(wxLuaBindClass *wxlClass) { if (!wxlClass->baseclassName) // check if there is a baseclassName at all *************** *** 948,952 **** for (size_t n = 0; n < m_classCount; ++n) { ! WXLUACLASS* baseClass = m_classList + n; // potential base class if (strcmp(baseClass->name, wxlClass->baseclassName) == 0) --- 948,952 ---- for (size_t n = 0; n < m_classCount; ++n) { ! wxLuaBindClass* baseClass = m_classArray + n; // potential base class if (strcmp(baseClass->name, wxlClass->baseclassName) == 0) *************** *** 960,972 **** } ! const WXLUAEVENT* wxLuaBinding::GetEvent(wxEventType eventType_) const { const int eventType = eventType_; ! WXLUAEVENT eventItem = { &eventType, "" }; ! const WXLUAEVENT *pLuaEvent = (WXLUAEVENT *)bsearch(&eventItem, ! m_eventList, m_eventCount, ! sizeof(WXLUAEVENT), wxLuaEventListCompareFn); return pLuaEvent; --- 960,972 ---- } ! const wxLuaBindEvent* wxLuaBinding::GetEvent(wxEventType eventType_) const { const int eventType = eventType_; ! wxLuaBindEvent eventItem = { &eventType, "" }; ! const wxLuaBindEvent *pLuaEvent = (wxLuaBindEvent *)bsearch(&eventItem, ! m_eventArray, m_eventCount, ! sizeof(wxLuaBindEvent), wxLuaEventListCompareFn); return pLuaEvent; *************** *** 975,987 **** wxString wxLuaBinding::GetEventTypeName(wxEventType eventType) const { ! const WXLUAEVENT* luaEvent = GetEvent(eventType); return (luaEvent != NULL) ? lua2wx(luaEvent->name) : wxString(); } ! const WXLUACLASS* wxLuaBinding::GetLuaClass(const WXLUAMETHOD* wxlMethod) const { for (size_t i_class = 0; i_class < m_classCount; ++i_class) { ! WXLUACLASS *wxlClass = m_classList + i_class; int i_method, method_count = wxlClass->methods_n; --- 975,987 ---- wxString wxLuaBinding::GetEventTypeName(wxEventType eventType) const { ! const wxLuaBindEvent* luaEvent = GetEvent(eventType); return (luaEvent != NULL) ? lua2wx(luaEvent->name) : wxString(); } ! const wxLuaBindClass* wxLuaBinding::GetLuaClass(const wxLuaBindMethod* wxlMethod) const { for (size_t i_class = 0; i_class < m_classCount; ++i_class) { ! wxLuaBindClass *wxlClass = m_classArray + i_class; int i_method, method_count = wxlClass->methods_n; *************** *** 1000,1008 **** } ! const WXLUACLASS* wxLuaBinding::GetLuaClass(const WXLUAMETHOD_CFUNC* wxlMethod_cfunc) const { for (size_t i_class = 0; i_class < m_classCount; ++i_class) { ! WXLUACLASS *wxlClass = m_classList + i_class; int i_method, method_count = wxlClass->methods_n; --- 1000,1008 ---- } ! const wxLuaBindClass* wxLuaBinding::GetLuaClass(const wxLuaBindCFunc* wxlMethod_cfunc) const { for (size_t i_class = 0; i_class < m_classCount; ++i_class) { ! wxLuaBindClass *wxlClass = m_classArray + i_class; int i_method, method_count = wxlClass->methods_n; Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxlcallb.cpp 23 Mar 2007 00:09:36 -0000 1.28 --- wxlcallb.cpp 6 Jun 2007 23:43:16 -0000 1.29 *************** *** 118,122 **** int eventClassTag = wxlState.GetwxEventTag(); // get the s_wxluatag_wxEvent ! const WXLUAEVENT *pLuaEvent = wxlState.GetLuaEvent(pEvent->GetEventType()); if (pLuaEvent) eventClassTag = *pLuaEvent->class_tag; --- 118,122 ---- int eventClassTag = wxlState.GetwxEventTag(); // get the s_wxluatag_wxEvent ! const wxLuaBindEvent *pLuaEvent = wxlState.GetLuaEvent(pEvent->GetEventType()); if (pLuaEvent) eventClassTag = *pLuaEvent->class_tag; |
|
From: John L. <jr...@us...> - 2007-06-06 23:43:22
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/samples Modified Files: editor.wx.lua Log Message: Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent Fix %renamed listCtrl:SetItemString to now use overload SetItem Fix recursion in traversing the base class methods Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table Use NULL in bindings for items that are *pointers for clarity Use sizeof(struct name) instead of sizeof(array[0]) in bindings Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** editor.wx.lua 5 Jun 2007 21:07:26 -0000 1.52 --- editor.wx.lua 6 Jun 2007 23:43:17 -0000 1.53 *************** *** 187,191 **** statusBar = frame:CreateStatusBar( 4 ) local status_txt_width = statusBar:GetTextExtent("OVRW") ! frame:SetStatusWidths{-1, status_txt_width, status_txt_width, status_txt_width*5} frame:SetStatusText("Welcome to wxLua") --- 187,191 ---- statusBar = frame:CreateStatusBar( 4 ) local status_txt_width = statusBar:GetTextExtent("OVRW") ! frame:SetStatusWidths({-1, status_txt_width, status_txt_width, status_txt_width*5}) frame:SetStatusText("Welcome to wxLua") *************** *** 760,766 **** watchWindow:Connect(ID_ADDWATCH, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! local row = watchListCtrl:InsertStringItem(watchListCtrl:GetItemCount(), "Expr") ! watchListCtrl:SetStringItem(row, 0, "Expr") ! watchListCtrl:SetStringItem(row, 1, "Value") watchListCtrl:EditLabel(row) end) --- 760,766 ---- watchWindow:Connect(ID_ADDWATCH, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! local row = watchListCtrl:InsertItem(watchListCtrl:GetItemCount(), "Expr") ! watchListCtrl:SetItem(row, 0, "Expr") ! watchListCtrl:SetItem(row, 1, "Value") watchListCtrl:EditLabel(row) end) *************** *** 801,806 **** watchListCtrl:Connect(wx.wxEVT_COMMAND_LIST_END_LABEL_EDIT, function (event) ! watchListCtrl:SetStringItem(event:GetIndex(), ! 0, event:GetText()) ProcessWatches() event:Skip() --- 801,805 ---- watchListCtrl:Connect(wx.wxEVT_COMMAND_LIST_END_LABEL_EDIT, function (event) ! watchListCtrl:SetItem(event:GetIndex(), 0, event:GetText()) ProcessWatches() event:Skip() *************** *** 1995,2001 **** function (event) if watchListCtrl then ! watchListCtrl:SetStringItem(event:GetReference(), ! 1, ! event:GetMessage()) end end) --- 1994,2000 ---- function (event) if watchListCtrl then ! watchListCtrl:SetItem(event:GetReference(), ! 1, ! event:GetMessage()) end end) *************** *** 2022,2025 **** --- 2021,2025 ---- frame:Connect(wx.wxEVT_IDLE, function(event) + if (debugger_destroy > 0) then debugger_destroy = debugger_destroy + 1 |
