Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30959/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: Fix a number of bugs with the new bindings fix override wxConfig::Get fix looking up overloaded static and non static class member functions fix looking up class member functions overloaded from a base class Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** xml.cpp 31 May 2007 21:38:47 -0000 1.30 --- xml.cpp 5 Jun 2007 21:07:24 -0000 1.31 *************** *** 35,41 **** int s_wxluatag_wxXmlNode = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_AddChild[] = { &s_wxluatag_wxXmlNode, 0 }; static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddChild[1] = {{ wxLua_wxXmlNode_AddChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddChild }}; // void AddChild(wxXmlNode *child) --- 35,41 ---- int s_wxluatag_wxXmlNode = -1; [...1765 lines suppressed...] #if ((wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML)) ! { WXLUAMETHOD_METHOD, "LoadMenuBar", s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload, s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload_count, 0 }, #endif // ((wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML)) #if (wxLUA_USE_wxXMLResource && wxUSE_XML) ! { WXLUAMETHOD_METHOD, "LoadPanel", s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload, s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload_count, 0 }, #endif // (wxLUA_USE_wxXMLResource && wxUSE_XML) #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! { WXLUAMETHOD_METHOD, "LoadToolBar", s_wxluafunc_wxLua_wxXmlResource_LoadToolBar, 1, 0 }, #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML) ! { WXLUAMETHOD_METHOD, "Set", s_wxluafunc_wxLua_wxXmlResource_Set, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetFlags", s_wxluafunc_wxLua_wxXmlResource_SetFlags, 1, 0 }, ! { WXLUAMETHOD_METHOD, "Unload", s_wxluafunc_wxLua_wxXmlResource_Unload, 1, 0 }, #if (wxLUA_USE_wxXMLResource && wxUSE_XML) ! { WXLUAMETHOD_CONSTRUCTOR, "wxXmlResource", s_wxluafunc_wxLua_wxXmlResource_constructor_overload, s_wxluafunc_wxLua_wxXmlResource_constructor_overload_count, 0 }, #endif // (wxLUA_USE_wxXMLResource && wxUSE_XML) Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** defsutil.cpp 31 May 2007 17:18:50 -0000 1.32 --- defsutil.cpp 5 Jun 2007 21:07:21 -0000 1.33 *************** *** 36,41 **** #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() --- 36,42 ---- #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_CloseOutput[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_CloseOutput[1] = {{ wxLua_wxProcess_CloseOutput, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_CloseOutput }}; // void CloseOutput() *************** *** 53,58 **** #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) --- 54,60 ---- #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Delete[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Delete[1] = {{ wxLua_wxProcess_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_Delete }}; static int LUACALL wxLua_wxProcess_Delete(lua_State *L) *************** *** 69,74 **** } 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() --- 71,77 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Detach[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_Detach(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Detach[1] = {{ wxLua_wxProcess_Detach, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_Detach }}; // void Detach() *************** *** 86,90 **** 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) --- 89,93 ---- 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, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatagArray_wxLua_wxProcess_Exists }}; // static bool Exists(int pid) *************** *** 104,109 **** #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 --- 107,113 ---- #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetErrorStream[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetErrorStream[1] = {{ wxLua_wxProcess_GetErrorStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetErrorStream }}; // wxInputStream *GetErrorStream() const *************** *** 122,127 **** } 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 --- 126,132 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetInputStream[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetInputStream[1] = {{ wxLua_wxProcess_GetInputStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetInputStream }}; // wxInputStream *GetInputStream() const *************** *** 140,145 **** } 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 --- 145,151 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetOutputStream[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetOutputStream[1] = {{ wxLua_wxProcess_GetOutputStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetOutputStream }}; // wxOutputStream *GetOutputStream() const *************** *** 161,166 **** #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 --- 167,173 ---- #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsErrorAvailable[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsErrorAvailable[1] = {{ wxLua_wxProcess_IsErrorAvailable, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsErrorAvailable }}; // bool IsErrorAvailable() const *************** *** 179,184 **** } 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 --- 186,192 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsInputAvailable[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsInputAvailable[1] = {{ wxLua_wxProcess_IsInputAvailable, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsInputAvailable }}; // bool IsInputAvailable() const *************** *** 197,202 **** } 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 --- 205,211 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsInputOpened[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsInputOpened[1] = {{ wxLua_wxProcess_IsInputOpened, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsInputOpened }}; // bool IsInputOpened() const *************** *** 217,222 **** #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() --- 226,232 ---- #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsRedirected[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsRedirected[1] = {{ wxLua_wxProcess_IsRedirected, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsRedirected }}; // bool IsRedirected() *************** *** 237,241 **** 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) --- 247,251 ---- 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, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 3, s_wxluatagArray_wxLua_wxProcess_Kill }}; // static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN) *************** *** 261,265 **** 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) --- 271,275 ---- 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, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxProcess_Open }}; // static wxProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC) *************** *** 282,287 **** } 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() --- 292,298 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Redirect[] = { &s_wxluatag_wxProcess, 0 }; static int LUACALL wxLua_wxProcess_Redirect(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Redirect[1] = {{ wxLua_wxProcess_Redirect, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_Redirect }}; // void Redirect() *************** *** 299,305 **** #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) --- 310,316 ---- #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_SetPipeStreams[] = { &s_wxluatag_wxProcess, &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, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxProcess_SetPipeStreams }}; // void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream) *************** *** 325,329 **** 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) --- 336,340 ---- 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, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxProcess_constructor }}; // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) *************** *** 355,387 **** 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 }, --- 366,398 ---- WXLUAMETHOD wxProcess_methods[] = { #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "CloseOutput", s_wxluafunc_wxLua_wxProcess_CloseOutput, 1, 0 }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxProcess_Delete, 1, 0 }, ! { WXLUAMETHOD_METHOD, "Detach", s_wxluafunc_wxLua_wxProcess_Detach, 1, 0 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Exists", s_wxluafunc_wxLua_wxProcess_Exists, 1, 0 }, #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { WXLUAMETHOD_METHOD, "GetErrorStream", s_wxluafunc_wxLua_wxProcess_GetErrorStream, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetInputStream", s_wxluafunc_wxLua_wxProcess_GetInputStream, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetOutputStream", s_wxluafunc_wxLua_wxProcess_GetOutputStream, 1, 0 }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "IsErrorAvailable", s_wxluafunc_wxLua_wxProcess_IsErrorAvailable, 1, 0 }, ! { WXLUAMETHOD_METHOD, "IsInputAvailable", s_wxluafunc_wxLua_wxProcess_IsInputAvailable, 1, 0 }, ! { WXLUAMETHOD_METHOD, "IsInputOpened", s_wxluafunc_wxLua_wxProcess_IsInputOpened, 1, 0 }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { WXLUAMETHOD_METHOD, "IsRedirected", s_wxluafunc_wxLua_wxProcess_IsRedirected, 1, 0 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Kill", s_wxluafunc_wxLua_wxProcess_Kill, 1, 0 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Open", s_wxluafunc_wxLua_wxProcess_Open, 1, 0 }, ! { WXLUAMETHOD_METHOD, "Redirect", s_wxluafunc_wxLua_wxProcess_Redirect, 1, 0 }, #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { WXLUAMETHOD_METHOD, "SetPipeStreams", s_wxluafunc_wxLua_wxProcess_SetPipeStreams, 1, 0 }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { WXLUAMETHOD_CONSTRUCTOR, "wxProcess", s_wxluafunc_wxLua_wxProcess_constructor, 1, 0 }, { WXLUAMETHOD_METHOD, 0, 0, 0 }, *************** *** 407,412 **** 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() --- 418,424 ---- int s_wxluatag_wxMouseState = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_AltDown[] = { &s_wxluatag_wxMouseState, 0 }; static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_AltDown[1] = {{ wxLua_wxMouseState_AltDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_AltDown }}; // bool AltDown() *************** *** 425,430 **** } 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() --- 437,443 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_CmdDown[] = { &s_wxluatag_wxMouseState, 0 }; static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_CmdDown[1] = {{ wxLua_wxMouseState_CmdDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_CmdDown }}; // bool CmdDown() *************** *** 443,448 **** } 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() --- 456,462 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_ControlDown[] = { &s_wxluatag_wxMouseState, 0 }; static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_ControlDown[1] = {{ wxLua_wxMouseState_ControlDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_ControlDown }}; // bool ControlDown() *************** *** 461,466 **** } 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) --- 475,481 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_Delete[] = { &s_wxluatag_wxMouseState, 0 }; static int LUACALL wxLua_wxMouseState_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_Delete[1] = {{ wxLua_wxMouseState_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_Delete }}; static int LUACALL wxLua_wxMouseState_Delete(lua_State *L) *************** *** 477,482 **** } 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() --- 492,498 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_GetX[] = { &s_wxluatag_wxMouseState, 0 }; static int LUACALL wxLua_wxMouseState_GetX(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_GetX[1] = {{ wxLua_wxMouseState_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_GetX }}; // wxCoord GetX() *************** *** 495,500 **** } 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() --- 511,517 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_GetY[] = { &s_wxluatag_wxMouseState, 0 }; static int LUACALL wxLua_wxMouseState_GetY(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_GetY[1] = {{ wxLua_wxMouseState_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_GetY }}; // wxCoord GetY() *************** *** 513,518 **** } 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() --- 530,536 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_LeftDown[] = { &s_wxluatag_wxMouseState, 0 }; static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_LeftDown[1] = {{ wxLua_wxMouseState_LeftDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_LeftDown }}; // bool LeftDown() *************** *** 531,536 **** } 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() --- 549,555 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_MetaDown[] = { &s_wxluatag_wxMouseState, 0 }; static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_MetaDown[1] = {{ wxLua_wxMouseState_MetaDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_MetaDown }}; // bool MetaDown() *************** *** 549,554 **** } 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() --- 568,574 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_MiddleDown[] = { &s_wxluatag_wxMouseState, 0 }; static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_MiddleDown[1] = {{ wxLua_wxMouseState_MiddleDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_MiddleDown }}; // bool MiddleDown() *************** *** 567,572 **** } 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() --- 587,593 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_RightDown[] = { &s_wxluatag_wxMouseState, 0 }; static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_RightDown[1] = {{ wxLua_wxMouseState_RightDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_RightDown }}; // bool RightDown() *************** *** 585,591 **** } ! 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) --- 606,612 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetAltDown[] = { &s_wxluatag_wxMouseState, &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, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetAltDown }}; // void SetAltDown(bool down) *************** *** 603,609 **** } ! 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) --- 624,630 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetControlDown[] = { &s_wxluatag_wxMouseState, &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, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetControlDown }}; // void SetControlDown(bool down) *************** *** 621,627 **** } ! 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) --- 642,648 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetLeftDown[] = { &s_wxluatag_wxMouseState, &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, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetLeftDown }}; // void SetLeftDown(bool down) *************** *** 639,645 **** } ! 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) --- 660,666 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMetaDown[] = { &s_wxluatag_wxMouseState, &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, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetMetaDown }}; // void SetMetaDown(bool down) *************** *** 657,663 **** } ! 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) --- 678,684 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown[] = { &s_wxluatag_wxMouseState, &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, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown }}; // void SetMiddleDown(bool down) *************** *** 675,681 **** } ! 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) --- 696,702 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetRightDown[] = { &s_wxluatag_wxMouseState, &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, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetRightDown }}; // void SetRightDown(bool down) *************** *** 693,699 **** } ! 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) --- 714,720 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetShiftDown[] = { &s_wxluatag_wxMouseState, &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, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetShiftDown }}; // void SetShiftDown(bool down) *************** *** 711,717 **** } ! 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) --- 732,738 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetX[] = { &s_wxluatag_wxMouseState, &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, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetX }}; // void SetX(wxCoord x) *************** *** 729,735 **** } ! 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) --- 750,756 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetY[] = { &s_wxluatag_wxMouseState, &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, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetY }}; // void SetY(wxCoord y) *************** *** 747,752 **** } 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() --- 768,774 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_ShiftDown[] = { &s_wxluatag_wxMouseState, 0 }; static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_ShiftDown[1] = {{ wxLua_wxMouseState_ShiftDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_ShiftDown }}; // bool ShiftDown() *************** *** 766,770 **** 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() --- 788,792 ---- static int LUACALL wxLua_wxMouseState_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_constructor[1] = {{ wxLua_wxMouseState_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; // wxMouseState() *************** *** 789,813 **** // 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 }, --- 811,835 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMouseState_methods[] = { ! { WXLUAMETHOD_METHOD, "AltDown", s_wxluafunc_wxLua_wxMouseState_AltDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "CmdDown", s_wxluafunc_wxLua_wxMouseState_CmdDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "ControlDown", s_wxluafunc_wxLua_wxMouseState_ControlDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxMouseState_Delete, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxMouseState_GetX, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxMouseState_GetY, 1, 0 }, ! { WXLUAMETHOD_METHOD, "LeftDown", s_wxluafunc_wxLua_wxMouseState_LeftDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "MetaDown", s_wxluafunc_wxLua_wxMouseState_MetaDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "MiddleDown", s_wxluafunc_wxLua_wxMouseState_MiddleDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "RightDown", s_wxluafunc_wxLua_wxMouseState_RightDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetAltDown", s_wxluafunc_wxLua_wxMouseState_SetAltDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetControlDown", s_wxluafunc_wxLua_wxMouseState_SetControlDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetLeftDown", s_wxluafunc_wxLua_wxMouseState_SetLeftDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetMetaDown", s_wxluafunc_wxLua_wxMouseState_SetMetaDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetMiddleDown", s_wxluafunc_wxLua_wxMouseState_SetMiddleDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetRightDown", s_wxluafunc_wxLua_wxMouseState_SetRightDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetShiftDown", s_wxluafunc_wxLua_wxMouseState_SetShiftDown, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetX", s_wxluafunc_wxLua_wxMouseState_SetX, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetY", s_wxluafunc_wxLua_wxMouseState_SetY, 1, 0 }, ! { WXLUAMETHOD_METHOD, "ShiftDown", s_wxluafunc_wxLua_wxMouseState_ShiftDown, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxMouseState", s_wxluafunc_wxLua_wxMouseState_constructor, 1, 0 }, { WXLUAMETHOD_METHOD, 0, 0, 0 }, *************** *** 833,838 **** 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) --- 855,861 ---- int s_wxluatag_wxBusyCursor = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_Delete[] = { &s_wxluatag_wxBusyCursor, 0 }; static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyCursor_Delete[1] = {{ wxLua_wxBusyCursor_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxBusyCursor_Delete }}; static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L) *************** *** 853,857 **** 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 --- 876,880 ---- 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, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxBusyCursor_constructor }}; // %override wxLua_wxBusyCursor_constructor *************** *** 884,891 **** // 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) --- 907,914 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyCursor_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBusyCursor_Delete, 1, 0 }, #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) ! { WXLUAMETHOD_CONSTRUCTOR, "wxBusyCursor", s_wxluafunc_wxLua_wxBusyCursor_constructor, 1, 0 }, #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) *************** *** 912,917 **** 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) --- 935,941 ---- int s_wxluatag_wxBusyInfo = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyInfo_Delete[] = { &s_wxluatag_wxBusyInfo, 0 }; static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyInfo_Delete[1] = {{ wxLua_wxBusyInfo_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxBusyInfo_Delete }}; static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L) *************** *** 930,934 **** 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) --- 954,958 ---- 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, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxBusyInfo_constructor }}; // wxBusyInfo(const wxString& message, wxWindow *parent = NULL) *************** *** 959,964 **** // 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 }, --- 983,988 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyInfo_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBusyInfo_Delete, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxBusyInfo", s_wxluafunc_wxLua_wxBusyInfo_constructor, 1, 0 }, { WXLUAMETHOD_METHOD, 0, 0, 0 }, Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxlua.cpp 31 May 2007 17:18:53 -0000 1.34 --- wxlua.cpp 5 Jun 2007 21:07:24 -0000 1.35 *************** *** 33,38 **** 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) --- 33,39 ---- int s_wxluatag_wxLuaState = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaState_Delete[] = { &s_wxluatag_wxLuaState, 0 }; static int LUACALL wxLua_wxLuaState_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaState_Delete[1] = {{ wxLua_wxLuaState_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaState_Delete }}; static int LUACALL wxLua_wxLuaState_Delete(lua_State *L) *************** *** 53,57 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaState_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaState_Delete }, { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; --- 54,58 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaState_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaState_Delete, 1, 0 }, { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; *************** *** 73,78 **** 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) --- 74,80 ---- int s_wxluatag_wxLuaObject = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_Delete[] = { &s_wxluatag_wxLuaObject, 0 }; static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_Delete[1] = {{ wxLua_wxLuaObject_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_Delete }}; static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L) *************** *** 89,94 **** } 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 --- 91,97 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags[] = { &s_wxluatag_wxLuaObject, 0 }; static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags[1] = {{ wxLua_wxLuaObject_GetAllocationFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags }}; // int GetAllocationFlags() const *************** *** 107,112 **** } 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 --- 110,116 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetObject[] = { &s_wxluatag_wxLuaObject, 0 }; static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetObject }}; // %override wxLua_wxLuaObject_GetObject *************** *** 123,129 **** } ! 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) --- 127,133 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluatag_wxLuaObject, &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, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }}; // bool HasAllocationFlag(wxLuaObject_Type flag) *************** *** 144,150 **** } ! 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) --- 148,154 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag[] = { &s_wxluatag_wxLuaObject, &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, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }}; // int SetAllocationFlag(wxLuaObject_Type flag, bool set) *************** *** 167,173 **** } ! 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 --- 171,177 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxLuaObject_SetObject }}; // %override wxLua_wxLuaObject_SetObject *************** *** 185,189 **** 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 --- 189,193 ---- static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxLuaObject_constructor *************** *** 208,218 **** // 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 }, }; --- 212,222 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaObject_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaObject_Delete, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetAllocationFlags", s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetObject", s_wxluafunc_wxLua_wxLuaObject_GetObject, 1, 0 }, ! { WXLUAMETHOD_METHOD, "HasAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetObject", s_wxluafunc_wxLua_wxLuaObject_SetObject, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaObject", s_wxluafunc_wxLua_wxLuaObject_constructor, 1, 0 }, { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; *************** *** 236,241 **** 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) --- 240,246 ---- int s_wxluatag_wxLuaPrintout = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_Delete[] = { &s_wxluatag_wxLuaPrintout, 0 }; static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_Delete[1] = {{ wxLua_wxLuaPrintout_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaPrintout_Delete }}; static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L) *************** *** 252,257 **** } 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() --- 257,263 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_GetID[] = { &s_wxluatag_wxLuaPrintout, 0 }; static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_GetID[1] = {{ wxLua_wxLuaPrintout_GetID, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaPrintout_GetID }}; // wxLuaObject *GetID() *************** *** 270,276 **** } ! 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) --- 276,282 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo[] = { &s_wxluatag_wxLuaPrintout, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo[1] = {{ wxLua_wxLuaPrintout_SetPageInfo, WXLUAMETHOD_METHOD, 3, 5, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }}; // void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0) *************** *** 298,302 **** 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 --- 304,308 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxLuaObject, 0 }; static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_constructor[1] = {{ wxLua_wxLuaPrintout_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }}; // %override wxLua_wxLuaPrintout_constructor *************** *** 328,335 **** // 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 }, --- 334,341 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaPrintout_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaPrintout_Delete, 1, 0 }, ! { WXLUAMETHOD_METHOD, "GetID", s_wxluafunc_wxLua_wxLuaPrintout_GetID, 1, 0 }, ! { WXLUAMETHOD_METHOD, "SetPageInfo", s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo, 1, 0 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaPrintout", s_wxluafunc_wxLua_wxLuaPrintout_constructor, 1, 0 }, { WXLUAMETHOD_METHOD, 0, 0, 0 }, *************** *** 358,362 **** 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 --- 364,368 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor[1] = {{ wxLua_wxLuaHtmlWindow_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 6, s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor }}; // %override wxLua_wxLuaHtmlWindow_constructor *************** *** 399,403 **** 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) --- 405,409 ---- WXLUAMETHOD wxLuaHtmlWindow_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaHtmlWindow", s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor, 1, 0 }, #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) *************** *** 424,429 **** 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) --- 430,436 ---- int s_wxluatag_wxLuaHtmlWinTagEvent = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_Delete[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, 0 }; static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_Delete[1] = {{ wxLua_wxLuaHtmlWinTagEvent_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_Delete }}; ... [truncated message content] |