Menu
▾
▴
wxlua-commit
|
From: John L. <jr...@us...> - 2007-06-11 03:58:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19140/wxLua/modules/wxbind/src Modified Files: appframe.cpp controls.cpp data.cpp dialogs.cpp file.cpp gdi.cpp grid.cpp html.cpp windows.cpp wx_bind.cpp wxlhtmlwin.cpp wxlprint.cpp wxlua.cpp Log Message: Remove wxArrayString_FromLuaTable and wxArrayInt_FromLuaTable binding tag since we convert from wxArrayInt/String automatically Fix listctrl sorting Fix validator code using wxLuaObject Rename wxLuaState::LuaCall to LuaPCall since that what it calls Lots more cleanup and shuffling of code to more appropriate places Index: wxlprint.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlprint.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlprint.cpp 21 May 2007 01:07:59 -0000 1.16 --- wxlprint.cpp 11 Jun 2007 03:58:07 -0000 1.17 *************** *** 58,62 **** m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout); ! m_wxlState.LuaCall(1, false); *minPage = (int)m_wxlState.GetNumberType(-4); --- 58,62 ---- m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout); ! m_wxlState.LuaPCall(1, 4); *minPage = (int)m_wxlState.GetNumberType(-4); *************** *** 89,94 **** m_wxlState.lua_PushNumber(pageNum); ! m_wxlState.LuaCall(2, false); ! fResult = m_wxlState.GetBooleanType(-1); m_wxlState.lua_SetTop(nOldTop); --- 89,93 ---- m_wxlState.lua_PushNumber(pageNum); ! m_wxlState.LuaPCall(2, 1); fResult = m_wxlState.GetBooleanType(-1); m_wxlState.lua_SetTop(nOldTop); *************** *** 140,146 **** m_wxlState.lua_PushNumber(endPage); ! m_wxlState.LuaCall(3, false); fResult = m_wxlState.GetBooleanType(-1); - m_wxlState.lua_Pop(1); m_wxlState.lua_SetTop(nOldTop); //wxPrintf(wxT("wxLuaPrintout::OnBeginDocument 2 call base %d\n"), m_wxlState.GetCallBaseClassFunction()); --- 139,144 ---- m_wxlState.lua_PushNumber(endPage); ! m_wxlState.LuaPCall(3, 1); fResult = m_wxlState.GetBooleanType(-1); m_wxlState.lua_SetTop(nOldTop); //wxPrintf(wxT("wxLuaPrintout::OnBeginDocument 2 call base %d\n"), m_wxlState.GetCallBaseClassFunction()); *************** *** 167,171 **** int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout); ! m_wxlState.LuaCall(1, true); m_wxlState.lua_SetTop(nOldTop); } --- 165,169 ---- int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout); ! m_wxlState.LuaPCall(1, 0); m_wxlState.lua_SetTop(nOldTop); } *************** *** 183,187 **** int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout); ! m_wxlState.LuaCall(1, true); m_wxlState.lua_SetTop(nOldTop); } --- 181,185 ---- int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout); ! m_wxlState.LuaPCall(1, 0); m_wxlState.lua_SetTop(nOldTop); } *************** *** 199,203 **** int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout); ! m_wxlState.LuaCall(1, true); m_wxlState.lua_SetTop(nOldTop); } --- 197,201 ---- int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout); ! m_wxlState.LuaPCall(1, 0); m_wxlState.lua_SetTop(nOldTop); } *************** *** 215,219 **** int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout); ! m_wxlState.LuaCall(1, true); m_wxlState.lua_SetTop(nOldTop); } --- 213,217 ---- int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.tpushusertag(this, s_wxluatag_wxLuaPrintout); ! m_wxlState.LuaPCall(1, 0); m_wxlState.lua_SetTop(nOldTop); } *************** *** 235,240 **** m_wxlState.lua_PushNumber(pageNum); ! m_wxlState.LuaCall(2, false); ! fResult = m_wxlState.GetBooleanType(-1); m_wxlState.lua_SetTop(nOldTop); --- 233,237 ---- m_wxlState.lua_PushNumber(pageNum); ! m_wxlState.LuaPCall(2, 1); fResult = m_wxlState.GetBooleanType(-1); m_wxlState.lua_SetTop(nOldTop); Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** windows.cpp 8 Jun 2007 01:36:28 -0000 1.54 --- windows.cpp 11 Jun 2007 03:58:05 -0000 1.55 *************** *** 1558,1561 **** --- 1558,1629 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetScreenPosition[] = { &s_wxluatag_wxWindow, NULL }; + static int LUACALL wxLua_wxWindow_GetScreenPosition(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_GetScreenPosition[1] = {{ wxLua_wxWindow_GetScreenPosition, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxWindow_GetScreenPosition }}; + // virtual wxPoint GetScreenPosition() + static int LUACALL wxLua_wxWindow_GetScreenPosition(lua_State *L) + { + wxLuaState wxlState(L); + wxPoint *returns; + // get this + wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call GetScreenPosition + // allocate a new object using the copy constructor + returns = new wxPoint(self->GetScreenPosition()); + // add the new object to the tracked memory list + wxlState.AddTrackedObject((long)returns, new wxObject_wxPoint((wxPoint *)returns)); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxPoint, returns); + + return 1; + } + + #endif // wxLUA_USE_wxPointSizeRect + + #define wxLua_wxWindow_GetScreenPositionXY wxLua_wxWindow_GetScreenPositionXY + static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetScreenPositionXY[] = { &s_wxluatag_wxWindow, NULL }; + static int LUACALL wxLua_wxWindow_GetScreenPositionXY(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_GetScreenPositionXY[1] = {{ wxLua_wxWindow_GetScreenPositionXY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxWindow_GetScreenPositionXY }}; + // %override wxLua_wxWindow_GetScreenPositionXY + // virtual void GetScreenPositionXY(int* x, int* y) const + static int LUACALL wxLua_wxWindow_GetScreenPositionXY(lua_State *L) + { + wxLuaState wxlState(L); + int y = 0; + int x = 0; + // get this + wxWindow *self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call GetPosition + self->GetScreenPosition(&x, &y); + lua_pushnumber(L, x); + lua_pushnumber(L, y); + // return the number of parameters + return 2; + } + + + + #if wxLUA_USE_wxPointSizeRect + static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetScreenRect[] = { &s_wxluatag_wxWindow, NULL }; + static int LUACALL wxLua_wxWindow_GetScreenRect(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_GetScreenRect[1] = {{ wxLua_wxWindow_GetScreenRect, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxWindow_GetScreenRect }}; + // virtual wxRect GetScreenRect() const + static int LUACALL wxLua_wxWindow_GetScreenRect(lua_State *L) + { + wxLuaState wxlState(L); + wxRect *returns; + // get this + wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call GetScreenRect + // allocate a new object using the copy constructor + returns = new wxRect(self->GetScreenRect()); + // add the new object to the tracked memory list + wxlState.AddTrackedObject((long)returns, new wxObject_wxRect((wxRect *)returns)); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxRect, returns); + + return 1; + } + #endif // wxLUA_USE_wxPointSizeRect *************** *** 4343,4346 **** --- 4411,4421 ---- #if wxLUA_USE_wxPointSizeRect { "GetRect", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetRect, 1, NULL }, + { "GetScreenPosition", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetScreenPosition, 1, NULL }, + #endif // wxLUA_USE_wxPointSizeRect + + { "GetScreenPositionXY", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetScreenPositionXY, 1, NULL }, + + #if wxLUA_USE_wxPointSizeRect + { "GetScreenRect", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetScreenRect, 1, NULL }, #endif // wxLUA_USE_wxPointSizeRect Index: wxlhtmlwin.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlhtmlwin.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxlhtmlwin.cpp 21 May 2007 01:07:59 -0000 1.15 --- wxlhtmlwin.cpp 11 Jun 2007 03:58:07 -0000 1.16 *************** *** 70,75 **** m_wxlState.tpushusertag((void *) &event, s_wxluatag_wxMouseEvent); ! m_wxlState.LuaCall(5, false); ! fResult = (lua_tonumber(L, -1) != 0); lua_settop(L, nOldTop); --- 70,74 ---- m_wxlState.tpushusertag((void *) &event, s_wxluatag_wxMouseEvent); ! m_wxlState.LuaPCall(5, 1); fResult = (lua_tonumber(L, -1) != 0); lua_settop(L, nOldTop); *************** *** 109,113 **** lua_pushnumber(L, y); ! m_wxlState.LuaCall(4, true); lua_settop(L, nOldTop); } --- 108,112 ---- lua_pushnumber(L, y); ! m_wxlState.LuaPCall(4, 0); lua_settop(L, nOldTop); } *************** *** 128,132 **** m_wxlState.tpushusertag((void *) &link, s_wxluatag_wxHtmlLinkInfo); ! m_wxlState.LuaCall(2, true); lua_settop(L, nOldTop); } --- 127,131 ---- m_wxlState.tpushusertag((void *) &link, s_wxluatag_wxHtmlLinkInfo); ! m_wxlState.LuaPCall(2, 0); lua_settop(L, nOldTop); } *************** *** 147,151 **** m_wxlState.lua_PushString(title); ! m_wxlState.LuaCall(2, true); lua_settop(L, nOldTop); } --- 146,150 ---- m_wxlState.lua_PushString(title); ! m_wxlState.LuaPCall(2, 0); lua_settop(L, nOldTop); } Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** file.cpp 8 Jun 2007 01:36:25 -0000 1.47 --- file.cpp 11 Jun 2007 03:58:03 -0000 1.48 *************** *** 33,45 **** int s_wxluatag_wxPathList = -1; ! #if wxCHECK_VERSION(2,8,0) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_Add2[] = { &s_wxluatag_wxPathList, &s_wxluaarg_LuaTable, NULL }; static int LUACALL wxLua_wxPathList_Add2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxPathList_Add2[1] = {{ wxLua_wxPathList_Add2, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPathList_Add2 }}; ! // %wxchkver_2_8 void Add(const wxArrayString_FromLuaTable& paths) static int LUACALL wxLua_wxPathList_Add2(lua_State *L) { wxLuaState wxlState(L); ! // const wxArrayString_FromLuaTable paths wxArrayString paths = wxArrayString(); wxlState.GetwxArrayString(2, paths); // get this --- 33,45 ---- int s_wxluatag_wxPathList = -1; ! #if (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0)) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_Add2[] = { &s_wxluatag_wxPathList, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxPathList_Add2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxPathList_Add2[1] = {{ wxLua_wxPathList_Add2, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPathList_Add2 }}; ! // %wxchkver_2_8 void Add(const wxArrayString& paths) static int LUACALL wxLua_wxPathList_Add2(lua_State *L) { wxLuaState wxlState(L); ! // const wxArrayString paths wxArrayString paths = wxArrayString(); wxlState.GetwxArrayString(2, paths); // get this *************** *** 51,54 **** --- 51,57 ---- } + #endif // (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0)) + + #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxPathList_Add1[] = { &s_wxluatag_wxPathList, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxPathList_Add1(lua_State *L); *************** *** 230,234 **** ! #if (wxCHECK_VERSION(2,8,0))||(!wxCHECK_VERSION(2,8,0)) static int LUACALL wxLua_wxPathList_Add_overload(lua_State *L); // function overload table --- 233,237 ---- ! #if ((wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0)))||(wxCHECK_VERSION(2,8,0))||(!wxCHECK_VERSION(2,8,0)) static int LUACALL wxLua_wxPathList_Add_overload(lua_State *L); // function overload table *************** *** 237,243 **** { wxLua_wxPathList_Add_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 2, 2, s_wxluaargArray_None }, ! #if wxCHECK_VERSION(2,8,0) { wxLua_wxPathList_Add2, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPathList_Add2 }, ! #endif // wxCHECK_VERSION(2,8,0) #if wxCHECK_VERSION(2,8,0) --- 240,246 ---- { wxLua_wxPathList_Add_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 2, 2, s_wxluaargArray_None }, ! #if (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0)) { wxLua_wxPathList_Add2, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPathList_Add2 }, ! #endif // (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0)) #if wxCHECK_VERSION(2,8,0) *************** *** 258,268 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxCHECK_VERSION(2,8,0))||(!wxCHECK_VERSION(2,8,0)) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxPathList_methods[] = { ! #if (wxCHECK_VERSION(2,8,0))||(!wxCHECK_VERSION(2,8,0)) { "Add", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPathList_Add_overload, s_wxluafunc_wxLua_wxPathList_Add_overload_count, 0 }, ! #endif // (wxCHECK_VERSION(2,8,0))||(!wxCHECK_VERSION(2,8,0)) { "AddEnvList", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPathList_AddEnvList, 1, NULL }, --- 261,271 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0)))||(wxCHECK_VERSION(2,8,0))||(!wxCHECK_VERSION(2,8,0)) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxPathList_methods[] = { ! #if ((wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0)))||(wxCHECK_VERSION(2,8,0))||(!wxCHECK_VERSION(2,8,0)) { "Add", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPathList_Add_overload, s_wxluafunc_wxLua_wxPathList_Add_overload_count, 0 }, ! #endif // ((wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0)))||(wxCHECK_VERSION(2,8,0))||(!wxCHECK_VERSION(2,8,0)) { "AddEnvList", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPathList_AddEnvList, 1, NULL }, Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** dialogs.cpp 8 Jun 2007 01:36:25 -0000 1.41 --- dialogs.cpp 11 Jun 2007 03:58:03 -0000 1.42 *************** *** 954,965 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxAboutDialogInfo_SetArtists[] = { &s_wxluatag_wxAboutDialogInfo, &s_wxluaarg_LuaTable, NULL }; static int LUACALL wxLua_wxAboutDialogInfo_SetArtists(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAboutDialogInfo_SetArtists[1] = {{ wxLua_wxAboutDialogInfo_SetArtists, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxAboutDialogInfo_SetArtists }}; ! // void SetArtists(const wxArrayString_FromLuaTable& artists) static int LUACALL wxLua_wxAboutDialogInfo_SetArtists(lua_State *L) { wxLuaState wxlState(L); ! // const wxArrayString_FromLuaTable artists wxArrayString artists = wxArrayString(); wxlState.GetwxArrayString(2, artists); // get this --- 954,967 ---- } ! ! #if (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxAboutDialogInfo_SetArtists[] = { &s_wxluatag_wxAboutDialogInfo, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxAboutDialogInfo_SetArtists(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAboutDialogInfo_SetArtists[1] = {{ wxLua_wxAboutDialogInfo_SetArtists, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxAboutDialogInfo_SetArtists }}; ! // void SetArtists(const wxArrayString& artists) static int LUACALL wxLua_wxAboutDialogInfo_SetArtists(lua_State *L) { wxLuaState wxlState(L); ! // const wxArrayString artists wxArrayString artists = wxArrayString(); wxlState.GetwxArrayString(2, artists); // get this *************** *** 971,974 **** --- 973,978 ---- } + #endif // (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) + static wxLuaArgTag s_wxluatagArray_wxLua_wxAboutDialogInfo_SetCopyright[] = { &s_wxluatag_wxAboutDialogInfo, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAboutDialogInfo_SetCopyright(lua_State *L); *************** *** 1005,1016 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxAboutDialogInfo_SetDevelopers[] = { &s_wxluatag_wxAboutDialogInfo, &s_wxluaarg_LuaTable, NULL }; static int LUACALL wxLua_wxAboutDialogInfo_SetDevelopers(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAboutDialogInfo_SetDevelopers[1] = {{ wxLua_wxAboutDialogInfo_SetDevelopers, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxAboutDialogInfo_SetDevelopers }}; ! // void SetDevelopers(const wxArrayString_FromLuaTable& developers) static int LUACALL wxLua_wxAboutDialogInfo_SetDevelopers(lua_State *L) { wxLuaState wxlState(L); ! // const wxArrayString_FromLuaTable developers wxArrayString developers = wxArrayString(); wxlState.GetwxArrayString(2, developers); // get this --- 1009,1022 ---- } ! ! #if (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxAboutDialogInfo_SetDevelopers[] = { &s_wxluatag_wxAboutDialogInfo, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxAboutDialogInfo_SetDevelopers(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAboutDialogInfo_SetDevelopers[1] = {{ wxLua_wxAboutDialogInfo_SetDevelopers, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxAboutDialogInfo_SetDevelopers }}; ! // void SetDevelopers(const wxArrayString& developers) static int LUACALL wxLua_wxAboutDialogInfo_SetDevelopers(lua_State *L) { wxLuaState wxlState(L); ! // const wxArrayString developers wxArrayString developers = wxArrayString(); wxlState.GetwxArrayString(2, developers); // get this *************** *** 1022,1033 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxAboutDialogInfo_SetDocWriters[] = { &s_wxluatag_wxAboutDialogInfo, &s_wxluaarg_LuaTable, NULL }; static int LUACALL wxLua_wxAboutDialogInfo_SetDocWriters(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAboutDialogInfo_SetDocWriters[1] = {{ wxLua_wxAboutDialogInfo_SetDocWriters, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxAboutDialogInfo_SetDocWriters }}; ! // void SetDocWriters(const wxArrayString_FromLuaTable& docwriters) static int LUACALL wxLua_wxAboutDialogInfo_SetDocWriters(lua_State *L) { wxLuaState wxlState(L); ! // const wxArrayString_FromLuaTable docwriters wxArrayString docwriters = wxArrayString(); wxlState.GetwxArrayString(2, docwriters); // get this --- 1028,1039 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxAboutDialogInfo_SetDocWriters[] = { &s_wxluatag_wxAboutDialogInfo, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxAboutDialogInfo_SetDocWriters(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAboutDialogInfo_SetDocWriters[1] = {{ wxLua_wxAboutDialogInfo_SetDocWriters, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxAboutDialogInfo_SetDocWriters }}; ! // void SetDocWriters(const wxArrayString& docwriters) static int LUACALL wxLua_wxAboutDialogInfo_SetDocWriters(lua_State *L) { wxLuaState wxlState(L); ! // const wxArrayString docwriters wxArrayString docwriters = wxArrayString(); wxlState.GetwxArrayString(2, docwriters); // get this *************** *** 1039,1042 **** --- 1045,1049 ---- } + #endif // (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) #if (wxLUA_USE_wxIcon) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) *************** *** 1111,1122 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxAboutDialogInfo_SetTranslators[] = { &s_wxluatag_wxAboutDialogInfo, &s_wxluaarg_LuaTable, NULL }; static int LUACALL wxLua_wxAboutDialogInfo_SetTranslators(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAboutDialogInfo_SetTranslators[1] = {{ wxLua_wxAboutDialogInfo_SetTranslators, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxAboutDialogInfo_SetTranslators }}; ! // void SetTranslators(const wxArrayString_FromLuaTable& translators) static int LUACALL wxLua_wxAboutDialogInfo_SetTranslators(lua_State *L) { wxLuaState wxlState(L); ! // const wxArrayString_FromLuaTable translators wxArrayString translators = wxArrayString(); wxlState.GetwxArrayString(2, translators); // get this --- 1118,1131 ---- } ! ! #if (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxAboutDialogInfo_SetTranslators[] = { &s_wxluatag_wxAboutDialogInfo, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxAboutDialogInfo_SetTranslators(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAboutDialogInfo_SetTranslators[1] = {{ wxLua_wxAboutDialogInfo_SetTranslators, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxAboutDialogInfo_SetTranslators }}; ! // void SetTranslators(const wxArrayString& translators) static int LUACALL wxLua_wxAboutDialogInfo_SetTranslators(lua_State *L) { wxLuaState wxlState(L); ! // const wxArrayString translators wxArrayString translators = wxArrayString(); wxlState.GetwxArrayString(2, translators); // get this *************** *** 1128,1131 **** --- 1137,1142 ---- } + #endif // (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) + static wxLuaArgTag s_wxluatagArray_wxLua_wxAboutDialogInfo_SetVersion[] = { &s_wxluatag_wxAboutDialogInfo, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAboutDialogInfo_SetVersion(lua_State *L); *************** *** 1231,1239 **** --- 1242,1257 ---- { "HasVersion", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_HasVersion, 1, NULL }, { "HasWebSite", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_HasWebSite, 1, NULL }, + + #if (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) { "SetArtists", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_SetArtists, 1, NULL }, + #endif // (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) + { "SetCopyright", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_SetCopyright, 1, NULL }, { "SetDescription", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_SetDescription, 1, NULL }, + + #if (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) { "SetDevelopers", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_SetDevelopers, 1, NULL }, { "SetDocWriters", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_SetDocWriters, 1, NULL }, + #endif // (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) #if (wxLUA_USE_wxIcon) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) *************** *** 1244,1248 **** --- 1262,1270 ---- { "SetLicense", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_SetLicense, 1, NULL }, { "SetName", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_SetName, 1, NULL }, + + #if (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) { "SetTranslators", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_SetTranslators, 1, NULL }, + #endif // (wxLUA_USE_wxArrayString) && (wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog) + { "SetVersion", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_SetVersion, 1, NULL }, { "SetWebSite", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAboutDialogInfo_SetWebSite, 1, NULL }, *************** *** 2267,2275 **** wxLuaState wxlState(L); // const wxArrayInt selections ! const wxArrayInt * selections = (const wxArrayInt *)wxlState.GetUserDataType(2, s_wxluatag_wxArrayInt); // get this wxMultiChoiceDialog * self = (wxMultiChoiceDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxMultiChoiceDialog); // call SetSelections ! self->SetSelections(*selections); return 0; --- 2289,2297 ---- wxLuaState wxlState(L); // const wxArrayInt selections ! wxArrayInt selections = wxArrayInt(); wxlState.GetwxArrayInt(2, selections); // get this wxMultiChoiceDialog * self = (wxMultiChoiceDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxMultiChoiceDialog); // call SetSelections ! self->SetSelections(selections); return 0; *************** *** 2278,2286 **** #endif // (wxLUA_USE_wxArrayInt) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) ! #if (wxLUA_USE_wxPointSizeRect) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxMultiChoiceDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxPoint, NULL }; static int LUACALL wxLua_wxMultiChoiceDialog_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMultiChoiceDialog_constructor[1] = {{ wxLua_wxMultiChoiceDialog_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 6, s_wxluatagArray_wxLua_wxMultiChoiceDialog_constructor }}; ! // wxMultiChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) static int LUACALL wxLua_wxMultiChoiceDialog_constructor(lua_State *L) { --- 2300,2308 ---- #endif // (wxLUA_USE_wxArrayInt) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) ! #if ((wxLUA_USE_wxArrayString) && (wxLUA_USE_wxPointSizeRect)) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxMultiChoiceDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxArrayString, &s_wxluaarg_Number, &s_wxluatag_wxPoint, NULL }; static int LUACALL wxLua_wxMultiChoiceDialog_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMultiChoiceDialog_constructor[1] = {{ wxLua_wxMultiChoiceDialog_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 6, s_wxluatagArray_wxLua_wxMultiChoiceDialog_constructor }}; ! // wxMultiChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) static int LUACALL wxLua_wxMultiChoiceDialog_constructor(lua_State *L) { *************** *** 2294,2298 **** // long style = wxCHOICEDLG_STYLE long style = (argCount >= 5 ? (long)wxlua_getnumbertype(L, 5) : wxCHOICEDLG_STYLE); ! // const wxArrayString_FromLuaTable choices wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(4, choices); // const wxString caption --- 2316,2320 ---- // long style = wxCHOICEDLG_STYLE long style = (argCount >= 5 ? (long)wxlua_getnumbertype(L, 5) : wxCHOICEDLG_STYLE); ! // const wxArrayString choices wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(4, choices); // const wxString caption *************** *** 2313,2317 **** } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) --- 2335,2339 ---- } ! #endif // ((wxLUA_USE_wxArrayString) && (wxLUA_USE_wxPointSizeRect)) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) *************** *** 2324,2330 **** #endif // (wxLUA_USE_wxArrayInt) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) ! #if (wxLUA_USE_wxPointSizeRect) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) { "wxMultiChoiceDialog", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxMultiChoiceDialog_constructor, 1, NULL }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) { 0, 0, 0, 0 }, --- 2346,2352 ---- #endif // (wxLUA_USE_wxArrayInt) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) ! #if ((wxLUA_USE_wxArrayString) && (wxLUA_USE_wxPointSizeRect)) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) { "wxMultiChoiceDialog", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxMultiChoiceDialog_constructor, 1, NULL }, ! #endif // ((wxLUA_USE_wxArrayString) && (wxLUA_USE_wxPointSizeRect)) && (wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog) { 0, 0, 0, 0 }, *************** *** 2398,2407 **** ! #if (wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog) && (wxLUA_USE_wxPointSizeRect) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxSingleChoiceDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LuaTable, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, &s_wxluatag_wxPoint, NULL }; static int LUACALL wxLua_wxSingleChoiceDialog_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxSingleChoiceDialog_constructor[1] = {{ wxLua_wxSingleChoiceDialog_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 7, s_wxluatagArray_wxLua_wxSingleChoiceDialog_constructor }}; // %override wxLua_wxSingleChoiceDialog_constructor ! // wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) static int LUACALL wxLua_wxSingleChoiceDialog_constructor(lua_State *L) { --- 2420,2429 ---- ! #if ((wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxSingleChoiceDialog_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxArrayString, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, &s_wxluatag_wxPoint, NULL }; static int LUACALL wxLua_wxSingleChoiceDialog_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxSingleChoiceDialog_constructor[1] = {{ wxLua_wxSingleChoiceDialog_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 7, s_wxluatagArray_wxLua_wxSingleChoiceDialog_constructor }}; // %override wxLua_wxSingleChoiceDialog_constructor ! // wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) static int LUACALL wxLua_wxSingleChoiceDialog_constructor(lua_State *L) { *************** *** 2415,2419 **** // long style = wxCHOICEDLG_STYLE long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCHOICEDLG_STYLE); ! // const wxArrayString_FromLuaTable choices int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(4, choices); // const wxString caption --- 2437,2441 ---- // long style = wxCHOICEDLG_STYLE long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCHOICEDLG_STYLE); ! // const wxArrayString choices int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(4, choices); // const wxString caption *************** *** 2435,2439 **** ! #endif // (wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog) && (wxLUA_USE_wxPointSizeRect) --- 2457,2461 ---- ! #endif // ((wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) *************** *** 2445,2451 **** { "SetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxSingleChoiceDialog_SetSelection, 1, NULL }, ! #if (wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog) && (wxLUA_USE_wxPointSizeRect) { "wxSingleChoiceDialog", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxSingleChoiceDialog_constructor, 1, NULL }, ! #endif // (wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog) && (wxLUA_USE_wxPointSizeRect) { 0, 0, 0, 0 }, --- 2467,2473 ---- { "SetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxSingleChoiceDialog_SetSelection, 1, NULL }, ! #if ((wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) { "wxSingleChoiceDialog", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxSingleChoiceDialog_constructor, 1, NULL }, ! #endif // ((wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) { 0, 0, 0, 0 }, Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** appframe.cpp 8 Jun 2007 01:36:23 -0000 1.47 --- appframe.cpp 11 Jun 2007 03:58:00 -0000 1.48 *************** *** 1945,1949 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxFrame_SetStatusWidths[] = { &s_wxluatag_wxFrame, &s_wxluaarg_LuaTable, NULL }; static int LUACALL wxLua_wxFrame_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxFrame_SetStatusWidths[1] = {{ wxLua_wxFrame_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFrame_SetStatusWidths }}; --- 1945,1949 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxFrame_SetStatusWidths[] = { &s_wxluatag_wxFrame, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxFrame_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxFrame_SetStatusWidths[1] = {{ wxLua_wxFrame_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFrame_SetStatusWidths }}; *************** *** 2465,2469 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles[] = { &s_wxluatag_wxStatusBar, &s_wxluaarg_LuaTable, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusStyles(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusStyles[1] = {{ wxLua_wxStatusBar_SetStatusStyles, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles }}; --- 2465,2469 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles[] = { &s_wxluatag_wxStatusBar, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusStyles(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusStyles[1] = {{ wxLua_wxStatusBar_SetStatusStyles, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles }}; *************** *** 2503,2507 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths[] = { &s_wxluatag_wxStatusBar, &s_wxluaarg_LuaTable, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusWidths[1] = {{ wxLua_wxStatusBar_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths }}; --- 2503,2507 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths[] = { &s_wxluatag_wxStatusBar, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusWidths[1] = {{ wxLua_wxStatusBar_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths }}; Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** data.cpp 8 Jun 2007 01:36:24 -0000 1.46 --- data.cpp 11 Jun 2007 03:58:02 -0000 1.47 *************** *** 664,667 **** --- 664,681 ---- } + static int LUACALL wxLua_wxValidator_IsSilent(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxValidator_IsSilent[1] = {{ wxLua_wxValidator_IsSilent, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; + // static bool IsSilent() + static int LUACALL wxLua_wxValidator_IsSilent(lua_State *L) + { + bool returns; + // call IsSilent + returns = wxValidator::IsSilent(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxValidator_SetBellOnError[] = { &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxValidator_SetBellOnError(lua_State *L); *************** *** 759,762 **** --- 773,777 ---- wxLuaBindMethod wxValidator_methods[] = { { "GetWindow", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxValidator_GetWindow, 1, NULL }, + { "IsSilent", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxValidator_IsSilent, 1, NULL }, { "SetBellOnError", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxValidator_SetBellOnError, 1, NULL }, { "SetWindow", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxValidator_SetWindow, 1, NULL }, *************** *** 865,873 **** wxLuaState wxlState(L); // const wxArrayString excludes ! const wxArrayString * excludes = (const wxArrayString *)wxlState.GetUserDataType(2, s_wxluatag_wxArrayString); // get this wxTextValidator * self = (wxTextValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxTextValidator); // call SetExcludes ! self->SetExcludes(*excludes); return 0; --- 880,888 ---- wxLuaState wxlState(L); // const wxArrayString excludes ! wxArrayString excludes = wxArrayString(); wxlState.GetwxArrayString(2, excludes); // get this wxTextValidator * self = (wxTextValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxTextValidator); // call SetExcludes ! self->SetExcludes(excludes); return 0; *************** *** 882,890 **** wxLuaState wxlState(L); // const wxArrayString includes ! const wxArrayString * includes = (const wxArrayString *)wxlState.GetUserDataType(2, s_wxluatag_wxArrayString); // get this wxTextValidator * self = (wxTextValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxTextValidator); // call SetIncludes ! self->SetIncludes(*includes); return 0; --- 897,905 ---- wxLuaState wxlState(L); // const wxArrayString includes ! wxArrayString includes = wxArrayString(); wxlState.GetwxArrayString(2, includes); // get this wxTextValidator * self = (wxTextValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxTextValidator); // call SetIncludes ! self->SetIncludes(includes); return 0; *************** *** 910,933 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxTextValidator_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_constructor[1] = {{ wxLua_wxTextValidator_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxTextValidator_constructor }}; // %override wxLua_wxTextValidator_constructor - - class wxLuaTextValidator : public wxTextValidator - { - public: - wxLuaTextValidator(long style, const wxString& valPtr) - : wxTextValidator(style, &valString), valString(valPtr) - { - } - - wxLuaTextValidator(long style) : wxTextValidator(style) - { - } - - wxString valString; - }; - // wxTextValidator(long style = wxFILTER_NONE, wxString *valPtr = NULL) static int LUACALL wxLua_wxTextValidator_constructor(lua_State *L) --- 925,932 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_constructor[] = { &s_wxluaarg_Number, &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxTextValidator_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_constructor[1] = {{ wxLua_wxTextValidator_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxTextValidator_constructor }}; // %override wxLua_wxTextValidator_constructor // wxTextValidator(long style = wxFILTER_NONE, wxString *valPtr = NULL) static int LUACALL wxLua_wxTextValidator_constructor(lua_State *L) *************** *** 940,948 **** // long style = wxFILTER_NONE long style = (argCount >= 1 ? (long)wxlState.GetNumberType(1) : wxFILTER_NONE); // call constructor if (argCount >= 2) ! returns = new wxLuaTextValidator(style, wxlState.GetwxStringType(2)); else ! returns = new wxLuaTextValidator(style); // push the constructed class pointer --- 939,951 ---- // long style = wxFILTER_NONE long style = (argCount >= 1 ? (long)wxlState.GetNumberType(1) : wxFILTER_NONE); + // call constructor if (argCount >= 2) ! { ! wxLuaObject *valPtr = (wxLuaObject *)wxlState.GetUserDataType(2, s_wxluatag_wxLuaObject); ! returns = new wxTextValidator(style, valPtr->GetStringPtr()); ! } else ! returns = new wxTextValidator(style); // push the constructed class pointer *************** *** 1007,1018 **** } ! ! #if (wxLUA_USE_wxArrayInt) && ((wxLUA_USE_wxGenericValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidatorArray_constructor[] = { &s_wxluatag_wxArrayInt, NULL }; ! static int LUACALL wxLua_wxGenericValidatorArray_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxGenericValidatorArray_constructor[1] = {{ wxLua_wxGenericValidatorArray_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxGenericValidatorArray_constructor }}; ! // %override wxLua_wxGenericValidatorArray_constructor ! // %constructor wxGenericValidatorArray(wxLuaObject *valPtr) ! static int LUACALL wxLua_wxGenericValidatorArray_constructor(lua_State *L) { wxluabind_removetableforcall(L); --- 1010,1019 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidatorArrayInt_constructor[] = { &s_wxluatag_wxLuaObject, NULL }; ! static int LUACALL wxLua_wxGenericValidatorArrayInt_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxGenericValidatorArrayInt_constructor[1] = {{ wxLua_wxGenericValidatorArrayInt_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxGenericValidatorArrayInt_constructor }}; ! // %override wxLua_wxGenericValidatorArrayInt_constructor ! // %constructor wxGenericValidatorArrayInt(wxLuaObject *valPtr) ! static int LUACALL wxLua_wxGenericValidatorArrayInt_constructor(lua_State *L) { wxluabind_removetableforcall(L); *************** *** 1032,1038 **** ! #endif // (wxLUA_USE_wxArrayInt) && ((wxLUA_USE_wxGenericValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidatorBool_constructor[] = { &s_wxluaarg_LightUserData, NULL }; static int LUACALL wxLua_wxGenericValidatorBool_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxGenericValidatorBool_constructor[1] = {{ wxLua_wxGenericValidatorBool_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxGenericValidatorBool_constructor }}; --- 1033,1037 ---- ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidatorBool_constructor[] = { &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxGenericValidatorBool_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxGenericValidatorBool_constructor[1] = {{ wxLua_wxGenericValidatorBool_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxGenericValidatorBool_constructor }}; *************** *** 1057,1061 **** ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidatorInt_constructor[] = { &s_wxluaarg_LightUserData, NULL }; static int LUACALL wxLua_wxGenericValidatorInt_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxGenericValidatorInt_constructor[1] = {{ wxLua_wxGenericValidatorInt_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxGenericValidatorInt_constructor }}; --- 1056,1060 ---- ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidatorInt_constructor[] = { &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxGenericValidatorInt_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxGenericValidatorInt_constructor[1] = {{ wxLua_wxGenericValidatorInt_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxGenericValidatorInt_constructor }}; *************** *** 1080,1084 **** ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidatorString_constructor[] = { &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxGenericValidatorString_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxGenericValidatorString_constructor[1] = {{ wxLua_wxGenericValidatorString_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxGenericValidatorString_constructor }}; --- 1079,1083 ---- ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidatorString_constructor[] = { &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxGenericValidatorString_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxGenericValidatorString_constructor[1] = {{ wxLua_wxGenericValidatorString_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxGenericValidatorString_constructor }}; *************** *** 1109,1117 **** wxLuaBindMethod wxGenericValidator_methods[] = { { "Delete", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGenericValidator_Delete, 1, NULL }, ! ! #if (wxLUA_USE_wxArrayInt) && ((wxLUA_USE_wxGenericValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) ! { "wxGenericValidatorArray", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGenericValidatorArray_constructor, 1, NULL }, ! #endif // (wxLUA_USE_wxArrayInt) && ((wxLUA_USE_wxGenericValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) ! { "wxGenericValidatorBool", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGenericValidatorBool_constructor, 1, NULL }, { "wxGenericValidatorInt", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGenericValidatorInt_constructor, 1, NULL }, --- 1108,1112 ---- wxLuaBindMethod wxGenericValidator_methods[] = { { "Delete", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGenericValidator_Delete, 1, NULL }, ! { "wxGenericValidatorArrayInt", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGenericValidatorArrayInt_constructor, 1, NULL }, { "wxGenericValidatorBool", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGenericValidatorBool_constructor, 1, NULL }, { "wxGenericValidatorInt", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGenericValidatorInt_constructor, 1, NULL }, *************** *** 2058,2082 **** - static wxLuaArgTag s_wxluatagArray_wxLua_wxArrayInt_constructor2[] = { &s_wxluaarg_LuaTable, NULL }; - static int LUACALL wxLua_wxArrayInt_constructor2(lua_State *L); - // static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayInt_constructor2[1] = {{ wxLua_wxArrayInt_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxArrayInt_constructor2 }}; - // wxArrayInt(const wxArrayInt_FromLuaTable& array) - static int LUACALL wxLua_wxArrayInt_constructor2(lua_State *L) - { - wxluabind_removetableforcall(L); - wxLuaState wxlState(L); - wxArrayInt *returns; - // const wxArrayInt_FromLuaTable array - wxArrayInt array = wxArrayInt(); wxlState.GetwxArrayInt(1, array); - // call constructor - returns = new wxArrayInt(array); - // add to tracked memory list - wxlState.AddTrackedObject((long)returns, new wxObject_wxArrayInt((wxArrayInt *)returns)); - // push the constructed class pointer - wxlState.PushUserDataType(s_wxluatag_wxArrayInt, returns); - - return 1; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxArrayInt_constructor1[] = { &s_wxluatag_wxArrayInt, NULL }; static int LUACALL wxLua_wxArrayInt_constructor1(lua_State *L); --- 2053,2056 ---- *************** *** 2089,2095 **** wxArrayInt *returns; // const wxArrayInt array ! const wxArrayInt * array = (const wxArrayInt *)wxlState.GetUserDataType(1, s_wxluatag_wxArrayInt); // call constructor ! returns = new wxArrayInt(*array); // add to tracked memory list wxlState.AddTrackedObject((long)returns, new wxObject_wxArrayInt((wxArrayInt *)returns)); --- 2063,2069 ---- wxArrayInt *returns; // const wxArrayInt array ! wxArrayInt array = wxArrayInt(); wxlState.GetwxArrayInt(1, array); // call constructor ! returns = new wxArrayInt(array); // add to tracked memory list wxlState.AddTrackedObject((long)returns, new wxObject_wxArrayInt((wxArrayInt *)returns)); *************** *** 2127,2131 **** { { wxLua_wxArrayInt_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 1, s_wxluaargArray_None }, - { wxLua_wxArrayInt_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxArrayInt_constructor2 }, { wxLua_wxArrayInt_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxArrayInt_constructor1 }, { wxLua_wxArrayInt_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, --- 2101,2104 ---- *************** *** 2475,2499 **** - static wxLuaArgTag s_wxluatagArray_wxLua_wxArrayString_constructor2[] = { &s_wxluaarg_LuaTable, NULL }; - static int LUACALL wxLua_wxArrayString_constructor2(lua_State *L); - // static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayString_constructor2[1] = {{ wxLua_wxArrayString_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxArrayString_constructor2 }}; - // wxArrayString(const wxArrayString_FromLuaTable& array) - static int LUACALL wxLua_wxArrayString_constructor2(lua_State *L) - { - wxluabind_removetableforcall(L); - wxLuaState wxlState(L); - wxArrayString *returns; - // const wxArrayString_FromLuaTable array - wxArrayString array = wxArrayString(); wxlState.GetwxArrayString(1, array); - // call constructor - returns = new wxArrayString(array); - // add to tracked memory list - wxlState.AddTrackedObject((long)returns, new wxObject_wxArrayString((wxArrayString *)returns)); - // push the constructed class pointer - wxlState.PushUserDataType(s_wxluatag_wxArrayString, returns); - - return 1; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxArrayString_constructor1[] = { &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxArrayString_constructor1(lua_State *L); --- 2448,2451 ---- *************** *** 2506,2512 **** wxArrayString *returns; // const wxArrayString array ! const wxArrayString * array = (const wxArrayString *)wxlState.GetUserDataType(1, s_wxluatag_wxArrayString); // call constructor ! returns = new wxArrayString(*array); // add to tracked memory list wxlState.AddTrackedObject((long)returns, new wxObject_wxArrayString((wxArrayString *)returns)); --- 2458,2464 ---- wxArrayString *returns; // const wxArrayString array ! wxArrayString array = wxArrayString(); wxlState.GetwxArrayString(1, array); // call constructor ! returns = new wxArrayString(array); // add to tracked memory list wxlState.AddTrackedObject((long)returns, new wxObject_wxArrayString((wxArrayString *)returns)); *************** *** 2544,2548 **** { { wxLua_wxArrayString_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 1, s_wxluaargArray_None }, - { wxLua_wxArrayString_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxArrayString_constructor2 }, { wxLua_wxArrayString_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxArrayString_constructor1 }, { wxLua_wxArrayString_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, --- 2496,2499 ---- *************** *** 2614,2638 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxSortedArrayString_constructor2[] = { &s_wxluaarg_LuaTable, NULL }; - static int LUACALL wxLua_wxSortedArrayString_constructor2(lua_State *L); - // static wxLuaBindCFunc s_wxluafunc_wxLua_wxSortedArrayString_constructor2[1] = {{ wxLua_wxSortedArrayString_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxSortedArrayString_constructor2 }}; - // wxSortedArrayString(const wxArrayString_FromLuaTable& array) - static int LUACALL wxLua_wxSortedArrayString_constructor2(lua_State *L) - { - wxluabind_removetableforcall(L); - wxLuaState wxlState(L); - wxSortedArrayString *returns; - // const wxArrayString_FromLuaTable array - wxArrayString array = wxArrayString(); wxlState.GetwxArrayString(1, array); - // call constructor - returns = new wxSortedArrayString(array); - // add to tracked memory list - wxlState.AddTrackedObject((long)returns, new wxObject_wxSortedArrayString((wxSortedArrayString *)returns)); - // push the constructed class pointer - wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns); - - return 1; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxSortedArrayString_constructor1[] = { &s_wxluatag_wxSortedArrayString, NULL }; static int LUACALL wxLua_wxSortedArrayString_constructor1(lua_State *L); --- 2565,2568 ---- *************** *** 2683,2687 **** { { wxLua_wxSortedArrayString_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 1, s_wxluaargArray_None }, - { wxLua_wxSortedArrayString_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxSortedArrayString_constructor2 }, { wxLua_wxSortedArrayString_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxSortedArrayString_constructor1 }, { wxLua_wxSortedArrayString_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, --- 2613,2616 ---- Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxlua.cpp 8 Jun 2007 01:36:30 -0000 1.39 --- wxlua.cpp 11 Jun 2007 03:58:07 -0000 1.40 *************** *** 111,117 **** // get this wxLuaObject *self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call GetObject that if successful will push an item onto the stack if (self->GetObject()) return 1; return 0; } --- 111,118 ---- // get this wxLuaObject *self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call GetObject that push the item onto the stack, or nil if (self->GetObject()) return 1; + return 0; } *************** *** 160,166 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxLuaObject_SetObject }}; // %override wxLua_wxLuaObject_SetObject // void SetObject(void *object) --- 161,167 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_SetObject }}; // %override wxLua_wxLuaObject_SetObject // void SetObject(void *object) Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** controls.cpp 8 Jun 2007 01:36:23 -0000 1.59 --- controls.cpp 11 Jun 2007 03:58:01 -0000 1.60 *************** *** 1093,1101 **** wxLuaState wxlState(L); // const wxArrayString strings ! const wxArrayString * strings = (const wxArrayString *)wxlState.GetUserDataType(2, s_wxluatag_wxArrayString); // get this wxControlWithItems * self = (wxControlWithItems *)wxlState.GetUserDataType(1, s_wxluatag_wxControlWithItems); // call Append ! self->Append(*strings); return 0; --- 1093,1101 ---- [...1066 lines suppressed...] *** 10077,10085 **** wxLuaState wxlState(L); // const wxArrayInt tabs ! const wxArrayInt * tabs = (const wxArrayInt *)wxlState.GetUserDataType(2, s_wxluatag_wxArrayInt); // get this wxTextAttr * self = (wxTextAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxTextAttr); // call SetTabs ! self->SetTabs(*tabs); return 0; --- 10128,10136 ---- wxLuaState wxlState(L); // const wxArrayInt tabs ! wxArrayInt tabs = wxArrayInt(); wxlState.GetwxArrayInt(2, tabs); // get this wxTextAttr * self = (wxTextAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxTextAttr); // call SetTabs ! self->SetTabs(tabs); return 0; Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** grid.cpp 8 Jun 2007 01:36:26 -0000 1.38 --- grid.cpp 11 Jun 2007 03:58:04 -0000 1.39 *************** *** 1066,1073 **** int s_wxluatag_wxGridCellChoiceEditor = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGridCellChoiceEditor_constructor[] = { &s_wxluaarg_LuaTable, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxGridCellChoiceEditor_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxGridCellChoiceEditor_constructor[1] = {{ wxLua_wxGridCellChoiceEditor_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxGridCellChoiceEditor_constructor }}; ! // wxGridCellChoiceEditor(const wxArrayString_FromLuaTable& choices, bool allowOthers = false) static int LUACALL wxLua_wxGridCellChoiceEditor_constructor(lua_State *L) { --- 1066,1074 ---- int s_wxluatag_wxGridCellChoiceEditor = -1; ! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxGrid && wxUSE_GRID) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGridCellChoiceEditor_constructor[] = { &s_wxluatag_wxArrayString, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxGridCellChoiceEditor_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxGridCellChoiceEditor_constructor[1] = {{ wxLua_wxGridCellChoiceEditor_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxGridCellChoiceEditor_constructor }}; ! // wxGridCellChoiceEditor(const wxArrayString& choices, bool allowOthers = false) static int LUACALL wxLua_wxGridCellChoiceEditor_constructor(lua_State *L) { *************** *** 1079,1083 **** // bool allowOthers = false bool allowOthers = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : false); ! // const wxArrayString_FromLuaTable choices wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(1, choices); // call constructor --- 1080,1... [truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X