Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.41, 1.42 clipdrag.cpp, 1.36, 1.37 config.cpp, 1.33, 1.34 controls.cpp, 1.51, 1.52 data.cpp, 1.41, 1.42 datetime.cpp, 1.34, 1.35 defsutil.cpp, 1.31, 1.32 dialogs.cpp, 1.35, 1.36 event.cpp, 1.40, 1.41 file.cpp, 1.40, 1.41 gdi.cpp, 1.57, 1.58 geometry.cpp, 1.25, 1.26 grid.cpp, 1.31, 1.32 help.cpp, 1.29, 1.30 html.cpp, 1.34, 1.35 image.cpp, 1.34, 1.35 mdi.cpp, 1.30, 1.31 menutool.cpp, 1.32, 1.33 print.cpp, 1.33, 1.34 regex.cpp, 1.25, 1.26 sizer.cpp, 1.28, 1.29 socket.cpp, 1.32, 1.33 thread.cpp, 1.22, 1.23 wave.cpp, 1.32, 1.33 windows.cpp, 1.46, 1.47 wx_bind.cpp, 1.92, 1.93 wxlua.cpp, 1.33, 1.34 xml.cpp, 1.28, 1.29
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** xml.cpp 19 Mar 2007 03:47:20 -0000 1.28 --- xml.cpp 31 May 2007 17:18:53 -0000 1.29 *************** *** 35,40 **** int s_wxluatag_wxXmlNode = -1; - #if wxLUA_USE_wxXMLResource && wxUSE_XML static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_AddChild[] = { &s_wxluatag_wxXmlNode, 0 }; // void AddChild(wxXmlNode *child); static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L) --- 35,42 ---- int s_wxluatag_wxXmlNode = -1; static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_AddChild[] = { &s_wxluatag_wxXmlNode, 0 }; [...1851 lines suppressed...] ! { WXLUAMETHOD_METHOD, "SetFlags", s_wxluafunc_wxLua_wxXmlResource_SetFlags, 1 }, ! { WXLUAMETHOD_METHOD, "Unload", s_wxluafunc_wxLua_wxXmlResource_Unload, 1 }, ! #if (wxLUA_USE_wxXMLResource && wxUSE_XML) ! { WXLUAMETHOD_CONSTRUCTOR, "wxXmlResource", s_wxluafunc_wxLua_wxXmlResource_constructor_overload, s_wxluafunc_wxLua_wxXmlResource_constructor_overload_count }, ! #endif // (wxLUA_USE_wxXMLResource && wxUSE_XML) ! ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxXmlResource_methods[0]) - 1; + + + WXLUADEFINE wxXmlResource_enums[] = { + { NULL, 0, }, + }; + + int wxXmlResource_enumCount = sizeof(wxXmlResource_enums)/sizeof(wxXmlResource_enums[0]) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** defsutil.cpp 19 May 2007 02:05:46 -0000 1.31 --- defsutil.cpp 31 May 2007 17:18:50 -0000 1.32 *************** *** 36,39 **** --- 36,42 ---- #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_CloseOutput[1] = {{ wxLua_wxProcess_CloseOutput, 0, 0, s_wxluaargArray_None }}; + // void CloseOutput() static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L) *************** *** 50,54 **** #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! #if wxLUA_USE_wxProcess static int LUACALL wxLua_wxProcess_Delete(lua_State *L) { --- 53,59 ---- #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! static int LUACALL wxLua_wxProcess_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Delete[1] = {{ wxLua_wxProcess_Delete, 0, 0, s_wxluaargArray_None }}; ! static int LUACALL wxLua_wxProcess_Delete(lua_State *L) { *************** *** 64,67 **** --- 69,75 ---- } + static int LUACALL wxLua_wxProcess_Detach(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Detach[1] = {{ wxLua_wxProcess_Detach, 0, 0, s_wxluaargArray_None }}; + // void Detach() static int LUACALL wxLua_wxProcess_Detach(lua_State *L) *************** *** 76,82 **** } ! #endif // wxLUA_USE_wxProcess #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) // wxInputStream *GetErrorStream() const static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L) --- 84,110 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Exists[] = { &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxProcess_Exists(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Exists[1] = {{ wxLua_wxProcess_Exists, 1, 1, s_wxluatagArray_wxLua_wxProcess_Exists }}; ! ! // static bool Exists(int pid) ! static int LUACALL wxLua_wxProcess_Exists(lua_State *L) ! { ! bool returns; ! // int pid ! int pid = (int)wxlua_getnumbertype(L, 1); ! // call Exists ! returns = wxProcess::Exists(pid); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) + static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetErrorStream[1] = {{ wxLua_wxProcess_GetErrorStream, 0, 0, s_wxluaargArray_None }}; + // wxInputStream *GetErrorStream() const static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L) *************** *** 94,97 **** --- 122,128 ---- } + static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetInputStream[1] = {{ wxLua_wxProcess_GetInputStream, 0, 0, s_wxluaargArray_None }}; + // wxInputStream *GetInputStream() const static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L) *************** *** 109,112 **** --- 140,146 ---- } + static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetOutputStream[1] = {{ wxLua_wxProcess_GetOutputStream, 0, 0, s_wxluaargArray_None }}; + // wxOutputStream *GetOutputStream() const static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L) *************** *** 127,130 **** --- 161,167 ---- #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsErrorAvailable[1] = {{ wxLua_wxProcess_IsErrorAvailable, 0, 0, s_wxluaargArray_None }}; + // bool IsErrorAvailable() const static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L) *************** *** 142,145 **** --- 179,185 ---- } + static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsInputAvailable[1] = {{ wxLua_wxProcess_IsInputAvailable, 0, 0, s_wxluaargArray_None }}; + // bool IsInputAvailable() const static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L) *************** *** 157,160 **** --- 197,203 ---- } + static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsInputOpened[1] = {{ wxLua_wxProcess_IsInputOpened, 0, 0, s_wxluaargArray_None }}; + // bool IsInputOpened() const static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L) *************** *** 174,178 **** #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! #if wxLUA_USE_wxProcess // bool IsRedirected() static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L) --- 217,223 ---- #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsRedirected[1] = {{ wxLua_wxProcess_IsRedirected, 0, 0, s_wxluaargArray_None }}; ! // bool IsRedirected() static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L) *************** *** 190,194 **** --- 235,266 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Kill[] = { &s_wxluaarg_Number, &s_wxluaarg_Enumeration, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxProcess_Kill(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Kill[1] = {{ wxLua_wxProcess_Kill, 1, 3, s_wxluatagArray_wxLua_wxProcess_Kill }}; + + // static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN) + static int LUACALL wxLua_wxProcess_Kill(lua_State *L) + { + wxKillError returns; + // get number of arguments + int argCount = lua_gettop(L); + // int flags = wxKILL_NOCHILDREN + int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxKILL_NOCHILDREN); + // wxSignal sig = wxSIGTERM + wxSignal sig = (argCount >= 2 ? (wxSignal)wxlua_getenumerationtype(L, 2) : wxSIGTERM); + // int pid + int pid = (int)wxlua_getnumbertype(L, 1); + // call Kill + returns = wxProcess::Kill(pid, sig, flags); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Open[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxProcess_Open(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Open[1] = {{ wxLua_wxProcess_Open, 1, 2, s_wxluatagArray_wxLua_wxProcess_Open }}; + // static wxProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC) static int LUACALL wxLua_wxProcess_Open(lua_State *L) *************** *** 199,205 **** int argCount = lua_gettop(L); // int flags = wxEXEC_ASYNC ! int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxEXEC_ASYNC); // const wxString cmd ! const wxString cmd = wxlState.GetwxStringType(2); // call Open returns = (wxProcess *)wxProcess::Open(cmd, flags); --- 271,277 ---- int argCount = lua_gettop(L); // int flags = wxEXEC_ASYNC ! int flags = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxEXEC_ASYNC); // const wxString cmd ! const wxString cmd = wxlState.GetwxStringType(1); // call Open returns = (wxProcess *)wxProcess::Open(cmd, flags); *************** *** 210,213 **** --- 282,288 ---- } + static int LUACALL wxLua_wxProcess_Redirect(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Redirect[1] = {{ wxLua_wxProcess_Redirect, 0, 0, s_wxluaargArray_None }}; + // void Redirect() static int LUACALL wxLua_wxProcess_Redirect(lua_State *L) *************** *** 222,229 **** } - #endif // wxLUA_USE_wxProcess #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_SetPipeStreams[] = { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 }; // void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream) static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L) --- 297,306 ---- } #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_SetPipeStreams[] = { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 }; + static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_SetPipeStreams[1] = {{ wxLua_wxProcess_SetPipeStreams, 3, 3, s_wxluatagArray_wxLua_wxProcess_SetPipeStreams }}; + // void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream) static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L) *************** *** 246,254 **** #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) - #if wxLUA_USE_wxProcess static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_constructor[] = { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 }; // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) static int LUACALL wxLua_wxProcess_constructor(lua_State *L) { wxLuaState wxlState(L); wxProcess *returns; --- 323,334 ---- #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_constructor[] = { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxProcess_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_constructor[1] = {{ wxLua_wxProcess_constructor, 0, 2, s_wxluatagArray_wxLua_wxProcess_constructor }}; + // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) static int LUACALL wxLua_wxProcess_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxProcess *returns; *************** *** 256,260 **** int argCount = lua_gettop(L); // int nId = wxID_ANY ! int nId = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : wxID_ANY); // wxEvtHandler parent = NULL wxEvtHandler * parent = (argCount >= 1 ? (wxEvtHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxEvtHandler) : NULL); --- 336,340 ---- int argCount = lua_gettop(L); // int nId = wxID_ANY ! int nId = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxID_ANY); // wxEvtHandler parent = NULL wxEvtHandler * parent = (argCount >= 1 ? (wxEvtHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxEvtHandler) : NULL); *************** *** 269,273 **** } - #endif // wxLUA_USE_wxProcess --- 349,352 ---- *************** *** 276,311 **** WXLUAMETHOD wxProcess_methods[] = { #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "CloseOutput", wxLua_wxProcess_CloseOutput, 0, 0, s_wxluaargArray_None }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "Delete", wxLua_wxProcess_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Detach", wxLua_wxProcess_Detach, 0, 0, s_wxluaargArray_None }, #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { LuaMethod, "GetErrorStream", wxLua_wxProcess_GetErrorStream, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetInputStream", wxLua_wxProcess_GetInputStream, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, s_wxluaargArray_None }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "IsErrorAvailable", wxLua_wxProcess_IsErrorAvailable, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, s_wxluaargArray_None }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "IsRedirected", wxLua_wxProcess_IsRedirected, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Open", wxLua_wxProcess_Open, 2, 1, s_wxluatagArray_wxLua_wxProcess_Open }, ! { LuaMethod, "Redirect", wxLua_wxProcess_Redirect, 0, 0, s_wxluaargArray_None }, #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, s_wxluatagArray_wxLua_wxProcess_SetPipeStreams }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, s_wxluatagArray_wxLua_wxProcess_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxProcess_methodCount = sizeof(wxProcess_methods)/sizeof(wxProcess_methods[0]) - 1; #endif // wxLUA_USE_wxProcess --- 355,399 ---- WXLUAMETHOD wxProcess_methods[] = { #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "CloseOutput", s_wxluafunc_wxLua_wxProcess_CloseOutput, 1 }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxProcess_Delete }, ! { WXLUAMETHOD_METHOD, "Detach", s_wxluafunc_wxLua_wxProcess_Detach, 1 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Exists", s_wxluafunc_wxLua_wxProcess_Exists, 1 }, #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { WXLUAMETHOD_METHOD, "GetErrorStream", s_wxluafunc_wxLua_wxProcess_GetErrorStream, 1 }, ! { WXLUAMETHOD_METHOD, "GetInputStream", s_wxluafunc_wxLua_wxProcess_GetInputStream, 1 }, ! { WXLUAMETHOD_METHOD, "GetOutputStream", s_wxluafunc_wxLua_wxProcess_GetOutputStream, 1 }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "IsErrorAvailable", s_wxluafunc_wxLua_wxProcess_IsErrorAvailable, 1 }, ! { WXLUAMETHOD_METHOD, "IsInputAvailable", s_wxluafunc_wxLua_wxProcess_IsInputAvailable, 1 }, ! { WXLUAMETHOD_METHOD, "IsInputOpened", s_wxluafunc_wxLua_wxProcess_IsInputOpened, 1 }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "IsRedirected", s_wxluafunc_wxLua_wxProcess_IsRedirected, 1 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Kill", s_wxluafunc_wxLua_wxProcess_Kill, 1 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Open", s_wxluafunc_wxLua_wxProcess_Open, 1 }, ! { WXLUAMETHOD_METHOD, "Redirect", s_wxluafunc_wxLua_wxProcess_Redirect, 1 }, #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { WXLUAMETHOD_METHOD, "SetPipeStreams", s_wxluafunc_wxLua_wxProcess_SetPipeStreams, 1 }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { WXLUAMETHOD_CONSTRUCTOR, "wxProcess", s_wxluafunc_wxLua_wxProcess_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxProcess_methodCount = sizeof(wxProcess_methods)/sizeof(wxProcess_methods[0]) - 1; + + + WXLUADEFINE wxProcess_enums[] = { + { NULL, 0, }, + }; + + int wxProcess_enumCount = sizeof(wxProcess_enums)/sizeof(wxProcess_enums[0]) - 1; #endif // wxLUA_USE_wxProcess *************** *** 319,323 **** int s_wxluatag_wxMouseState = -1; ! #if wxCHECK_VERSION(2,7,0) // bool AltDown() static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L) --- 407,413 ---- int s_wxluatag_wxMouseState = -1; ! static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_AltDown[1] = {{ wxLua_wxMouseState_AltDown, 0, 0, s_wxluaargArray_None }}; ! // bool AltDown() static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L) *************** *** 335,338 **** --- 425,431 ---- } + static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_CmdDown[1] = {{ wxLua_wxMouseState_CmdDown, 0, 0, s_wxluaargArray_None }}; + // bool CmdDown() static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L) *************** *** 350,353 **** --- 443,449 ---- } + static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_ControlDown[1] = {{ wxLua_wxMouseState_ControlDown, 0, 0, s_wxluaargArray_None }}; + // bool ControlDown() static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L) *************** *** 365,368 **** --- 461,467 ---- } + static int LUACALL wxLua_wxMouseState_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_Delete[1] = {{ wxLua_wxMouseState_Delete, 0, 0, s_wxluaargArray_None }}; + static int LUACALL wxLua_wxMouseState_Delete(lua_State *L) { *************** *** 378,381 **** --- 477,483 ---- } + static int LUACALL wxLua_wxMouseState_GetX(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_GetX[1] = {{ wxLua_wxMouseState_GetX, 0, 0, s_wxluaargArray_None }}; + // wxCoord GetX() static int LUACALL wxLua_wxMouseState_GetX(lua_State *L) *************** *** 393,396 **** --- 495,501 ---- } + static int LUACALL wxLua_wxMouseState_GetY(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_GetY[1] = {{ wxLua_wxMouseState_GetY, 0, 0, s_wxluaargArray_None }}; + // wxCoord GetY() static int LUACALL wxLua_wxMouseState_GetY(lua_State *L) *************** *** 408,411 **** --- 513,519 ---- } + static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_LeftDown[1] = {{ wxLua_wxMouseState_LeftDown, 0, 0, s_wxluaargArray_None }}; + // bool LeftDown() static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L) *************** *** 423,426 **** --- 531,537 ---- } + static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_MetaDown[1] = {{ wxLua_wxMouseState_MetaDown, 0, 0, s_wxluaargArray_None }}; + // bool MetaDown() static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L) *************** *** 438,441 **** --- 549,555 ---- } + static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_MiddleDown[1] = {{ wxLua_wxMouseState_MiddleDown, 0, 0, s_wxluaargArray_None }}; + // bool MiddleDown() static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L) *************** *** 453,456 **** --- 567,573 ---- } + static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_RightDown[1] = {{ wxLua_wxMouseState_RightDown, 0, 0, s_wxluaargArray_None }}; + // bool RightDown() static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L) *************** *** 469,472 **** --- 586,592 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetAltDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetAltDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetAltDown[1] = {{ wxLua_wxMouseState_SetAltDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetAltDown }}; + // void SetAltDown(bool down) static int LUACALL wxLua_wxMouseState_SetAltDown(lua_State *L) *************** *** 474,478 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 594,598 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 484,487 **** --- 604,610 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetControlDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetControlDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetControlDown[1] = {{ wxLua_wxMouseState_SetControlDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetControlDown }}; + // void SetControlDown(bool down) static int LUACALL wxLua_wxMouseState_SetControlDown(lua_State *L) *************** *** 489,493 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 612,616 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 499,502 **** --- 622,628 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetLeftDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetLeftDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetLeftDown[1] = {{ wxLua_wxMouseState_SetLeftDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetLeftDown }}; + // void SetLeftDown(bool down) static int LUACALL wxLua_wxMouseState_SetLeftDown(lua_State *L) *************** *** 504,508 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 630,634 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 514,517 **** --- 640,646 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMetaDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetMetaDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetMetaDown[1] = {{ wxLua_wxMouseState_SetMetaDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetMetaDown }}; + // void SetMetaDown(bool down) static int LUACALL wxLua_wxMouseState_SetMetaDown(lua_State *L) *************** *** 519,523 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 648,652 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 529,532 **** --- 658,664 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetMiddleDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetMiddleDown[1] = {{ wxLua_wxMouseState_SetMiddleDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown }}; + // void SetMiddleDown(bool down) static int LUACALL wxLua_wxMouseState_SetMiddleDown(lua_State *L) *************** *** 534,538 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 666,670 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 544,547 **** --- 676,682 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetRightDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetRightDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetRightDown[1] = {{ wxLua_wxMouseState_SetRightDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetRightDown }}; + // void SetRightDown(bool down) static int LUACALL wxLua_wxMouseState_SetRightDown(lua_State *L) *************** *** 549,553 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 684,688 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 559,562 **** --- 694,700 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetShiftDown[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxMouseState_SetShiftDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetShiftDown[1] = {{ wxLua_wxMouseState_SetShiftDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetShiftDown }}; + // void SetShiftDown(bool down) static int LUACALL wxLua_wxMouseState_SetShiftDown(lua_State *L) *************** *** 564,568 **** wxLuaState wxlState(L); // bool down ! bool down = wxlState.GetBooleanType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 702,706 ---- wxLuaState wxlState(L); // bool down ! bool down = wxlua_getbooleantype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 574,577 **** --- 712,718 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetX[] = { &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxMouseState_SetX(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetX[1] = {{ wxLua_wxMouseState_SetX, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetX }}; + // void SetX(wxCoord x) static int LUACALL wxLua_wxMouseState_SetX(lua_State *L) *************** *** 579,583 **** wxLuaState wxlState(L); // wxCoord x ! wxCoord x = (wxCoord)wxlState.GetNumberType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 720,724 ---- wxLuaState wxlState(L); // wxCoord x ! wxCoord x = (wxCoord)wxlua_getnumbertype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 589,592 **** --- 730,736 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetY[] = { &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxMouseState_SetY(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetY[1] = {{ wxLua_wxMouseState_SetY, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetY }}; + // void SetY(wxCoord y) static int LUACALL wxLua_wxMouseState_SetY(lua_State *L) *************** *** 594,598 **** wxLuaState wxlState(L); // wxCoord y ! wxCoord y = (wxCoord)wxlState.GetNumberType(2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); --- 738,742 ---- wxLuaState wxlState(L); // wxCoord y ! wxCoord y = (wxCoord)wxlua_getnumbertype(L, 2); // get this wxMouseState * self = (wxMouseState *)wxlState.GetUserDataType(1, s_wxluatag_wxMouseState); *************** *** 603,606 **** --- 747,753 ---- } + static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_ShiftDown[1] = {{ wxLua_wxMouseState_ShiftDown, 0, 0, s_wxluaargArray_None }}; + // bool ShiftDown() static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L) *************** *** 618,624 **** --- 765,775 ---- } + static int LUACALL wxLua_wxMouseState_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_constructor[1] = {{ wxLua_wxMouseState_constructor, 0, 0, s_wxluaargArray_None }}; + // wxMouseState() static int LUACALL wxLua_wxMouseState_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxMouseState *returns; *************** *** 633,637 **** } - #endif // wxCHECK_VERSION(2,7,0) --- 784,787 ---- *************** *** 639,668 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMouseState_methods[] = { ! { LuaMethod, "AltDown", wxLua_wxMouseState_AltDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "CmdDown", wxLua_wxMouseState_CmdDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "ControlDown", wxLua_wxMouseState_ControlDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxMouseState_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetX", wxLua_wxMouseState_GetX, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetY", wxLua_wxMouseState_GetY, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "LeftDown", wxLua_wxMouseState_LeftDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "MetaDown", wxLua_wxMouseState_MetaDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "MiddleDown", wxLua_wxMouseState_MiddleDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "RightDown", wxLua_wxMouseState_RightDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "SetAltDown", wxLua_wxMouseState_SetAltDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetAltDown }, ! { LuaMethod, "SetControlDown", wxLua_wxMouseState_SetControlDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetControlDown }, ! { LuaMethod, "SetLeftDown", wxLua_wxMouseState_SetLeftDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetLeftDown }, ! { LuaMethod, "SetMetaDown", wxLua_wxMouseState_SetMetaDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetMetaDown }, ! { LuaMethod, "SetMiddleDown", wxLua_wxMouseState_SetMiddleDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown }, ! { LuaMethod, "SetRightDown", wxLua_wxMouseState_SetRightDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetRightDown }, ! { LuaMethod, "SetShiftDown", wxLua_wxMouseState_SetShiftDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetShiftDown }, ! { LuaMethod, "SetX", wxLua_wxMouseState_SetX, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetX }, ! { LuaMethod, "SetY", wxLua_wxMouseState_SetY, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetY }, ! { LuaMethod, "ShiftDown", wxLua_wxMouseState_ShiftDown, 0, 0, s_wxluaargArray_None }, ! { LuaConstructor, "wxMouseState", wxLua_wxMouseState_constructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxMouseState_methodCount = sizeof(wxMouseState_methods)/sizeof(wxMouseState_methods[0]) - 1; #endif // wxCHECK_VERSION(2,7,0) --- 789,825 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMouseState_methods[] = { ! { WXLUAMETHOD_METHOD, "AltDown", s_wxluafunc_wxLua_wxMouseState_AltDown, 1 }, ! { WXLUAMETHOD_METHOD, "CmdDown", s_wxluafunc_wxLua_wxMouseState_CmdDown, 1 }, ! { WXLUAMETHOD_METHOD, "ControlDown", s_wxluafunc_wxLua_wxMouseState_ControlDown, 1 }, ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxMouseState_Delete }, ! { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxMouseState_GetX, 1 }, ! { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxMouseState_GetY, 1 }, ! { WXLUAMETHOD_METHOD, "LeftDown", s_wxluafunc_wxLua_wxMouseState_LeftDown, 1 }, ! { WXLUAMETHOD_METHOD, "MetaDown", s_wxluafunc_wxLua_wxMouseState_MetaDown, 1 }, ! { WXLUAMETHOD_METHOD, "MiddleDown", s_wxluafunc_wxLua_wxMouseState_MiddleDown, 1 }, ! { WXLUAMETHOD_METHOD, "RightDown", s_wxluafunc_wxLua_wxMouseState_RightDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetAltDown", s_wxluafunc_wxLua_wxMouseState_SetAltDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetControlDown", s_wxluafunc_wxLua_wxMouseState_SetControlDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetLeftDown", s_wxluafunc_wxLua_wxMouseState_SetLeftDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetMetaDown", s_wxluafunc_wxLua_wxMouseState_SetMetaDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetMiddleDown", s_wxluafunc_wxLua_wxMouseState_SetMiddleDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetRightDown", s_wxluafunc_wxLua_wxMouseState_SetRightDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetShiftDown", s_wxluafunc_wxLua_wxMouseState_SetShiftDown, 1 }, ! { WXLUAMETHOD_METHOD, "SetX", s_wxluafunc_wxLua_wxMouseState_SetX, 1 }, ! { WXLUAMETHOD_METHOD, "SetY", s_wxluafunc_wxLua_wxMouseState_SetY, 1 }, ! { WXLUAMETHOD_METHOD, "ShiftDown", s_wxluafunc_wxLua_wxMouseState_ShiftDown, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxMouseState", s_wxluafunc_wxLua_wxMouseState_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxMouseState_methodCount = sizeof(wxMouseState_methods)/sizeof(wxMouseState_methods[0]) - 1; + + + WXLUADEFINE wxMouseState_enums[] = { + { NULL, 0, }, + }; + + int wxMouseState_enumCount = sizeof(wxMouseState_enums)/sizeof(wxMouseState_enums[0]) - 1; #endif // wxCHECK_VERSION(2,7,0) *************** *** 676,680 **** int s_wxluatag_wxBusyCursor = -1; ! #if wxLUA_USE_wxBusyCursor static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L) { --- 833,839 ---- int s_wxluatag_wxBusyCursor = -1; ! static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyCursor_Delete[1] = {{ wxLua_wxBusyCursor_Delete, 0, 0, s_wxluaargArray_None }}; ! static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L) { *************** *** 690,701 **** } - #endif // wxLUA_USE_wxBusyCursor #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_constructor[] = { &s_wxluatag_wxCursor, 0 }; // %override wxLua_wxBusyCursor_constructor // wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) { wxLuaState wxlState(L); wxBusyCursor *returns; --- 849,863 ---- } #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_constructor[] = { &s_wxluatag_wxCursor, 0 }; + static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyCursor_constructor[1] = {{ wxLua_wxBusyCursor_constructor, 0, 1, s_wxluatagArray_wxLua_wxBusyCursor_constructor }}; + // %override wxLua_wxBusyCursor_constructor // wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxBusyCursor *returns; *************** *** 722,735 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyCursor_methods[] = { ! { LuaMethod, "Delete", wxLua_wxBusyCursor_Delete, 0, 0, s_wxluaargArray_None }, #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) ! { LuaConstructor, "wxBusyCursor", wxLua_wxBusyCursor_constructor, 1, 0, s_wxluatagArray_wxLua_wxBusyCursor_constructor }, #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) ! { LuaMethod, 0, 0, 0, 0 }, }; int wxBusyCursor_methodCount = sizeof(wxBusyCursor_methods)/sizeof(wxBusyCursor_methods[0]) - 1; #endif // wxLUA_USE_wxBusyCursor --- 884,904 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyCursor_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBusyCursor_Delete }, #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) ! { WXLUAMETHOD_CONSTRUCTOR, "wxBusyCursor", s_wxluafunc_wxLua_wxBusyCursor_constructor, 1 }, #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxBusyCursor_methodCount = sizeof(wxBusyCursor_methods)/sizeof(wxBusyCursor_methods[0]) - 1; + + + WXLUADEFINE wxBusyCursor_enums[] = { + { NULL, 0, }, + }; + + int wxBusyCursor_enumCount = sizeof(wxBusyCursor_enums)/sizeof(wxBusyCursor_enums[0]) - 1; #endif // wxLUA_USE_wxBusyCursor *************** *** 743,747 **** int s_wxluatag_wxBusyInfo = -1; ! #if wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L) { --- 912,918 ---- int s_wxluatag_wxBusyInfo = -1; ! static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyInfo_Delete[1] = {{ wxLua_wxBusyInfo_Delete, 0, 0, s_wxluaargArray_None }}; ! static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L) { *************** *** 758,764 **** --- 929,939 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyInfo_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxWindow, 0 }; + static int LUACALL wxLua_wxBusyInfo_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyInfo_constructor[1] = {{ wxLua_wxBusyInfo_constructor, 1, 2, s_wxluatagArray_wxLua_wxBusyInfo_constructor }}; + // wxBusyInfo(const wxString& message, wxWindow *parent = NULL) static int LUACALL wxLua_wxBusyInfo_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxBusyInfo *returns; *************** *** 779,783 **** } - #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO --- 954,957 ---- *************** *** 785,795 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyInfo_methods[] = { ! { LuaMethod, "Delete", wxLua_wxBusyInfo_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaConstructor, "wxBusyInfo", wxLua_wxBusyInfo_constructor, 2, 1, s_wxluatagArray_wxLua_wxBusyInfo_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxBusyInfo_methodCount = sizeof(wxBusyInfo_methods)/sizeof(wxBusyInfo_methods[0]) - 1; #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO --- 959,976 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyInfo_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBusyInfo_Delete }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxBusyInfo", s_wxluafunc_wxLua_wxBusyInfo_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxBusyInfo_methodCount = sizeof(wxBusyInfo_methods)/sizeof(wxBusyInfo_methods[0]) - 1; + + + WXLUADEFINE wxBusyInfo_enums[] = { + { NULL, 0, }, + }; + + int wxBusyInfo_enumCount = sizeof(wxBusyInfo_enums)/sizeof(wxBusyInfo_enums[0]) - 1; #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxlua.cpp 19 Mar 2007 03:47:20 -0000 1.33 --- wxlua.cpp 31 May 2007 17:18:53 -0000 1.34 *************** *** 33,36 **** --- 33,39 ---- int s_wxluatag_wxLuaState = -1; + static int LUACALL wxLua_wxLuaState_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaState_Delete[1] = {{ wxLua_wxLuaState_Delete, 0, 0, s_wxluaargArray_None }}; + static int LUACALL wxLua_wxLuaState_Delete(lua_State *L) { *************** *** 50,59 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaState_methods[] = { ! { LuaMethod, "Delete", wxLua_wxLuaState_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaState_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxLuaObject --- 53,69 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaState_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaState_Delete }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaState_methods[0]) - 1; + + WXLUADEFINE wxLuaState_enums[] = { + { NULL, 0, }, + }; + + int wxLuaState_enumCount = sizeof(wxLuaState_enums)/sizeof(wxLuaState_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxLuaObject *************** *** 63,66 **** --- 73,79 ---- int s_wxluatag_wxLuaObject = -1; + static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_Delete[1] = {{ wxLua_wxLuaObject_Delete, 0, 0, s_wxluaargArray_None }}; + static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L) { *************** *** 76,79 **** --- 89,95 ---- } + static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags[1] = {{ wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }}; + // int GetAllocationFlags() const static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L) *************** *** 91,94 **** --- 107,113 ---- } + static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }}; + // %override wxLua_wxLuaObject_GetObject // void *GetObject() const *************** *** 105,108 **** --- 124,130 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluaarg_Enumeration, 0 }; + static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }}; + // bool HasAllocationFlag(wxLuaObject_Type flag) static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L) *************** *** 111,115 **** bool returns; // wxLuaObject_Type flag ! wxLuaObject_Type flag = (wxLuaObject_Type)wxlState.GetEnumerationType(2); // get this wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); --- 133,137 ---- bool returns; // wxLuaObject_Type flag ! wxLuaObject_Type flag = (wxLuaObject_Type)wxlua_getenumerationtype(L, 2); // get this wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); *************** *** 123,126 **** --- 145,151 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag[] = { &s_wxluaarg_Enumeration, &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag[1] = {{ wxLua_wxLuaObject_SetAllocationFlag, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }}; + // int SetAllocationFlag(wxLuaObject_Type flag, bool set) static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L) *************** *** 129,135 **** int returns; // bool set ! bool set = wxlState.GetBooleanType(3); // wxLuaObject_Type flag ! wxLuaObject_Type flag = (wxLuaObject_Type)wxlState.GetEnumerationType(2); // get this wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); --- 154,160 ---- int returns; // bool set ! bool set = wxlua_getbooleantype(L, 3); // wxLuaObject_Type flag ! wxLuaObject_Type flag = (wxLuaObject_Type)wxlua_getenumerationtype(L, 2); // get this wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); *************** *** 143,146 **** --- 168,174 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, 0, 1, s_wxluatagArray_wxLua_wxLuaObject_SetObject }}; + // %override wxLua_wxLuaObject_SetObject // void SetObject(void *object) *************** *** 156,163 **** --- 184,195 ---- } + static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, 0, 0, s_wxluaargArray_None }}; + // %override wxLua_wxLuaObject_constructor // wxLuaObject(void *object) static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaObject *returns; *************** *** 176,190 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaObject_methods[] = { ! { LuaGetProp, "AllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaObject_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetAllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetObject", wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "HasAllocationFlag", wxLua_wxLuaObject_HasAllocationFlag, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }, ! { LuaGetProp, "Object", wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Object", wxLua_wxLuaObject_SetObject, 1, 1, s_wxluaargArray_None }, ! { LuaMethod, "SetAllocationFlag", wxLua_wxLuaObject_SetAllocationFlag, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }, ! { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 1, 0, s_wxluatagArray_wxLua_wxLuaObject_SetObject }, ! { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, 0, 0, 0, 0 }, }; --- 208,219 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaObject_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaObject_Delete }, ! { WXLUAMETHOD_METHOD, "GetAllocationFlags", s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags, 1 }, ! { WXLUAMETHOD_METHOD, "GetObject", s_wxluafunc_wxLua_wxLuaObject_GetObject, 1 }, ! { WXLUAMETHOD_METHOD, "HasAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag, 1 }, ! { WXLUAMETHOD_METHOD, "SetAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag, 1 }, ! { WXLUAMETHOD_METHOD, "SetObject", s_wxluafunc_wxLua_wxLuaObject_SetObject, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaObject", s_wxluafunc_wxLua_wxLuaObject_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; *************** *** 192,195 **** --- 221,231 ---- + WXLUADEFINE wxLuaObject_enums[] = { + { NULL, 0, }, + }; + + int wxLuaObject_enumCount = sizeof(wxLuaObject_enums)/sizeof(wxLuaObject_enums[0]) - 1; + + #if wxLUA_USE_wxLuaPrintout // --------------------------------------------------------------------------- *************** *** 200,204 **** int s_wxluatag_wxLuaPrintout = -1; ! #if wxLUA_USE_wxLuaPrintout static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L) { --- 236,242 ---- int s_wxluatag_wxLuaPrintout = -1; ! static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_Delete[1] = {{ wxLua_wxLuaPrintout_Delete, 0, 0, s_wxluaargArray_None }}; ! static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L) { *************** *** 214,217 **** --- 252,258 ---- } + static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_GetID[1] = {{ wxLua_wxLuaPrintout_GetID, 0, 0, s_wxluaargArray_None }}; + // wxLuaObject *GetID() static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L) *************** *** 230,233 **** --- 271,277 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo[1] = {{ wxLua_wxLuaPrintout_SetPageInfo, 2, 4, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }}; + // void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0) static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L) *************** *** 237,247 **** int argCount = lua_gettop(L); // int pageTo = 0 ! int pageTo = (argCount >= 5 ? (int)wxlState.GetNumberType(5) : 0); // int pageFrom = 0 ! int pageFrom = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : 0); // int maxPage ! int maxPage = (int)wxlState.GetNumberType(3); // int minPage ! int minPage = (int)wxlState.GetNumberType(2); // get this wxLuaPrintout * self = (wxLuaPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaPrintout); --- 281,291 ---- int argCount = lua_gettop(L); // int pageTo = 0 ! int pageTo = (argCount >= 5 ? (int)wxlua_getnumbertype(L, 5) : 0); // int pageFrom = 0 ! int pageFrom = (argCount >= 4 ? (int)wxlua_getnumbertype(L, 4) : 0); // int maxPage ! int maxPage = (int)wxlua_getnumbertype(L, 3); // int minPage ! int minPage = (int)wxlua_getnumbertype(L, 2); // get this wxLuaPrintout * self = (wxLuaPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaPrintout); *************** *** 253,260 **** --- 297,308 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxLuaObject, 0 }; + static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_constructor[1] = {{ wxLua_wxLuaPrintout_constructor, 0, 2, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }}; + // %override wxLua_wxLuaPrintout_constructor // wxLuaPrintout(const wxString& title = "Printout", wxLuaObject *pObject = NULL) static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaPrintout *returns; *************** *** 275,279 **** } - #endif // wxLUA_USE_wxLuaPrintout --- 323,326 ---- *************** *** 281,293 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaPrintout_methods[] = { ! { LuaMethod, "Delete", wxLua_wxLuaPrintout_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetID", wxLua_wxLuaPrintout_GetID, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "SetPageInfo", wxLua_wxLuaPrintout_SetPageInfo, 4, 2, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }, ! { LuaConstructor, "wxLuaPrintout", wxLua_wxLuaPrintout_constructor, 2, 0, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxLuaPrintout_methodCount = sizeof(wxLuaPrintout_methods)/sizeof(wxLuaPrintout_methods[0]) - 1; #endif // wxLUA_USE_wxLuaPrintout --- 328,347 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaPrintout_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaPrintout_Delete }, ! { WXLUAMETHOD_METHOD, "GetID", s_wxluafunc_wxLua_wxLuaPrintout_GetID, 1 }, ! { WXLUAMETHOD_METHOD, "SetPageInfo", s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaPrintout", s_wxluafunc_wxLua_wxLuaPrintout_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxLuaPrintout_methodCount = sizeof(wxLuaPrintout_methods)/sizeof(wxLuaPrintout_methods[0]) - 1; + + + WXLUADEFINE wxLuaPrintout_enums[] = { + { NULL, 0, }, + }; + + int wxLuaPrintout_enumCount = sizeof(wxLuaPrintout_enums)/sizeof(wxLuaPrintout_enums[0]) - 1; #endif // wxLUA_USE_wxLuaPrintout *************** *** 303,310 **** --- 357,368 ---- #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; + static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor[1] = {{ wxLua_wxLuaHtmlWindow_constructor, 1, 6, s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor }}; + // %override wxLua_wxLuaHtmlWindow_constructor // wxLuaHtmlWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = "wxLuaHtmlWindow") static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaHtmlWindow *returns; *************** *** 341,351 **** WXLUAMETHOD wxLuaHtmlWindow_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_constructor, 6, 1, s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor }, #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { LuaMethod, 0, 0, 0, 0 }, }; int wxLuaHtmlWindow_methodCount = sizeof(wxLuaHtmlWindow_methods)/sizeof(wxLuaHtmlWindow_methods[0]) - 1; #endif // wxLUA_USE_wxLuaHtmlWindow --- 399,416 ---- WXLUAMETHOD wxLuaHtmlWindow_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaHtmlWindow", s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor, 1 }, #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxLuaHtmlWindow_methodCount = sizeof(wxLuaHtmlWindow_methods)/sizeof(wxLuaHtmlWindow_methods[0]) - 1; + + + WXLUADEFINE wxLuaHtmlWindow_enums[] = { + { NULL, 0, }, + }; + + int wxLuaHtmlWindow_enumCount = sizeof(wxLuaHtmlWindow_enums)/sizeof(wxLuaHtmlWindow_enums[0]) - 1; #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 359,363 **** int s_wxluatag_wxLuaHtmlWinTagEvent = -1; ! #if wxLUA_USE_wxLuaHtmlWindow static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L) { --- 424,430 ---- int s_wxluatag_wxLuaHtmlWinTagEvent = -1; ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_Delete[1] = {{ wxLua_wxLuaHtmlWinTagEvent_Delete, 0, 0, s_wxluaargArray_None }}; ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L) { *************** *** 373,379 **** } - #endif // wxLUA_USE_wxLuaHtmlWindow #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) // wxHtmlWinParser *GetHtmlParser() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L) --- 440,448 ---- } #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) + static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }}; + // wxHtmlWinParser *GetHtmlParser() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L) *************** *** 391,394 **** --- 460,466 ---- } + static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }}; + // const wxHtmlTag *GetHtmlTag() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L) *************** *** 408,412 **** #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! #if wxLUA_USE_wxLuaHtmlWindow // bool GetParseInnerCalled() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled(lua_State *L) --- 480,486 ---- #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled[1] = {{ wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 0, 0, s_wxluaargArray_None }}; ! // bool GetParseInnerCalled() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled(lua_State *L) *************** *** 424,434 **** } - #endif // wxLUA_USE_wxLuaHtmlWindow - - #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) - #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) - - #if wxLUA_USE_wxLuaHtmlWindow static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluaarg_Boolean, 0 }; // void SetParseInnerCalled(bool fParseInnerCalled = true) static int LUACALL wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled(lua_State *L) --- 498,505 ---- } static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[1] = {{ wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 0, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }}; + // void SetParseInnerCalled(bool fParseInnerCalled = true) static int LUACALL wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled(lua_State *L) *************** *** 438,442 **** int argCount = lua_gettop(L); // bool fParseInnerCalled = true ! bool fParseInnerCalled = (argCount >= 2 ? wxlState.GetBooleanType(2) : true); // get this wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1... [truncated message content] |
