Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src clipdrag.cpp,1.18,1.19 config.cpp,1.17,1.18 controls.cpp,1.25,1.26 data.cpp,1.20,1.21 datetime.cpp,1.14,1.15 event.cpp,1.18,1.19 file.cpp,1.16,1.17 gdi.cpp,1.24,1.25 wx_bind.cpp,1.41,1.42
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8015/wxLua/modules/wxbind/src Modified Files: clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp event.cpp file.cpp gdi.cpp wx_bind.cpp Log Message: add binding tag for LuaFunction add %overload up to file.i, note static funcs don't work now add SortItems function for wxListCtrl, untested tabs -> spaces Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** config.cpp 15 May 2006 21:55:35 -0000 1.17 --- config.cpp 18 May 2006 05:47:39 -0000 1.18 *************** *** 592,596 **** } ! // static wxConfigBase* Set(wxConfigBase *pConfig = NULL) static int LUACALL wxLua_wxConfigBase_Set(lua_State *L) { --- 592,596 ---- } ! // %static wxConfigBase* Set(wxConfigBase *pConfig = NULL) static int LUACALL wxLua_wxConfigBase_Set(lua_State *L) { *************** *** 736,743 **** { LuaMethod, "GetAppName", wxLua_wxConfigBase_GetAppName, 0, 0, { 0 } }, { LuaMethod, "GetEntryType", wxLua_wxConfigBase_GetEntryType, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "GetFirstGroup", wxLua_wxConfigBase_GetFirstGroup, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, 0 } }, ! { LuaMethod, "GetFirstEntry", wxLua_wxConfigBase_GetFirstEntry, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, 0 } }, ! { LuaMethod, "GetNextGroup", wxLua_wxConfigBase_GetNextGroup, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, 0 } }, ! { LuaMethod, "GetNextEntry", wxLua_wxConfigBase_GetNextEntry, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, 0 } }, { LuaMethod, "GetNumberOfEntries", wxLua_wxConfigBase_GetNumberOfEntries, 1, 0, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "GetNumberOfGroups", wxLua_wxConfigBase_GetNumberOfGroups, 1, 0, { &s_wxluaarg_Boolean, 0 } }, --- 736,743 ---- { LuaMethod, "GetAppName", wxLua_wxConfigBase_GetAppName, 0, 0, { 0 } }, { LuaMethod, "GetEntryType", wxLua_wxConfigBase_GetEntryType, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "GetFirstGroup", wxLua_wxConfigBase_GetFirstGroup, 0, 0, { 0 } }, ! { LuaMethod, "GetFirstEntry", wxLua_wxConfigBase_GetFirstEntry, 0, 0, { 0 } }, ! { LuaMethod, "GetNextGroup", wxLua_wxConfigBase_GetNextGroup, 0, 0, { 0 } }, ! { LuaMethod, "GetNextEntry", wxLua_wxConfigBase_GetNextEntry, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetNumberOfEntries", wxLua_wxConfigBase_GetNumberOfEntries, 1, 0, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "GetNumberOfGroups", wxLua_wxConfigBase_GetNumberOfGroups, 1, 0, { &s_wxluaarg_Boolean, 0 } }, *************** *** 748,754 **** { LuaMethod, "IsExpandingEnvVars", wxLua_wxConfigBase_IsExpandingEnvVars, 0, 0, { 0 } }, { LuaMethod, "IsRecordingDefaults", wxLua_wxConfigBase_IsRecordingDefaults, 0, 0, { 0 } }, ! { LuaMethod, "Read", wxLua_wxConfigBase_Read, 3, 2, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "ReadInt", wxLua_wxConfigBase_ReadInt, 3, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "ReadFloat", wxLua_wxConfigBase_ReadFloat, 3, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, { LuaMethod, "RenameEntry", wxLua_wxConfigBase_RenameEntry, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaMethod, "RenameGroup", wxLua_wxConfigBase_RenameGroup, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, --- 748,754 ---- { LuaMethod, "IsExpandingEnvVars", wxLua_wxConfigBase_IsExpandingEnvVars, 0, 0, { 0 } }, { LuaMethod, "IsRecordingDefaults", wxLua_wxConfigBase_IsRecordingDefaults, 0, 0, { 0 } }, ! { LuaMethod, "Read", wxLua_wxConfigBase_Read, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "ReadInt", wxLua_wxConfigBase_ReadInt, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "ReadFloat", wxLua_wxConfigBase_ReadFloat, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "RenameEntry", wxLua_wxConfigBase_RenameEntry, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaMethod, "RenameGroup", wxLua_wxConfigBase_RenameGroup, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** file.cpp 3 May 2006 22:52:18 -0000 1.16 --- file.cpp 18 May 2006 05:47:39 -0000 1.17 *************** *** 286,291 **** } ! // void Assign(const wxFileName& filepath) ! static int LUACALL wxLua_wxFileName_Assign(lua_State *L) { wxLuaState wxlState(L); --- 286,291 ---- } ! // %overload void Assign(const wxFileName& filepath) ! static int LUACALL wxLua_wxFileName_Assign1(lua_State *L) { wxLuaState wxlState(L); *************** *** 300,304 **** } ! // %rename AssignFullName void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignFullName(lua_State *L) { --- 300,304 ---- } ! // %overload %rename AssignFullName void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignFullName(lua_State *L) { *************** *** 318,322 **** } ! // %rename AssignVolume void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignVolume(lua_State *L) { --- 318,322 ---- } ! // %overload %rename AssignVolume void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignVolume(lua_State *L) { *************** *** 342,346 **** } ! // %rename AssignPath void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignPath(lua_State *L) { --- 342,346 ---- } ! // %overload %rename AssignPath void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignPath(lua_State *L) { *************** *** 362,366 **** } ! // %rename AssignPathNameExt void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignPathNameExt(lua_State *L) { --- 362,366 ---- } ! // %overload %rename AssignPathNameExt void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignPathNameExt(lua_State *L) { *************** *** 1424,1427 **** --- 1424,1448 ---- + // Overloaded function bindings + + #if (wxLUA_USE_wxFileName) + // Overloaded functions for wxLua_wxFileName_Assign + static int LUACALL wxLua_wxFileName_Assign(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "Assign", wxLua_wxFileName_Assign1, 1, 1, { &s_wxluatag_wxFileName, 0 } }, + { LuaMethod, "AssignFullName", wxLua_wxFileName_AssignFullName, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, + { LuaMethod, "AssignVolume", wxLua_wxFileName_AssignVolume, 5, 4, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, + { LuaMethod, "AssignPath", wxLua_wxFileName_AssignPath, 3, 2, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, + { LuaMethod, "AssignPathNameExt", wxLua_wxFileName_AssignPathNameExt, 4, 3, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + *************** *** 1512,1518 **** { LuaMethod, "SetName", wxLua_wxFileName_SetName, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetVolume", wxLua_wxFileName_SetVolume, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "SplitPath", wxLua_wxFileName_SplitPath, 5, 4, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SplitPathVolume", wxLua_wxFileName_SplitPathVolume, 6, 5, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SplitVolume", wxLua_wxFileName_SplitVolume, 4, 3, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "Touch", wxLua_wxFileName_Touch, 0, 0, { 0 } }, { LuaMethod, "op_assign", wxLua_wxFileName_op_assign, 1, 1, { &s_wxluatag_wxFileName, 0 } }, --- 1533,1539 ---- { LuaMethod, "SetName", wxLua_wxFileName_SetName, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetVolume", wxLua_wxFileName_SetVolume, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "SplitPath", wxLua_wxFileName_SplitPath, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SplitPathVolume", wxLua_wxFileName_SplitPathVolume, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SplitVolume", wxLua_wxFileName_SplitVolume, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "Touch", wxLua_wxFileName_Touch, 0, 0, { 0 } }, { LuaMethod, "op_assign", wxLua_wxFileName_op_assign, 1, 1, { &s_wxluatag_wxFileName, 0 } }, *************** *** 1946,1950 **** { LuaMethod, "SeekEnd", wxLua_wxFile_SeekEnd, 1, 0, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "Tell", wxLua_wxFile_Tell, 0, 0, { 0 } }, ! { LuaMethod, "Write", wxLua_wxFile_Write, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, { LuaMethod, "WriteString", wxLua_wxFile_WriteString, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaDelete, "wxFile", wxLua_wxFile_destructor, 0, 0, {0} }, --- 1967,1971 ---- { LuaMethod, "SeekEnd", wxLua_wxFile_SeekEnd, 1, 0, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "Tell", wxLua_wxFile_Tell, 0, 0, { 0 } }, ! { LuaMethod, "Write", wxLua_wxFile_Write, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "WriteString", wxLua_wxFile_WriteString, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaDelete, "wxFile", wxLua_wxFile_destructor, 0, 0, {0} }, *************** *** 2563,2570 **** { LuaMethod, "LastRead", wxLua_wxInputStream_LastRead, 0, 0, { 0 } }, { LuaMethod, "Peek", wxLua_wxInputStream_Peek, 0, 0, { 0 } }, ! { LuaMethod, "Read", wxLua_wxInputStream_Read, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, { LuaMethod, "ReadStream", wxLua_wxInputStream_ReadStream, 1, 1, { &s_wxluatag_wxOutputStream, 0 } }, { LuaMethod, "TellI", wxLua_wxInputStream_TellI, 0, 0, { 0 } }, ! { LuaMethod, "Unget", wxLua_wxInputStream_Unget, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Ungetch", wxLua_wxInputStream_Ungetch, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxInputStream", wxLua_wxInputStream_destructor, 0, 0, {0} }, --- 2584,2591 ---- { LuaMethod, "LastRead", wxLua_wxInputStream_LastRead, 0, 0, { 0 } }, { LuaMethod, "Peek", wxLua_wxInputStream_Peek, 0, 0, { 0 } }, ! { LuaMethod, "Read", wxLua_wxInputStream_Read, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "ReadStream", wxLua_wxInputStream_ReadStream, 1, 1, { &s_wxluatag_wxOutputStream, 0 } }, { LuaMethod, "TellI", wxLua_wxInputStream_TellI, 0, 0, { 0 } }, ! { LuaMethod, "Unget", wxLua_wxInputStream_Unget, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Ungetch", wxLua_wxInputStream_Ungetch, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxInputStream", wxLua_wxInputStream_destructor, 0, 0, {0} }, *************** *** 2726,2730 **** { LuaMethod, "PutC", wxLua_wxOutputStream_PutC, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "TellO", wxLua_wxOutputStream_TellO, 0, 0, { 0 } }, ! { LuaMethod, "Write", wxLua_wxOutputStream_Write, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, { LuaMethod, "WriteStream", wxLua_wxOutputStream_WriteStream, 1, 1, { &s_wxluatag_wxInputStream, 0 } }, { LuaDelete, "wxOutputStream", wxLua_wxOutputStream_destructor, 0, 0, {0} }, --- 2747,2751 ---- { LuaMethod, "PutC", wxLua_wxOutputStream_PutC, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "TellO", wxLua_wxOutputStream_TellO, 0, 0, { 0 } }, ! { LuaMethod, "Write", wxLua_wxOutputStream_Write, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "WriteStream", wxLua_wxOutputStream_WriteStream, 1, 1, { &s_wxluatag_wxInputStream, 0 } }, { LuaDelete, "wxOutputStream", wxLua_wxOutputStream_destructor, 0, 0, {0} }, Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** data.cpp 17 May 2006 22:47:10 -0000 1.20 --- data.cpp 18 May 2006 05:47:39 -0000 1.21 *************** *** 1016,1021 **** #if (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) ! // wxNode *Append(wxObject *object) ! static int LUACALL wxLua_wxList_Append(lua_State *L) { wxLuaState wxlState(L); --- 1016,1021 ---- #if (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) ! // %overload wxNode *Append(wxObject *object) ! static int LUACALL wxLua_wxList_Append1(lua_State *L) { wxLuaState wxlState(L); *************** *** 1033,1037 **** } ! // %rename AppendNumKey wxNode *Append(long key, wxObject *object) static int LUACALL wxLua_wxList_AppendNumKey(lua_State *L) { --- 1033,1037 ---- } ! // %overload %rename AppendNumKey wxNode *Append(long key, wxObject *object) static int LUACALL wxLua_wxList_AppendNumKey(lua_State *L) { *************** *** 1052,1056 **** } ! // %rename AppendStringKey wxNode *Append(const wxString& key, wxObject *object) static int LUACALL wxLua_wxList_AppendStringKey(lua_State *L) { --- 1052,1056 ---- } ! // %overload %rename AppendStringKey wxNode *Append(const wxString& key, wxObject *object) static int LUACALL wxLua_wxList_AppendStringKey(lua_State *L) { *************** *** 1088,1093 **** } ! // wxNode* Find(wxObject* pObject) ! static int LUACALL wxLua_wxList_Find(lua_State *L) { wxLuaState wxlState(L); --- 1088,1093 ---- } ! // %overload wxNode* Find(wxObject* pObject) ! static int LUACALL wxLua_wxList_Find1(lua_State *L) { wxLuaState wxlState(L); *************** *** 1122,1127 **** } ! // wxNode *Insert(wxObject *pObject) ! static int LUACALL wxLua_wxList_Insert(lua_State *L) { wxLuaState wxlState(L); --- 1122,1127 ---- } ! // %overload wxNode *Insert(wxObject *pObject) ! static int LUACALL wxLua_wxList_Insert1(lua_State *L) { wxLuaState wxlState(L); *************** *** 1139,1143 **** } ! // %rename InsertAt wxNode *Insert(size_t position, wxObject *pObject) static int LUACALL wxLua_wxList_InsertAt(lua_State *L) { --- 1139,1143 ---- } ! // %overload %rename InsertAt wxNode *Insert(size_t position, wxObject *pObject) static int LUACALL wxLua_wxList_InsertAt(lua_State *L) { *************** *** 1158,1162 **** } ! // %rename InsertBefore wxNode *Insert(wxNode *pNode, wxObject *pObject) static int LUACALL wxLua_wxList_InsertBefore(lua_State *L) { --- 1158,1162 ---- } ! // %overload %rename InsertBefore wxNode *Insert(wxNode *pNode, wxObject *pObject) static int LUACALL wxLua_wxList_InsertBefore(lua_State *L) { *************** *** 1252,1256 **** } ! // %rename FindNumKey wxNode *Find(long key) static int LUACALL wxLua_wxList_FindNumKey(lua_State *L) { --- 1252,1256 ---- } ! // %overload %rename FindNumKey wxNode *Find(long key) static int LUACALL wxLua_wxList_FindNumKey(lua_State *L) { *************** *** 1269,1273 **** } ! // %rename FindStringKey wxNode *Find(const wxString &key) static int LUACALL wxLua_wxList_FindStringKey(lua_State *L) { --- 1269,1273 ---- } ! // %overload %rename FindStringKey wxNode *Find(const wxString &key) static int LUACALL wxLua_wxList_FindStringKey(lua_State *L) { *************** *** 1370,1373 **** --- 1370,1440 ---- + // Overloaded function bindings + + #if ((wxLUA_USE_wxList) && (wxLUA_USE_wxObject)) + // Overloaded functions for wxLua_wxList_Append + static int LUACALL wxLua_wxList_Append(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + + #if (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) + { LuaMethod, "Append", wxLua_wxList_Append1, 1, 1, { &s_wxluatag_wxObject, 0 } }, + { LuaMethod, "AppendNumKey", wxLua_wxList_AppendNumKey, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxObject, 0 } }, + { LuaMethod, "AppendStringKey", wxLua_wxList_AppendStringKey, 2, 2, { &s_wxluaarg_String, &s_wxluatag_wxObject, 0 } }, + #endif + + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + + + #if ((wxLUA_USE_wxList) && (wxLUA_USE_wxObject))||(wxLUA_USE_wxList) + // Overloaded functions for wxLua_wxList_Find + static int LUACALL wxLua_wxList_Find(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + + #if (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) + { LuaMethod, "Find", wxLua_wxList_Find1, 1, 1, { &s_wxluatag_wxObject, 0 } }, + #endif + + { LuaMethod, "FindNumKey", wxLua_wxList_FindNumKey, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "FindStringKey", wxLua_wxList_FindStringKey, 1, 1, { &s_wxluaarg_String, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + + + #if ((wxLUA_USE_wxList) && (wxLUA_USE_wxObject)) + // Overloaded functions for wxLua_wxList_Insert + static int LUACALL wxLua_wxList_Insert(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + + #if (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) + { LuaMethod, "Insert", wxLua_wxList_Insert1, 1, 1, { &s_wxluatag_wxObject, 0 } }, + { LuaMethod, "InsertAt", wxLua_wxList_InsertAt, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxObject, 0 } }, + { LuaMethod, "InsertBefore", wxLua_wxList_InsertBefore, 2, 2, { &s_wxluatag_wxNode, &s_wxluatag_wxObject, 0 } }, + #endif + + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** controls.cpp 17 May 2006 22:47:10 -0000 1.25 --- controls.cpp 18 May 2006 05:47:39 -0000 1.26 *************** *** 111,115 **** #if (wxLUA_USE_wxButton) && (wxLUA_USE_wxPointSizeRect) ! // static wxSize GetDefaultSize() static int LUACALL wxLua_wxButton_GetDefaultSize(lua_State *L) { --- 111,115 ---- #if (wxLUA_USE_wxButton) && (wxLUA_USE_wxPointSizeRect) ! // static wxSize GetDefaultSize() // static is ok, use on existing button static int LUACALL wxLua_wxButton_GetDefaultSize(lua_State *L) { *************** *** 218,222 **** } ! // bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") static int LUACALL wxLua_wxBitmapButton_Create(lua_State *L) { --- 218,222 ---- } ! // bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") static int LUACALL wxLua_wxBitmapButton_Create(lua_State *L) { *************** *** 255,259 **** #if ((wxLUA_USE_wxBitmapButton) && (wxLUA_USE_wxButton)) && (wxLUA_USE_wxBitmap) ! // wxBitmap& GetBitmapDisabled() const static int LUACALL wxLua_wxBitmapButton_GetBitmapDisabled(lua_State *L) { --- 255,259 ---- #if ((wxLUA_USE_wxBitmapButton) && (wxLUA_USE_wxButton)) && (wxLUA_USE_wxBitmap) ! // wxBitmap GetBitmapDisabled() const static int LUACALL wxLua_wxBitmapButton_GetBitmapDisabled(lua_State *L) { *************** *** 263,267 **** wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapDisabled ! returns = &self->GetBitmapDisabled(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 263,270 ---- wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapDisabled ! // allocate a new object using the copy constructor ! returns = new wxBitmap(self->GetBitmapDisabled()); ! // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 270,274 **** } ! // wxBitmap& GetBitmapFocus() const static int LUACALL wxLua_wxBitmapButton_GetBitmapFocus(lua_State *L) { --- 273,277 ---- } ! // wxBitmap GetBitmapFocus() const static int LUACALL wxLua_wxBitmapButton_GetBitmapFocus(lua_State *L) { *************** *** 278,282 **** wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapFocus ! returns = &self->GetBitmapFocus(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 281,288 ---- wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapFocus ! // allocate a new object using the copy constructor ! returns = new wxBitmap(self->GetBitmapFocus()); ! // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 285,289 **** } ! // wxBitmap& GetBitmapLabel() const static int LUACALL wxLua_wxBitmapButton_GetBitmapLabel(lua_State *L) { --- 291,295 ---- } ! // wxBitmap GetBitmapLabel() const static int LUACALL wxLua_wxBitmapButton_GetBitmapLabel(lua_State *L) { *************** *** 293,297 **** wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapLabel ! returns = &self->GetBitmapLabel(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 299,306 ---- wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapLabel ! // allocate a new object using the copy constructor ! returns = new wxBitmap(self->GetBitmapLabel()); ! // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 300,304 **** } ! // wxBitmap& GetBitmapSelected() const static int LUACALL wxLua_wxBitmapButton_GetBitmapSelected(lua_State *L) { --- 309,313 ---- } ! // wxBitmap GetBitmapSelected() const static int LUACALL wxLua_wxBitmapButton_GetBitmapSelected(lua_State *L) { *************** *** 308,312 **** wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapSelected ! returns = &self->GetBitmapSelected(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 317,324 ---- wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapSelected ! // allocate a new object using the copy constructor ! returns = new wxBitmap(self->GetBitmapSelected()); ! // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 315,319 **** } ! // void SetBitmapDisabled(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapDisabled(lua_State *L) { --- 327,331 ---- } ! // void SetBitmapDisabled(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapDisabled(lua_State *L) { *************** *** 329,333 **** } ! // void SetBitmapFocus(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapFocus(lua_State *L) { --- 341,345 ---- } ! // void SetBitmapFocus(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapFocus(lua_State *L) { *************** *** 343,347 **** } ! // void SetBitmapLabel(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapLabel(lua_State *L) { --- 355,359 ---- } ! // void SetBitmapLabel(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapLabel(lua_State *L) { *************** *** 357,361 **** } ! // void SetBitmapSelected(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapSelected(lua_State *L) { --- 369,373 ---- } ! // void SetBitmapSelected(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapSelected(lua_State *L) { *************** *** 599,603 **** } ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") static int LUACALL wxLua_wxCheckBox_Create(lua_State *L) { --- 611,615 ---- } ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") static int LUACALL wxLua_wxCheckBox_Create(lua_State *L) { *************** *** 634,676 **** #endif ! ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCheckBox) ! // %wxchkver22&!%wxchkver23 %rename IsChecked bool GetValue() const ! static int LUACALL wxLua_wxCheckBox_IsChecked(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get this ! wxCheckBox * self = (wxCheckBox *)wxlState.GetUserDataType(1, s_wxluatag_wxCheckBox); ! // call GetValue ! returns = self->GetValue(); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! #endif ! ! ! #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCheckBox) ! // %wxchkver23 bool IsChecked() const ! static int LUACALL wxLua_wxCheckBox_IsChecked(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get this ! wxCheckBox * self = (wxCheckBox *)wxlState.GetUserDataType(1, s_wxluatag_wxCheckBox); ! // call IsChecked ! returns = self->IsChecked(); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! #endif ! ! // bool GetValue() const static int LUACALL wxLua_wxCheckBox_GetValue(lua_State *L) { --- 646,650 ---- #endif ! // bool GetValue() const static int LUACALL wxLua_wxCheckBox_GetValue(lua_State *L) { *************** *** 732,736 **** } ! // void SetValue(const bool state) static int LUACALL wxLua_wxCheckBox_SetValue(lua_State *L) { --- 706,725 ---- } ! // bool IsChecked() const ! static int LUACALL wxLua_wxCheckBox_IsChecked(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get this ! wxCheckBox * self = (wxCheckBox *)wxlState.GetUserDataType(1, s_wxluatag_wxCheckBox); ! // call IsChecked ! returns = self->IsChecked(); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! // void SetValue(const bool state) static int LUACALL wxLua_wxCheckBox_SetValue(lua_State *L) { *************** *** 777,794 **** #endif - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCheckBox) - { LuaMethod, "IsChecked", wxLua_wxCheckBox_IsChecked, 0, 0, { 0 } }, - #endif - - - #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCheckBox) - { LuaMethod, "IsChecked", wxLua_wxCheckBox_IsChecked, 0, 0, { 0 } }, - #endif - { LuaMethod, "GetValue", wxLua_wxCheckBox_GetValue, 0, 0, { 0 } }, { LuaMethod, "Get3StateValue", wxLua_wxCheckBox_Get3StateValue, 0, 0, { 0 } }, { LuaMethod, "Is3rdStateAllowedForUser", wxLua_wxCheckBox_Is3rdStateAllowedForUser, 0, 0, { 0 } }, { LuaMethod, "Is3State", wxLua_wxCheckBox_Is3State, 0, 0, { 0 } }, { LuaMethod, "SetValue", wxLua_wxCheckBox_SetValue, 1, 1, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "Set3StateValue", wxLua_wxCheckBox_Set3StateValue, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, --- 766,774 ---- #endif { LuaMethod, "GetValue", wxLua_wxCheckBox_GetValue, 0, 0, { 0 } }, { LuaMethod, "Get3StateValue", wxLua_wxCheckBox_Get3StateValue, 0, 0, { 0 } }, { LuaMethod, "Is3rdStateAllowedForUser", wxLua_wxCheckBox_Is3rdStateAllowedForUser, 0, 0, { 0 } }, { LuaMethod, "Is3State", wxLua_wxCheckBox_Is3State, 0, 0, { 0 } }, + { LuaMethod, "IsChecked", wxLua_wxCheckBox_IsChecked, 0, 0, { 0 } }, { LuaMethod, "SetValue", wxLua_wxCheckBox_SetValue, 1, 1, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "Set3StateValue", wxLua_wxCheckBox_Set3StateValue, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, *************** *** 1007,1011 **** } ! // %overload %rename InsertWithClientData int Insert(const wxString& item, int pos, wxClientData *clientData) static int LUACALL wxLua_wxControlWithItems_InsertWithClientData(lua_State *L) { --- 987,991 ---- } ! // %overload %rename InsertWithClientData int Insert(const wxString& item, int pos, wxClientData *clientData) static int LUACALL wxLua_wxControlWithItems_InsertWithClientData(lua_State *L) { *************** *** 1252,1256 **** } ! // bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_Create(lua_State *L) { --- 1232,1236 ---- } ! // bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_Create(lua_State *L) { *************** *** 1287,1291 **** #endif ! // int GetCurrentSelection() const static int LUACALL wxLua_wxChoice_GetCurrentSelection(lua_State *L) { --- 1267,1271 ---- #endif ! // int GetCurrentSelection() const static int LUACALL wxLua_wxChoice_GetCurrentSelection(lua_State *L) { *************** *** 1640,1644 **** } ! // %rename SetMark void SetSelection(long from, long to) static int LUACALL wxLua_wxComboBox_SetMark(lua_State *L) { --- 1620,1624 ---- } ! // %rename SetMark void SetSelection(long from, long to) // wxPython name static int LUACALL wxLua_wxComboBox_SetMark(lua_State *L) { *************** *** 2063,2068 **** #endif - #if (wxLUA_USE_wxListBox) && (wxLUA_USE_wxArrayInt) // %override wxLua_wxListBox_GetSelections // int GetSelections(wxArrayInt& selections) const --- 2043,2060 ---- #endif + // void Deselect(int n) + static int LUACALL wxLua_wxListBox_Deselect(lua_State *L) + { + wxLuaState wxlState(L); + // int n + int n = (int)wxlState.GetNumberType(2); + // get this + wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); + // call Deselect + self->Deselect(n); + + return 0; + } // %override wxLua_wxListBox_GetSelections // int GetSelections(wxArrayInt& selections) const *************** *** 2085,2104 **** } - #endif - - // void Deselect(int n) - static int LUACALL wxLua_wxListBox_Deselect(lua_State *L) - { - wxLuaState wxlState(L); - // int n - int n = (int)wxlState.GetNumberType(2); - // get this - wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); - // call Deselect - self->Deselect(n); - - return 0; - } - // void InsertItems(const wxArrayString_FromLuaTable& items, int pos) static int LUACALL wxLua_wxListBox_InsertItems(lua_State *L) --- 2077,2080 ---- *************** *** 2215,2224 **** #endif - - #if (wxLUA_USE_wxListBox) && (wxLUA_USE_wxArrayInt) - { LuaMethod, "GetSelections", wxLua_wxListBox_GetSelections, 1, 1, { &s_wxluatag_wxArrayInt, 0 } }, - #endif - { LuaMethod, "Deselect", wxLua_wxListBox_Deselect, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "InsertItems", wxLua_wxListBox_InsertItems, 2, 2, { &s_wxluaarg_LuaTable, &s_wxluaarg_Number, 0 } }, { LuaMethod, "IsSelected", wxLua_wxListBox_IsSelected, 1, 1, { &s_wxluaarg_Number, 0 } }, --- 2191,2196 ---- #endif { LuaMethod, "Deselect", wxLua_wxListBox_Deselect, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "GetSelections", wxLua_wxListBox_GetSelections, 0, 0, { 0 } }, { LuaMethod, "InsertItems", wxLua_wxListBox_InsertItems, 2, 2, { &s_wxluaarg_LuaTable, &s_wxluaarg_Number, 0 } }, { LuaMethod, "IsSelected", wxLua_wxListBox_IsSelected, 1, 1, { &s_wxluaarg_Number, 0 } }, *************** *** 2514,2537 **** - #if (wxLUA_USE_wxImageList) && ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxListCtrl)) - // %wxchkver22&!%wxchkver23 %rename AssignImageList void SetImageList(wxImageList *imageList, int which) - static int LUACALL wxLua_wxListCtrl_AssignImageList(lua_State *L) - { - wxLuaState wxlState(L); - // int which - int which = (int)wxlState.GetNumberType(3); - // wxImageList imageList - wxImageList * imageList = (wxImageList *)wxlState.GetUserDataType(2, s_wxluatag_wxImageList); - // get this - wxListCtrl * self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl); - // call SetImageList - self->SetImageList(imageList, which); - - return 0; - } - - #endif - - #if (wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxColourPenBrush) // wxColour GetTextColour() const --- 2486,2489 ---- *************** *** 2678,2682 **** #if (wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect) ! // %rename FindItemAtPos long FindItem(long start, const wxPoint& pt, int direction) static int LUACALL wxLua_wxListCtrl_FindItemAtPos(lua_State *L) { --- 2630,2634 ---- #if (wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect) ! // %overload %rename FindItemAtPos long FindItem(long start, const wxPoint& pt, int direction) static int LUACALL wxLua_wxListCtrl_FindItemAtPos(lua_State *L) { *************** *** 2951,2956 **** } ! // long FindItem(long start, const wxString& str, const bool partial = false) ! static int LUACALL wxLua_wxListCtrl_FindItem(lua_State *L) { wxLuaState wxlState(L); --- 2903,2908 ---- } ! // %overload long FindItem(long start, const wxString& str, const bool partial = false) ! static int LUACALL wxLua_wxListCtrl_FindItem1(lua_State *L) { wxLuaState wxlState(L); *************** *** 2974,2978 **** } ! // %rename FindItemData long FindItem(long start, long data) static int LUACALL wxLua_wxListCtrl_FindItemData(lua_State *L) { --- 2926,2930 ---- } ! // %overload %rename FindItemData long FindItem(long start, long data) static int LUACALL wxLua_wxListCtrl_FindItemData(lua_State *L) { *************** *** 3197,3202 **** } ! // long InsertColumn(long col, wxListItem& info) ! static int LUACALL wxLua_wxListCtrl_InsertColumn(lua_State *L) { wxLuaState wxlState(L); --- 3149,3154 ---- } ! // %overload %rename InsertColumnItem long InsertColumn(long col, wxListItem& info) // wxPython name ! static int LUACALL wxLua_wxListCtrl_InsertColumnItem(lua_State *L) { wxLuaState wxlState(L); *************** *** 3216,3221 **** } ! // %rename InsertColumnItem long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT, int width = -1) ! static int LUACALL wxLua_wxListCtrl_InsertColumnItem(lua_State *L) { wxLuaState wxlState(L); --- 3168,3173 ---- } ! // %overload long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT, int width = -1) ! static int LUACALL wxLua_wxListCtrl_InsertColumn1(lua_State *L) { wxLuaState wxlState(L); *************** *** 3258,3262 **** } ! // %rename InsertStringItem long InsertItem(long index, const wxString& label) static int LUACALL wxLua_wxListCtrl_InsertStringItem(lua_State *L) { --- 3210,3214 ---- } ! // %rename InsertStringItem long InsertItem(long index, const wxString& label) // wxPython name static int LUACALL wxLua_wxListCtrl_InsertStringItem(lua_State *L) { *************** *** 3277,3281 **** } ! // %rename InsertImageItem long InsertItem(long index, int imageIndex) static int LUACALL wxLua_wxListCtrl_InsertImageItem(lua_State *L) { --- 3229,3233 ---- } ! // %rename InsertImageItem long InsertItem(long index, int imageIndex) // wxPython name static int LUACALL wxLua_wxListCtrl_InsertImageItem(lua_State *L) { *************** *** 3296,3300 **** } ! // %rename InsertImageStringItem long InsertItem(long index, const wxString& label, int imageIndex) static int LUACALL wxLua_wxListCtrl_InsertImageStringItem(lua_State *L) { --- 3248,3252 ---- } ! // %rename InsertImageStringItem long InsertItem(long index, const wxString& label, int imageIndex) // wxPython name static int LUACALL wxLua_wxListCtrl_InsertImageStringItem(lua_State *L) { *************** *** 3391,3395 **** } ! // %rename SetStringItem long SetItem(long index, int col, const wxString& label, int imageId = -1) static int LUACALL wxLua_wxListCtrl_SetStringItem(lua_State *L) { --- 3343,3347 ---- } ! // %rename SetStringItem long SetItem(long index, int col, const wxString& label, int imageId = -1) // wxPython name static int LUACALL wxLua_wxListCtrl_SetStringItem(lua_State *L) { *************** *** 3523,3526 **** --- 3475,3525 ---- } + // %override wxLua_wxListCtrl_SortItems + + static int wxLua_LCF_tag = -1; + static wxLuaState wxLua_LCF_wxlState; + + int wxCALLBACK wxLua_ListCompareFunction(long item1, long item2, long sortData) + { + lua_State *L = wxLua_LCF_wxlState.GetLuaState(); + lua_rawgeti(L, LUA_REGISTRYINDEX, wxLua_LCF_tag); + lua_pushnumber(L, item1); + lua_pushnumber(L, item2); + lua_pushnumber(L, sortData); + wxLua_LCF_wxlState.LuaCall(3, 1); + + int returns = (int)wxLua_LCF_wxlState.GetNumberType(1); + return returns; + } + + // bool SortItems(LuaFunction fnSortCallBack, long data) + static int LUACALL wxLua_wxListCtrl_SortItems(lua_State *L) + { + wxLuaState wxlState(L); + wxLua_LCF_wxlState = wxlState; + long returns; + // long data + long data = (long)wxlState.GetNumberType(3); + // get this + wxListCtrl *self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl); + + lua_pop(L, 1); + // lua sort function, was index 2 is now index 1 + if (lua_isfunction (L, 1)) + wxLua_LCF_tag = luaL_ref(L, LUA_REGISTRYINDEX); // pops it from stack + else + wxlState.terror(wxString::Format(_("wxLua: Expected lua function for parameter %d, but got '%s'."), + 2, wxlState.lua_TypeNameIndex(1).c_str())); + + // call SortItems + returns = self->SortItems(wxLua_ListCompareFunction, data); + wxLua_LCF_wxlState.Destroy(); + wxLua_LCF_tag = -1; + // push the result number + lua_pushnumber(L, returns); + // return the number of parameters + return 1; + } + static int LUACALL wxLua_wxListCtrl_destructor(lua_State *) { *************** *** 3530,3533 **** --- 3529,3572 ---- + // Overloaded function bindings + + #if ((wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_wxListCtrl) + // Overloaded functions for wxLua_wxListCtrl_FindItem + static int LUACALL wxLua_wxListCtrl_FindItem(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + + #if (wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect) + { LuaMethod, "FindItemAtPos", wxLua_wxListCtrl_FindItemAtPos, 3, 3, { &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluaarg_Number, 0 } }, + #endif + + { LuaMethod, "FindItem", wxLua_wxListCtrl_FindItem1, 3, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Boolean, 0 } }, + { LuaMethod, "FindItemData", wxLua_wxListCtrl_FindItemData, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + + + #if (wxLUA_USE_wxListCtrl) + // Overloaded functions for wxLua_wxListCtrl_InsertColumn + static int LUACALL wxLua_wxListCtrl_InsertColumn(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "InsertColumnItem", wxLua_wxListCtrl_InsertColumnItem, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxListItem, 0 } }, + { LuaMethod, "InsertColumn", wxLua_wxListCtrl_InsertColumn1, 4, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + *************** *** 3556,3564 **** - #if (wxLUA_USE_wxImageList) && ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxListCtrl)) - { LuaMethod, "AssignImageList", wxLua_wxListCtrl_AssignImageList, 2, 2, { &s_wxluatag_wxImageList, &s_wxluaarg_Number, 0 } }, - #endif - - #if (wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxColourPenBrush) { LuaMethod, "GetTextColour", wxLua_wxListCtrl_GetTextColour, 0, 0, { 0 } }, --- 3595,3598 ---- *************** *** 3588,3592 **** { LuaMethod, "GetItemRect", wxLua_wxListCtrl_GetItemRect, 3, 2, { &s_wxluaarg_Number, &s_wxluatag_wxRect, &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetViewRect", wxLua_wxListCtrl_GetViewRect, 0, 0, { 0 } }, ! { LuaMethod, "HitTest", wxLua_wxListCtrl_HitTest, 2, 2, { &s_wxluatag_wxPoint, &s_wxluaarg_LightUserData, 0 } }, { LuaMethod, "SetItemPosition", wxLua_wxListCtrl_SetItemPosition, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif --- 3622,3626 ---- { LuaMethod, "GetItemRect", wxLua_wxListCtrl_GetItemRect, 3, 2, { &s_wxluaarg_Number, &s_wxluatag_wxRect, &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetViewRect", wxLua_wxListCtrl_GetViewRect, 0, 0, { 0 } }, ! { LuaMethod, "HitTest", wxLua_wxListCtrl_HitTest, 1, 1, { &s_wxluatag_wxPoint, 0 } }, { LuaMethod, "SetItemPosition", wxLua_wxListCtrl_SetItemPosition, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif *************** *** 3619,3624 **** { LuaMethod, "GetSelectedItemCount", wxLua_wxListCtrl_GetSelectedItemCount, 0, 0, { 0 } }, { LuaMethod, "GetTopItem", wxLua_wxListCtrl_GetTopItem, 0, 0, { 0 } }, ! { LuaMethod, "InsertColumn", wxLua_wxListCtrl_InsertColumn, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxListItem, 0 } }, ! { LuaMethod, "InsertColumnItem", wxLua_wxListCtrl_InsertColumnItem, 4, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "InsertItem", wxLua_wxListCtrl_InsertItem, 1, 1, { &s_wxluatag_wxListItem, 0 } }, { LuaMethod, "InsertStringItem", wxLua_wxListCtrl_InsertStringItem, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, --- 3653,3658 ---- { LuaMethod, "GetSelectedItemCount", wxLua_wxListCtrl_GetSelectedItemCount, 0, 0, { 0 } }, { LuaMethod, "GetTopItem", wxLua_wxListCtrl_GetTopItem, 0, 0, { 0 } }, ! { LuaMethod, "InsertColumnItem", wxLua_wxListCtrl_InsertColumnItem, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxListItem, 0 } }, ! { LuaMethod, "InsertColumn", wxLua_wxListCtrl_InsertColumn, 4, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "InsertItem", wxLua_wxListCtrl_InsertItem, 1, 1, { &s_wxluatag_wxListItem, 0 } }, { LuaMethod, "InsertStringItem", wxLua_wxListCtrl_InsertStringItem, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, *************** *** 3636,3639 **** --- 3670,3674 ---- { LuaMethod, "SetSingleStyle", wxLua_wxListCtrl_SetSingleStyle, 2, 1, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "SetWindowStyleFlag", wxLua_wxListCtrl_SetWindowStyleFlag, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "SortItems", wxLua_wxListCtrl_SortItems, 2, 2, { &s_wxluaarg_LuaFunction, &s_wxluaarg_Number, 0 } }, { LuaGetProp, "CountPerPage", wxLua_wxListCtrl_GetCountPerPage, 0, 0, {0} }, { LuaGetProp, "ItemCount", wxLua_wxListCtrl_GetItemCount, 0, 0, {0} }, *************** *** 5104,5109 **** #endif ! // void Enable(bool enable) ! static int LUACALL wxLua_wxRadioBox_Enable(lua_State *L) { wxLuaState wxlState(L); --- 5139,5144 ---- #endif ! // %overload void Enable(bool enable) ! static int LUACALL wxLua_wxRadioBox_Enable1(lua_State *L) { wxLuaState wxlState(L); *************** *** 5118,5122 **** } ! // %rename EnableItem void Enable(int n, bool enable) static int LUACALL wxLua_wxRadioBox_EnableItem(lua_State *L) { --- 5153,5157 ---- } ! // %overload %rename EnableItem void Enable(int n, bool enable) static int LUACALL wxLua_wxRadioBox_EnableItem(lua_State *L) { *************** *** 5257,5262 **** } ! // bool Show(bool show = true) ! static int LUACALL wxLua_wxRadioBox_Show(lua_State *L) { wxLuaState wxlState(L); --- 5292,5297 ---- } ! // %overload bool Show(bool show = true) ! static int LUACALL wxLua_wxRadioBox_Show1(lua_State *L) { wxLuaState wxlState(L); *************** *** 5276,5280 **** } ! // %rename ShowItem bool Show(int item, bool show = true) static int LUACALL wxLua_wxRadioBox_ShowItem(lua_State *L) { --- 5311,5315 ---- } ! // %overload %rename ShowItem bool Show(int item, bool show = true) static int LUACALL wxLua_wxRadioBox_ShowItem(lua_State *L) { *************** *** 5304,5307 **** --- 5339,5377 ---- + // Overloaded function bindings + + #if (wxLUA_USE_wxRadioBox) + // Overloaded functions for wxLua_wxRadioBox_Enable + static int LUACALL wxLua_wxRadioBox_Enable(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "Enable", wxLua_wxRadioBox_Enable1, 1, 1, { &s_wxluaarg_Boolean, 0 } }, + { LuaMethod, "EnableItem", wxLua_wxRadioBox_EnableItem, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + + + #if (wxLUA_USE_wxRadioBox) + // Overloaded functions for wxLua_wxRadioBox_Show + static int LUACALL wxLua_wxRadioBox_Show(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "Show", wxLua_wxRadioBox_Show1, 1, 0, { &s_wxluaarg_Boolean, 0 } }, + { LuaMethod, "ShowItem", wxLua_wxRadioBox_ShowItem, 2, 1, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + *************** *** 6557,6562 **** } ! // void SetValue(const wxString& text) ! static int LUACALL wxLua_wxSpinCtrl_SetValue(lua_State *L) { wxLuaState wxlState(L); --- 6627,6632 ---- } ! // %overload void SetValue(const wxString& text) ! static int LUACALL wxLua_wxSpinCtrl_SetValue1(lua_State *L) { wxLuaState wxlState(L); *************** *** 6571,6575 **** } ! // %rename SetValueInt void SetValue(int iValue) static int LUACALL wxLua_wxSpinCtrl_SetValueInt(lua_State *L) { --- 6641,6645 ---- } ! // %overload %rename SetValueInt void SetValue(int iValue) static int LUACALL wxLua_wxSpinCtrl_SetValueInt(lua_State *L) { *************** *** 6592,6595 **** --- 6662,6683 ---- + // Overloaded function bindings + + #if (wxLUA_USE_wxSpinCtrl) + // Overloaded functions for wxLua_wxSpinCtrl_SetValue + static int LUACALL wxLua_wxSpinCtrl_SetValue(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "SetValue", wxLua_wxSpinCtrl_SetValue1, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "SetValueInt", wxLua_wxSpinCtrl_SetValueInt, 1, 1, { &s_wxluaarg_Number, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + *************** *** 6727,6733 **** } ! // %override wxLua_wxTextCtrl_HitTestPosition ! // wxTextCtrlHitTestResult HitTestPosition(const wxPoint& pt, long *pos) const ! static int LUACALL wxLua_wxTextCtrl_HitTestPosition(lua_State *L) { wxLuaState wxlState(L); --- 6815,6821 ---- } ! // %override wxLua_wxTextCtrl_HitTestPos ! // wxTextCtrlHitTestResult HitTestPos(const wxPoint& pt, long *pos) const ! static int LUACALL wxLua_wxTextCtrl_HitTestPos(lua_State *L) { wxLuaState wxlState(L); *************** *** 7469,7474 **** #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxTextCtrl) ! { LuaMethod, "HitTest", wxLua_wxTextCtrl_HitTest, 3, 3, { &s_wxluatag_wxPoint, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 } }, ! { LuaMethod, "HitTestPosition", wxLua_wxTextCtrl_HitTestPosition, 2, 2, { &s_wxluatag_wxPoint, &s_wxluaarg_LightUserData, 0 } }, #endif --- 7557,7562 ---- #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxTextCtrl) ! { LuaMethod, "HitTest", wxLua_wxTextCtrl_HitTest, 1, 1, { &s_wxluatag_wxPoint, 0 } }, ! { LuaMethod, "HitTestPos", wxLua_wxTextCtrl_HitTestPos, 1, 1, { &s_wxluatag_wxPoint, 0 } }, #endif *************** *** 8969,8974 **** } ! // wxTreeItemId InsertItem(const wxTreeItemId& parent, const wxTreeItemId& previous, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) ! static int LUACALL wxLua_wxTreeCtrl_InsertItem(lua_State *L) { wxLuaState wxlState(L); --- 9057,9062 ---- } ! // %overload wxTreeItemId InsertItem(const wxTreeItemId& parent, const wxTreeItemId& previous, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) ! static int LUACALL wxLua_wxTreeCtrl_InsertItem1(lua_State *L) { wxLuaState wxlState(L); *************** *** 9001,9005 **** } ! // %rename InsertItemBefore wxTreeItemId InsertItem(const wxTreeItemId& parent, size_t before, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) static int LUACALL wxLua_wxTreeCtrl_InsertItemBefore(lua_State *L) { --- 9089,9093 ---- } ! // %overload %rename InsertItemBefore wxTreeItemId InsertItem(const wxTreeItemId& parent, size_t before, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) static int LUACALL wxLua_wxTreeCtrl_InsertItemBefore(lua_State *L) { *************** *** 9397,9400 **** --- 9485,9506 ---- + // Overloaded function bindings + + #if (wxLUA_USE_wxTreeCtrl) + // Overloaded functions for wxLua_wxTreeCtrl_InsertItem + static int LUACALL wxLua_wxTreeCtrl_InsertItem(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "InsertItem", wxLua_wxTreeCtrl_InsertItem1, 6, 3, { &s_wxluatag_wxTreeItemId, &s_wxluatag_wxTreeItemId, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxTreeItemData, 0 } }, + { LuaMethod, "InsertItemBefore", wxLua_wxTreeCtrl_InsertItemBefore, 6, 3, { &s_wxluatag_wxTreeItemId, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxTreeItemData, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + Index: clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/clipdrag.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** clipdrag.cpp 4 May 2006 05:07:03 -0000 1.18 --- clipdrag.cpp 18 May 2006 05:47:39 -0000 1.19 *************** *** 39,59 **** - #if (wxLUA_USE_wxClipboard) && ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxClipboard)) - // %wxchkver25 %static wxClipboard *Get() - static int LUACALL wxLua_wxClipboard_Get(lua_State *L) - { - wxLuaState wxlState(L); - wxClipboard *returns; - // call Get - returns = wxClipboard::Get(); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxClipboard, returns); - - return 1; - } - - #endif - - #if (wxLUA_USE_wxDataObject) && (wxLUA_USE_wxClipboard) // bool AddData( wxDataObject *data ) --- 39,42 ---- *************** *** 224,232 **** static WXLUAMETHOD s_wxClipboard_methods[] = { - #if (wxLUA_USE_wxClipboard) && ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxClipboard)) - { LuaMethod, "Get", wxLua_wxClipboard_Get, 0, 0, { 0 } }, - #endif - - #if (wxLUA_USE_wxDataObject) && (wxLUA_USE_wxClipboard) { LuaMethod, "AddData", wxLua_wxClipboard_AddData, 1, 1, { &s_wxluatag_wxDataObject, 0 } }, --- 207,210 ---- *************** *** 259,263 **** int s_wxluatag_wxDataFormat = -1; ! // wxDataFormat(wxDataFormatId format = wxDF_INVALID) static int LUACALL wxLua_wxDataFormat_constructor(lua_State *L) { --- 237,241 ---- int s_wxluatag_wxDataFormat = -1; ! // %override wxDataFormat(wxDataFormatId format = wxDF_INVALID) static int LUACALL wxLua_wxDataFormat_constructor(lua_State *L) { *************** *** 278,282 **** } ! // %constructor wxDataFormatUser(const wxString &format) static int LUACALL wxLua_wxDataFormatUser_constructor(lua_State *L) { --- 256,260 ---- } ! // %override %constructor wxDataFormatUser(const wxString &format) static int LUACALL wxLua_wxDataFormatUser_constructor(lua_State *L) { *************** *** 370,390 **** } - // %operator bool operator!=(const wxDataFormat& format) const - static int LUACALL wxLua_wxDataFormat_op_ne(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // const wxDataFormat format - const wxDataFormat * format = (const wxDataFormat *)wxlState.GetUserDataType(2, s_wxluatag_wxDataFormat); - // get this - wxDataFormat * self = (wxDataFormat *)wxlState.GetUserDataType(1, s_wxluatag_wxDataFormat); - // call op_ne - returns = (*self)!=(*format); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - static int LUACALL wxLua_wxDataFormat_destructor(lua_State *L) { --- 348,351 ---- *************** *** 425,429 **** { LuaMethod, "SetType", wxLua_wxDataFormat_SetType, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "op_eq", wxLua_wxDataFormat_op_eq, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, - { LuaMethod, "op_ne", wxLua_wxDataFormat_op_ne, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, { LuaGetProp, "Id", wxLua_wxDataFormat_GetId, 0, 0, {0} }, { LuaSetProp, "Id", wxLua_wxDataFormat_SetId, 1, 1, {0} }, --- 386,389 ---- *************** *** 609,618 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxDataObject_methods[] = { ! { LuaMethod, "GetAllFormats", wxLua_wxDataObject_GetAllFormats, 2, 1, { &s_wxluatag_wxDataFormat, &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "GetDataHere", wxLua_wxDataObject_GetDataHere, 2, 2, { &s_wxluatag_wxDataFormat, &s_wxluaarg_LightUserData, 0 } }, { LuaMethod, "GetDataSize", wxLua_wxDataObject_GetDataSize, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, { LuaMethod, "GetFormatCount", wxLua_wxDataObject_GetFormatCount, 1, 0, { &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "GetPreferredFormat", wxLua_wxDataObject_GetPreferredFormat, 1, 0, { &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SetData", wxLua_wxDataObject_SetData, 3, 3, { &s_wxluatag_wxDataFormat, &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 } }, { LuaDelete, "wxDataObject", wxLua_wxDataObject_destructor, 0, 0, {0} }, }; --- 569,578 ---- // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxDataObject_methods[] = { ! { LuaMethod, "GetAllFormats", wxLua_wxDataObject_GetAllFormats, 1, 0, { &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "GetDataHere", wxLua_wxDataObject_GetDataHere, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, { LuaMethod, "GetDataSize", wxLua_wxDataObject_GetDataSize, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, { LuaMethod, "GetFormatCount", wxLua_wxDataObject_GetFormatCount, 1, 0, { &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "GetPreferredFormat", wxLua_wxDataObject_GetPreferredFormat, 1, 0, { &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SetData", wxLua_wxDataObject_SetData, 2, 2, { &s_wxluatag_wxDataFormat, &s_wxluaarg_String, 0 } }, { LuaDelete, "wxDataObject", wxLua_wxDataObject_destructor, 0, 0, {0} }, }; *************** *** 781,786 **** { LuaMethod, "SetFormat", wxLua_wxDataObjectSimple_SetFormat, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, { LuaMethod, "GetDataSize", wxLua_wxDataObjectSimple_GetDataSize, 0, 0, { 0 } }, ! { LuaMethod, "GetDataHere", wxLua_wxDataObjectSimple_GetDataHere, 1, 1, { &s_wxluaarg_LightU... [truncated message content] |
