Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets wxadv_override.hpp, 1.4, 1.5 wxbase_override.hpp, 1.15, 1.16 wxbase_rules.lua, 1.6, 1.7 wxcore_override.hpp, 1.18, 1.19 wxcore_rules.lua, 1.3, 1.4 wxhtml_override.hpp, 1.7, 1.8 wxnet_override.hpp, 1.3, 1.4 wxstc_override.hpp, 1.5, 1.6 wxxml_override.hpp, 1.8, 1.9
|
From: John L. <jr...@us...> - 2008-01-23 06:44:09
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/bindings/wxwidgets Modified Files: wxadv_override.hpp wxbase_override.hpp wxbase_rules.lua wxcore_override.hpp wxcore_rules.lua wxhtml_override.hpp wxnet_override.hpp wxstc_override.hpp wxxml_override.hpp Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: wxbase_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxbase_override.hpp 15 Jan 2008 06:31:06 -0000 1.15 --- wxbase_override.hpp 23 Jan 2008 06:43:34 -0000 1.16 *************** *** 72,76 **** wxStandardPathsBase *returns = &wxStandardPaths::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxStandardPaths); return 1; --- 72,76 ---- wxStandardPathsBase *returns = &wxStandardPaths::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxStandardPaths); return 1; *************** *** 91,95 **** size_t start = 0; // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call GetMatch bool returns = self->GetMatch(&start, &len, index); --- 91,95 ---- size_t start = 0; // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRegEx); // call GetMatch bool returns = self->GetMatch(&start, &len, index); *************** *** 117,121 **** wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call Replace int returns = self->Replace(&text, replacement, maxMatches); --- 117,121 ---- wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRegEx); // call Replace int returns = self->Replace(&text, replacement, maxMatches); *************** *** 138,142 **** wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call ReplaceAll int returns = self->ReplaceAll(&text, replacement); --- 138,142 ---- wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRegEx); // call ReplaceAll int returns = self->ReplaceAll(&text, replacement); *************** *** 159,163 **** wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call ReplaceFirst int returns = self->ReplaceFirst(&text, replacement); --- 159,163 ---- wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRegEx); // call ReplaceFirst int returns = self->ReplaceFirst(&text, replacement); *************** *** 180,184 **** { // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); if (wxConfigBase::Get(false) == self) // clear us from the wxConfigBase --- 180,184 ---- { // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxConfigBase); if (wxConfigBase::Get(false) == self) // clear us from the wxConfigBase *************** *** 206,210 **** wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); --- 206,210 ---- wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); *************** *** 230,234 **** wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); --- 230,234 ---- wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); *************** *** 254,258 **** wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); --- 254,258 ---- wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); *************** *** 276,280 **** wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetFirstGroup bool returns = self->GetFirstGroup(str, index); --- 276,280 ---- wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, wxluatype_wxConfigBase); // call GetFirstGroup bool returns = self->GetFirstGroup(str, index); *************** *** 300,304 **** wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetFirstEntry bool returns = self->GetFirstEntry(str, index); --- 300,304 ---- wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, wxluatype_wxConfigBase); // call GetFirstEntry bool returns = self->GetFirstEntry(str, index); *************** *** 322,326 **** wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetNextGroup bool returns = self->GetNextGroup(str, index); --- 322,326 ---- wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, wxluatype_wxConfigBase); // call GetNextGroup bool returns = self->GetNextGroup(str, index); *************** *** 344,348 **** wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetNextEntry bool returns = self->GetNextEntry(str, index); --- 344,348 ---- wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, wxluatype_wxConfigBase); // call GetNextEntry bool returns = self->GetNextEntry(str, index); *************** *** 375,379 **** wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxString(returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxString); return 1; --- 375,379 ---- wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxString(returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxString); return 1; *************** *** 390,394 **** wxClassInfo *returns = wxClassInfo::FindClass((wxChar *)name.c_str()); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxClassInfo); // return the number of parameters return 1; --- 390,394 ---- wxClassInfo *returns = wxClassInfo::FindClass((wxChar *)name.c_str()); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxClassInfo); // return the number of parameters return 1; *************** *** 449,453 **** static int LUACALL wxLua_wxArrayInt_ToLuaTable(lua_State *L) { ! wxArrayInt * self = (wxArrayInt *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxArrayInt); wxlua_pushwxArrayInttable(L, *self); return 1; --- 449,453 ---- static int LUACALL wxLua_wxArrayInt_ToLuaTable(lua_State *L) { ! wxArrayInt * self = (wxArrayInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayInt); wxlua_pushwxArrayInttable(L, *self); return 1; *************** *** 459,463 **** static int LUACALL wxLua_wxArrayString_ToLuaTable(lua_State *L) { ! wxArrayString * self = (wxArrayString *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxArrayString); wxlua_pushwxArrayStringtable(L, *self); return 1; --- 459,463 ---- static int LUACALL wxLua_wxArrayString_ToLuaTable(lua_State *L) { ! wxArrayString * self = (wxArrayString *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayString); wxlua_pushwxArrayStringtable(L, *self); return 1; *************** *** 490,494 **** // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxStringList); // return the number of parameters return 1; --- 490,494 ---- // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxStringList); // return the number of parameters return 1; *************** *** 575,579 **** { // get this ! wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileName); // call GetDirs wxArrayString returns = self->GetDirs(); --- 575,579 ---- { // get this ! wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileName); // call GetDirs wxArrayString returns = self->GetDirs(); *************** *** 593,597 **** wxDateTime *dtAccess= new wxDateTime(); // get this ! wxFileName *self = (wxFileName *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileName); // call GetTimes bool returns = self->GetTimes(dtAccess, dtMod, dtCreate); --- 593,597 ---- wxDateTime *dtAccess= new wxDateTime(); // get this ! wxFileName *self = (wxFileName *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileName); // call GetTimes bool returns = self->GetTimes(dtAccess, dtMod, dtCreate); *************** *** 601,607 **** wxluaO_addgcobject(L, (void*)dtCreate, new wxLua_wxObject_wxDateTime(dtCreate)); // push the constructed class pointers ! wxluaT_pushuserdatatype(L, dtAccess, g_wxluatype_wxDateTime); ! wxluaT_pushuserdatatype(L, dtMod, g_wxluatype_wxDateTime); ! wxluaT_pushuserdatatype(L, dtCreate, g_wxluatype_wxDateTime); // push the result flag lua_pushboolean(L, returns); --- 601,607 ---- wxluaO_addgcobject(L, (void*)dtCreate, new wxLua_wxObject_wxDateTime(dtCreate)); // push the constructed class pointers ! wxluaT_pushuserdatatype(L, dtAccess, wxluatype_wxDateTime); ! wxluaT_pushuserdatatype(L, dtMod, wxluatype_wxDateTime); ! wxluaT_pushuserdatatype(L, dtCreate, wxluatype_wxDateTime); // push the result flag lua_pushboolean(L, returns); *************** *** 695,699 **** wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxDir); // call GetFirst bool returns = self->GetFirst(&filename, filespec, flags); --- 695,699 ---- wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDir); // call GetFirst bool returns = self->GetFirst(&filename, filespec, flags); *************** *** 713,717 **** wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxDir); // call GetNext bool returns = self->GetNext(&filename); --- 713,717 ---- wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDir); // call GetNext bool returns = self->GetNext(&filename); *************** *** 759,763 **** { // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFile); // call Read unsigned int returns = self->Read(buffer, count); --- 759,763 ---- { // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFile); // call Read unsigned int returns = self->Read(buffer, count); *************** *** 784,788 **** const void *buffer = (const void *)lua_tostring(L, 2); // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFile); // call Write unsigned int returns = self->Write(buffer, nbytes); --- 784,788 ---- const void *buffer = (const void *)lua_tostring(L, 2); // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFile); // call Write unsigned int returns = self->Write(buffer, nbytes); *************** *** 801,805 **** wxString desc; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileType); // call GetDescription bool returns = (self->GetDescription(&desc)); --- 801,805 ---- wxString desc; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileType); // call GetDescription bool returns = (self->GetDescription(&desc)); *************** *** 817,825 **** { // const wxFileType::MessageParameters params ! const wxFileType::MessageParameters * params = (const wxFileType::MessageParameters *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxFileType_MessageParameters); // wxString printCmd wxString printCmd; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileType); // call GetPrintCommand bool returns = (self->GetPrintCommand(&printCmd, *params)); --- 817,825 ---- { // const wxFileType::MessageParameters params ! const wxFileType::MessageParameters * params = (const wxFileType::MessageParameters *)wxluaT_getuserdatatype(L, 3, wxluatype_wxFileType_MessageParameters); // wxString printCmd wxString printCmd; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileType); // call GetPrintCommand bool returns = (self->GetPrintCommand(&printCmd, *params)); *************** *** 841,845 **** void *buffer = malloc(size); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxInputStream); if (buffer != NULL) { --- 841,845 ---- void *buffer = malloc(size); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, wxluatype_wxInputStream); if (buffer != NULL) { *************** *** 848,852 **** self->Read(buffer, size); // only return the data that was read, they already have self ! //wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxInputStream); lua_pushlstring(L, (const char *)buffer, size); free(buffer); --- 848,852 ---- self->Read(buffer, size); // only return the data that was read, they already have self ! //wxluaT_pushuserdatatype(L, returns, wxluatype_wxInputStream); lua_pushlstring(L, (const char *)buffer, size); free(buffer); *************** *** 866,870 **** const char *buffer = (const char *)lua_tostring(L, 2); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxInputStream); // call Ungetch size_t returns = self->Ungetch(buffer, size); --- 866,870 ---- const char *buffer = (const char *)lua_tostring(L, 2); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, wxluatype_wxInputStream); // call Ungetch size_t returns = self->Ungetch(buffer, size); *************** *** 885,893 **** const void *buffer = (void *)lua_tostring(L, 2); // get this ! wxOutputStream *self = (wxOutputStream *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxOutputStream); // call Write wxOutputStream *returns = &self->Write(buffer, size); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxOutputStream); // return the number of parameters return 1; --- 885,893 ---- const void *buffer = (void *)lua_tostring(L, 2); // get this ! wxOutputStream *self = (wxOutputStream *)wxluaT_getuserdatatype(L, 1, wxluatype_wxOutputStream); // call Write wxOutputStream *returns = &self->Write(buffer, size); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxOutputStream); // return the number of parameters return 1; *************** *** 909,913 **** wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxMemoryInputStream((wxMemoryInputStream*)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMemoryInputStream); return 1; --- 909,913 ---- wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxMemoryInputStream((wxMemoryInputStream*)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxMemoryInputStream); return 1; Index: wxnet_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxnet_override.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxnet_override.hpp 22 Dec 2007 06:07:08 -0000 1.3 --- wxnet_override.hpp 23 Jan 2008 06:43:34 -0000 1.4 *************** *** 21,25 **** { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Peek self->Peek(buffer, nbytes); --- 21,25 ---- { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSocketBase); // call Peek self->Peek(buffer, nbytes); *************** *** 44,48 **** { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Peek self->Read(buffer, nbytes); --- 44,48 ---- { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSocketBase); // call Peek self->Read(buffer, nbytes); *************** *** 67,71 **** { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Peek self->ReadMsg(buffer, nbytes); --- 67,71 ---- { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSocketBase); // call Peek self->ReadMsg(buffer, nbytes); *************** *** 90,94 **** unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Unread self->Unread(buffer, nbytes); --- 90,94 ---- unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSocketBase); // call Unread self->Unread(buffer, nbytes); *************** *** 109,113 **** unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Write self->Write(buffer, nbytes); --- 109,113 ---- unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSocketBase); // call Write self->Write(buffer, nbytes); *************** *** 128,132 **** unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call WriteMsg self->WriteMsg(buffer, nbytes); --- 128,132 ---- unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSocketBase); // call WriteMsg self->WriteMsg(buffer, nbytes); Index: wxbase_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_rules.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxbase_rules.lua 22 Dec 2007 06:07:08 -0000 1.6 --- wxbase_rules.lua 23 Jan 2008 06:43:34 -0000 1.7 *************** *** 137,146 **** lua_State* L = wxlState.GetLuaState(); - g_wxluatag_NULL = wxluaT_newmetatable(L); - lua_pop(L, 1); // pop the table - lua_pushlstring(L, "NULL", 4); ! wxluaT_pushuserdatatype(L, NULL, g_wxluatag_NULL, true, true); lua_rawset(L, luaTable); // set t["NULL"] = userdata(NULL) w/ NULL tag ]] --- 137,148 ---- lua_State* L = wxlState.GetLuaState(); lua_pushlstring(L, "NULL", 4); ! wxluaT_pushuserdatatype(L, NULL, wxluatype_NULL, true, true); lua_rawset(L, luaTable); // set t["NULL"] = userdata(NULL) w/ NULL tag + + p_wxluatype_wxString = &wxluatype_wxString; + p_wxluatype_wxArrayString = &wxluatype_wxArrayString; + p_wxluatype_wxSortedArrayString = &wxluatype_wxSortedArrayString; + p_wxluatype_wxArrayInt = &wxluatype_wxArrayInt; ]] Index: wxstc_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxstc_override.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxstc_override.hpp 22 Dec 2007 06:07:08 -0000 1.5 --- wxstc_override.hpp 23 Jan 2008 06:43:34 -0000 1.6 *************** *** 16,20 **** int linePos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxStyledTextCtrl); // call GetCurLine wxString returns = self->GetCurLine(&linePos); --- 16,20 ---- int linePos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxStyledTextCtrl); // call GetCurLine wxString returns = self->GetCurLine(&linePos); *************** *** 34,38 **** int startPos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxStyledTextCtrl); // call GetSelection self->GetSelection(&startPos, &endPos); --- 34,38 ---- int startPos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxStyledTextCtrl); // call GetSelection self->GetSelection(&startPos, &endPos); *************** *** 54,58 **** int length = (int)lua_tonumber(L, 2); // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxStyledTextCtrl); // call SetStyleBytes self->SetStyleBytes(length, styleBytes); --- 54,58 ---- int length = (int)lua_tonumber(L, 2); // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxStyledTextCtrl); // call SetStyleBytes self->SetStyleBytes(length, styleBytes); Index: wxhtml_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_override.hpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxhtml_override.hpp 22 Dec 2007 06:07:08 -0000 1.7 --- wxhtml_override.hpp 23 Jan 2008 06:43:34 -0000 1.8 *************** *** 19,23 **** int pagebreak = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak); --- 19,23 ---- int pagebreak = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, wxluatype_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak); *************** *** 36,42 **** int pagebreak = (int)wxlua_getintegertype(L, 3); // wxArrayInt& known_pagebreaks ! wxArrayInt* known_pagebreaks = (wxArrayInt *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxArrayInt); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks); --- 36,42 ---- int pagebreak = (int)wxlua_getintegertype(L, 3); // wxArrayInt& known_pagebreaks ! wxArrayInt* known_pagebreaks = (wxArrayInt *)wxluaT_getuserdatatype(L, 2, wxluatype_wxArrayInt); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, wxluatype_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks); *************** *** 59,63 **** int condition = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlCell); // call Find switch(lua_type(L, 3)) --- 59,63 ---- int condition = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, wxluatype_wxHtmlCell); // call Find switch(lua_type(L, 3)) *************** *** 87,91 **** // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxHtmlCell); // return the number of parameters return 1; --- 87,91 ---- // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxHtmlCell); // return the number of parameters return 1; *************** *** 101,105 **** wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlTag); // call GetParamAsColour bool returns = self->GetParamAsColour(par, retColour); --- 101,105 ---- wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, wxluatype_wxHtmlTag); // call GetParamAsColour bool returns = self->GetParamAsColour(par, retColour); *************** *** 107,111 **** // push the result number lua_pushboolean(L, returns); ! wxluaT_pushuserdatatype(L, retColour, g_wxluatype_wxColour); // return the number of parameters return 2; --- 107,111 ---- // push the result number lua_pushboolean(L, returns); ! wxluaT_pushuserdatatype(L, retColour, wxluatype_wxColour); // return the number of parameters return 2; *************** *** 121,125 **** wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlTag); // call GetParamAsInt bool returns = self->GetParamAsInt(par, &value); --- 121,125 ---- wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, wxluatype_wxHtmlTag); // call GetParamAsInt bool returns = self->GetParamAsInt(par, &value); *************** *** 180,184 **** wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWinParser *self = (wxHtmlWinParser *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlWinParser); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); --- 180,184 ---- wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWinParser *self = (wxHtmlWinParser *)wxluaT_getuserdatatype(L, 1, wxluatype_wxHtmlWinParser); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); *************** *** 235,239 **** wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWindow *self = (wxHtmlWindow *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlWindow); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); --- 235,239 ---- wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWindow *self = (wxHtmlWindow *)wxluaT_getuserdatatype(L, 1, wxluatype_wxHtmlWindow); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); *************** *** 256,266 **** long style = (argCount >= 5 ? (long)wxlua_getintegertype(L, 5) : wxHW_SCROLLBAR_AUTO); // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getintegertype(L, 2) : -1); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxWindow); // call constructor wxLuaHtmlWindow *returns = new wxLuaHtmlWindow(wxlState, parent, id, *pos, *size, style, name); --- 256,266 ---- long style = (argCount >= 5 ? (long)wxlua_getintegertype(L, 5) : wxHW_SCROLLBAR_AUTO); // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, wxluatype_wxSize) : &wxDefaultSize); // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, wxluatype_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getintegertype(L, 2) : -1); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, wxluatype_wxWindow); // call constructor wxLuaHtmlWindow *returns = new wxLuaHtmlWindow(wxlState, parent, id, *pos, *size, style, name); *************** *** 269,273 **** wxluaW_addtrackedwindow(L, (wxWindow*)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaHtmlWindow); return 1; --- 269,273 ---- wxluaW_addtrackedwindow(L, (wxWindow*)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaHtmlWindow); return 1; Index: wxcore_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxcore_override.hpp 22 Jan 2008 04:04:24 -0000 1.18 --- wxcore_override.hpp 23 Jan 2008 06:43:34 -0000 1.19 *************** *** 17,21 **** wxApp *returns = wxTheApp; // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxApp); // return the number of parameters return 1; --- 17,21 ---- wxApp *returns = wxTheApp; // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxApp); // return the number of parameters [...1871 lines suppressed...] const wxString title = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxT("Printout"))); --- 2798,2802 ---- int argCount = lua_gettop(L); // wxLuaObject pObject = NULL ! wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxluaT_getuserdatatype(L, 2, wxluatype_wxLuaObject) : NULL); // const wxString title = "Printout" const wxString title = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxT("Printout"))); *************** *** 2806,2810 **** wxluaO_addgcobject(L, (wxLuaPrintout *)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaPrintout); return 1; --- 2806,2810 ---- wxluaO_addgcobject(L, (wxLuaPrintout *)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaPrintout); return 1; Index: wxadv_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_override.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxadv_override.hpp 22 Dec 2007 06:07:08 -0000 1.4 --- wxadv_override.hpp 23 Jan 2008 06:43:34 -0000 1.5 *************** *** 15,21 **** { // const wxPoint pos ! const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxPoint); // get this ! wxCalendarCtrl * self = (wxCalendarCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxCalendarCtrl); // call HitTest wxDateTime* date = new wxDateTime(); --- 15,21 ---- { // const wxPoint pos ! const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 2, wxluatype_wxPoint); // get this ! wxCalendarCtrl * self = (wxCalendarCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxCalendarCtrl); // call HitTest wxDateTime* date = new wxDateTime(); *************** *** 25,29 **** // push the result number lua_pushnumber(L, returns); ! wxluaT_pushuserdatatype(L, date, g_wxluatype_wxDateTime); lua_pushnumber(L, wd); --- 25,29 ---- // push the result number lua_pushnumber(L, returns); ! wxluaT_pushuserdatatype(L, date, wxluatype_wxDateTime); lua_pushnumber(L, wd); *************** *** 44,48 **** // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGridCellAttr); // call GetAlignment self->GetAlignment(&horz, &vert); --- 44,48 ---- // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGridCellAttr); // call GetAlignment self->GetAlignment(&horz, &vert); *************** *** 63,67 **** // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGridCellAttr); // call GetAlignment self->GetSize(&num_rows, &num_cols); --- 63,67 ---- // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGridCellAttr); // call GetAlignment self->GetSize(&num_rows, &num_cols); *************** *** 81,85 **** int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetRowLabelAlignment self->GetRowLabelAlignment(&horz, &vert); --- 81,85 ---- int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGrid); // call GetRowLabelAlignment self->GetRowLabelAlignment(&horz, &vert); *************** *** 99,103 **** int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetColLabelAlignment self->GetColLabelAlignment(&horz, &vert); --- 99,103 ---- int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGrid); // call GetColLabelAlignment self->GetColLabelAlignment(&horz, &vert); *************** *** 117,121 **** int horiz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetDefaultCellAlignment self->GetDefaultCellAlignment(&horiz, &vert); --- 117,121 ---- int horiz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGrid); // call GetDefaultCellAlignment self->GetDefaultCellAlignment(&horiz, &vert); *************** *** 139,143 **** int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &horiz, &vert); --- 139,143 ---- int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &horiz, &vert); *************** *** 161,165 **** int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &num_rows, &num_cols); --- 161,165 ---- int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &num_rows, &num_cols); *************** *** 179,187 **** long width; // wxArrayString& lines ! wxArrayString *lines = (wxArrayString *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxArrayString); // wxDC& dc ! wxDC *dc = (wxDC *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxDC); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetTextBoxSize self->GetTextBoxSize(*dc, *lines, &width, &height); --- 179,187 ---- long width; // wxArrayString& lines ! wxArrayString *lines = (wxArrayString *)wxluaT_getuserdatatype(L, 3, wxluatype_wxArrayString); // wxDC& dc ! wxDC *dc = (wxDC *)wxluaT_getuserdatatype(L, 2, wxluatype_wxDC); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGrid); // call GetTextBoxSize self->GetTextBoxSize(*dc, *lines, &width, &height); Index: wxcore_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_rules.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxcore_rules.lua 19 Jul 2007 03:09:46 -0000 1.3 --- wxcore_rules.lua 23 Jan 2008 06:43:34 -0000 1.4 *************** *** 270,274 **** -- hook_cpp_binding_classname. You can load any other custom bindings here. -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 270,278 ---- -- hook_cpp_binding_classname. You can load any other custom bindings here. -- Typically this is not necessary and you can rem this out. ! wxLuaBinding_PostRegister = ! [[ ! p_wxluatype_wxEvent = &wxluatype_wxEvent; ! p_wxluatype_wxWindow = &wxluatype_wxWindow; ! ]] --============================================================================= Index: wxxml_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_override.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxxml_override.hpp 22 Dec 2007 06:07:08 -0000 1.8 --- wxxml_override.hpp 23 Jan 2008 06:43:34 -0000 1.9 *************** *** 15,21 **** { // wxXmlNode next ! wxXmlNode * next = (wxXmlNode *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxXmlNode); // wxXmlProperty props ! wxXmlProperty * props = (wxXmlProperty *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxXmlProperty); // const wxString content const wxString content = wxlua_getwxStringtype(L, 4); --- 15,21 ---- { // wxXmlNode next ! wxXmlNode * next = (wxXmlNode *)wxluaT_getuserdatatype(L, 6, wxluatype_wxXmlNode); // wxXmlProperty props ! wxXmlProperty * props = (wxXmlProperty *)wxluaT_getuserdatatype(L, 5, wxluatype_wxXmlProperty); // const wxString content const wxString content = wxlua_getwxStringtype(L, 4); *************** *** 25,29 **** wxXmlNodeType type = (wxXmlNodeType)wxlua_getintegertype(L, 2); // wxXmlNode parent ! wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlNode); // call constructor wxXmlNode *returns = new wxXmlNode(parent, type, name, content, props, next); --- 25,29 ---- wxXmlNodeType type = (wxXmlNodeType)wxlua_getintegertype(L, 2); // wxXmlNode parent ! wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlNode); // call constructor wxXmlNode *returns = new wxXmlNode(parent, type, name, content, props, next); *************** *** 32,36 **** wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxXmlNode((wxXmlNode *)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlNode); return 1; --- 32,36 ---- wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxXmlNode((wxXmlNode *)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxXmlNode); return 1; *************** *** 43,49 **** { // wxXmlNode child ! wxXmlNode * child = (wxXmlNode *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxXmlNode); // get this ! wxXmlNode * self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlNode); // call RemoveChild bool returns = (self->RemoveChild(child)); --- 43,49 ---- { // wxXmlNode child ! wxXmlNode * child = (wxXmlNode *)wxluaT_getuserdatatype(L, 2, wxluatype_wxXmlNode); // get this ! wxXmlNode * self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlNode); // call RemoveChild bool returns = (self->RemoveChild(child)); *************** *** 68,72 **** wxString propName = wxlua_getwxStringtype(L, 2); // get this ! wxXmlNode *self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlNode); // call GetPropVal bool returns = self->GetPropVal(propName, &value); --- 68,72 ---- wxString propName = wxlua_getwxStringtype(L, 2); // get this ! wxXmlNode *self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlNode); // call GetPropVal bool returns = self->GetPropVal(propName, &value); |
