Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/modules/wxbind/src Modified Files: wxadv_adv.cpp wxadv_bind.cpp wxadv_grid.cpp wxaui_aui.cpp wxaui_bind.cpp wxbase_base.cpp wxbase_bind.cpp wxbase_config.cpp wxbase_data.cpp wxbase_datetime.cpp wxbase_file.cpp wxcore_appframe.cpp wxcore_bind.cpp wxcore_clipdrag.cpp wxcore_controls.cpp wxcore_core.cpp wxcore_defsutils.cpp wxcore_dialogs.cpp wxcore_event.cpp wxcore_gdi.cpp wxcore_geometry.cpp wxcore_help.cpp wxcore_image.cpp wxcore_mdi.cpp wxcore_menutool.cpp wxcore_picker.cpp wxcore_print.cpp wxcore_sizer.cpp wxcore_windows.cpp wxcore_wxlprint.cpp wxgl_bind.cpp wxgl_gl.cpp wxhtml_bind.cpp wxhtml_html.cpp wxhtml_wxlhtmlwin.cpp wxmedia_bind.cpp wxmedia_media.cpp wxnet_bind.cpp wxnet_net.cpp wxrichtext_bind.cpp wxstc_bind.cpp wxstc_stc.cpp wxxml_bind.cpp wxxml_xml.cpp wxxrc_bind.cpp wxxrc_xrc.cpp Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxxrc_xrc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_xrc.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxxrc_xrc.cpp 20 Dec 2007 02:26:57 -0000 1.9 --- wxxrc_xrc.cpp 22 Dec 2007 06:07:15 -0000 1.10 *************** *** 27,35 **** // Lua MetaTable Tag for Class 'wxXmlResource' ! int s_wxluatag_wxXmlResource = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_AttachUnknownControl[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, &s_wxluatag_wxWindow, &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_AttachUnknownControl[1] = {{ wxLua_wxXmlResource_AttachUnknownControl, WXLUAMETHOD_METHOD, 3, 4, s_wxluatagArray_wxLua_wxXmlResource_AttachUnknownControl }}; // bool AttachUnknownControl(const wxString& name, wxWindow* control, wxWindow* parent = NULL); static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L) --- 27,35 ---- // Lua MetaTable Tag for Class 'wxXmlResource' ! int g_wxluatype_wxXmlResource = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_AttachUnknownControl[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, &g_wxluatype_wxWindow, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_AttachUnknownControl[1] = {{ wxLua_wxXmlResource_AttachUnknownControl, WXLUAMETHOD_METHOD, 3, 4, s_wxluatypeArray_wxLua_wxXmlResource_AttachUnknownControl }}; // bool AttachUnknownControl(const wxString& name, wxWindow* control, wxWindow* parent = NULL); static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L) *************** *** 38,48 **** int argCount = lua_gettop(L); // wxWindow parent = NULL ! wxWindow * parent = (argCount >= 4 ? (wxWindow *)wxluaT_getuserdatatype(L, 4, s_wxluatag_wxWindow) : NULL); // wxWindow control ! wxWindow * control = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); // const wxString name const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call AttachUnknownControl bool returns = (self->AttachUnknownControl(name, control, parent)); --- 38,48 ---- int argCount = lua_gettop(L); // wxWindow parent = NULL ! wxWindow * parent = (argCount >= 4 ? (wxWindow *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxWindow) : NULL); // wxWindow control ! wxWindow * control = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // const wxString name const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call AttachUnknownControl bool returns = (self->AttachUnknownControl(name, control, parent)); *************** *** 53,64 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_ClearHandlers[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_ClearHandlers[1] = {{ wxLua_wxXmlResource_ClearHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_ClearHandlers }}; // void ClearHandlers(); static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call ClearHandlers self->ClearHandlers(); --- 53,64 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_ClearHandlers[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_ClearHandlers[1] = {{ wxLua_wxXmlResource_ClearHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_ClearHandlers }}; // void ClearHandlers(); static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call ClearHandlers self->ClearHandlers(); *************** *** 67,73 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_CompareVersion[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_CompareVersion[1] = {{ wxLua_wxXmlResource_CompareVersion, WXLUAMETHOD_METHOD, 5, 5, s_wxluatagArray_wxLua_wxXmlResource_CompareVersion }}; // int CompareVersion(int major, int minor, int release, int revision) const; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L) --- 67,73 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_CompareVersion[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_CompareVersion[1] = {{ wxLua_wxXmlResource_CompareVersion, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxXmlResource_CompareVersion }}; // int CompareVersion(int major, int minor, int release, int revision) const; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L) *************** *** 82,86 **** int major = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call CompareVersion int returns = (self->CompareVersion(major, minor, release, revision)); --- 82,86 ---- int major = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call CompareVersion int returns = (self->CompareVersion(major, minor, release, revision)); *************** *** 92,96 **** static int LUACALL wxLua_wxXmlResource_Get(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Get[1] = {{ wxLua_wxXmlResource_Get, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; // static wxXmlResource* Get(); static int LUACALL wxLua_wxXmlResource_Get(lua_State *L) --- 92,96 ---- static int LUACALL wxLua_wxXmlResource_Get(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Get[1] = {{ wxLua_wxXmlResource_Get, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, g_wxluaargtypeArray_None }}; // static wxXmlResource* Get(); static int LUACALL wxLua_wxXmlResource_Get(lua_State *L) *************** *** 99,115 **** wxXmlResource* returns = (wxXmlResource*)wxXmlResource::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlResource, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetFlags[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetFlags[1] = {{ wxLua_wxXmlResource_GetFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_GetFlags }}; // int GetFlags() static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call GetFlags int returns = (self->GetFlags()); --- 99,115 ---- wxXmlResource* returns = (wxXmlResource*)wxXmlResource::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetFlags[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetFlags[1] = {{ wxLua_wxXmlResource_GetFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_GetFlags }}; // int GetFlags() static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call GetFlags int returns = (self->GetFlags()); *************** *** 120,131 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetVersion[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetVersion[1] = {{ wxLua_wxXmlResource_GetVersion, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_GetVersion }}; // long GetVersion() const; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call GetVersion long returns = (self->GetVersion()); --- 120,131 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetVersion[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetVersion[1] = {{ wxLua_wxXmlResource_GetVersion, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_GetVersion }}; // long GetVersion() const; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call GetVersion long returns = (self->GetVersion()); *************** *** 136,142 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetXRCID[] = { &s_wxluaarg_String, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetXRCID[1] = {{ wxLua_wxXmlResource_GetXRCID, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxXmlResource_GetXRCID }}; // static int GetXRCID(const wxString &stringID, int value_if_not_found = wxID_NONE); static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L) --- 136,142 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetXRCID[] = { &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetXRCID[1] = {{ wxLua_wxXmlResource_GetXRCID, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatypeArray_wxLua_wxXmlResource_GetXRCID }}; // static int GetXRCID(const wxString &stringID, int value_if_not_found = wxID_NONE); static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L) *************** *** 156,167 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_InitAllHandlers[1] = {{ wxLua_wxXmlResource_InitAllHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers }}; // void InitAllHandlers(); static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call InitAllHandlers self->InitAllHandlers(); --- 156,167 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_InitAllHandlers[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_InitAllHandlers[1] = {{ wxLua_wxXmlResource_InitAllHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_InitAllHandlers }}; // void InitAllHandlers(); static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call InitAllHandlers self->InitAllHandlers(); *************** *** 170,176 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_Load[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_Load(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Load[1] = {{ wxLua_wxXmlResource_Load, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_Load }}; // bool Load(const wxString& filemask); static int LUACALL wxLua_wxXmlResource_Load(lua_State *L) --- 170,176 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Load[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_Load(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Load[1] = {{ wxLua_wxXmlResource_Load, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_Load }}; // bool Load(const wxString& filemask); static int LUACALL wxLua_wxXmlResource_Load(lua_State *L) *************** *** 179,183 **** const wxString filemask = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call Load bool returns = (self->Load(filemask)); --- 179,183 ---- const wxString filemask = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call Load bool returns = (self->Load(filemask)); *************** *** 190,196 **** #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadBitmap[1] = {{ wxLua_wxXmlResource_LoadBitmap, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap }}; // wxBitmap LoadBitmap(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L) --- 190,196 ---- #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadBitmap[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadBitmap[1] = {{ wxLua_wxXmlResource_LoadBitmap, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadBitmap }}; // wxBitmap LoadBitmap(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L) *************** *** 199,203 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadBitmap // allocate a new object using the copy constructor --- 199,203 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadBitmap // allocate a new object using the copy constructor *************** *** 206,210 **** wxluaO_addgcobject(L, (wxBitmap*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxBitmap, returns); return 1; --- 206,210 ---- wxluaO_addgcobject(L, (wxBitmap*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxBitmap); return 1; *************** *** 214,220 **** #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadDialog1[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxDialog, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog1[1] = {{ wxLua_wxXmlResource_LoadDialog1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog1 }}; // bool LoadDialog(wxDialog* dlg, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L) --- 214,220 ---- #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog1[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxDialog, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog1[1] = {{ wxLua_wxXmlResource_LoadDialog1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog1 }}; // bool LoadDialog(wxDialog* dlg, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L) *************** *** 223,231 **** const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); // wxDialog dlg ! wxDialog * dlg = (wxDialog *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxDialog); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadDialog bool returns = (self->LoadDialog(dlg, parent, name)); --- 223,231 ---- const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // wxDialog dlg ! wxDialog * dlg = (wxDialog *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxDialog); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadDialog bool returns = (self->LoadDialog(dlg, parent, name)); *************** *** 236,242 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadDialog[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog[1] = {{ wxLua_wxXmlResource_LoadDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog }}; // wxDialog* LoadDialog(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L) --- 236,242 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog[1] = {{ wxLua_wxXmlResource_LoadDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog }}; // wxDialog* LoadDialog(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L) *************** *** 245,255 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadDialog wxDialog* returns = (wxDialog*)self->LoadDialog(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxDialog, returns); return 1; --- 245,255 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadDialog wxDialog* returns = (wxDialog*)self->LoadDialog(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxDialog); return 1; *************** *** 259,265 **** #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadFrame[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadFrame[1] = {{ wxLua_wxXmlResource_LoadFrame, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadFrame }}; // bool LoadFrame(wxFrame* frame, wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L) --- 259,265 ---- #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadFrame[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxFrame, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadFrame[1] = {{ wxLua_wxXmlResource_LoadFrame, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadFrame }}; // bool LoadFrame(wxFrame* frame, wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L) *************** *** 268,276 **** const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); // wxFrame frame ! wxFrame * frame = (wxFrame *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxFrame); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadFrame bool returns = (self->LoadFrame(frame, parent, name)); --- 268,276 ---- const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // wxFrame frame ! wxFrame * frame = (wxFrame *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxFrame); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadFrame bool returns = (self->LoadFrame(frame, parent, name)); *************** *** 284,290 **** #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadIcon[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadIcon[1] = {{ wxLua_wxXmlResource_LoadIcon, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadIcon }}; // wxIcon LoadIcon(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L) --- 284,290 ---- #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadIcon[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadIcon[1] = {{ wxLua_wxXmlResource_LoadIcon, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadIcon }}; // wxIcon LoadIcon(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L) *************** *** 293,297 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadIcon // allocate a new object using the copy constructor --- 293,297 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadIcon // allocate a new object using the copy constructor *************** *** 300,304 **** wxluaO_addgcobject(L, (wxIcon*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxIcon, returns); return 1; --- 300,304 ---- wxluaO_addgcobject(L, (wxIcon*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxIcon); return 1; *************** *** 308,314 **** #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenu[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenu[1] = {{ wxLua_wxXmlResource_LoadMenu, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenu }}; // wxMenu* LoadMenu(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L) --- 308,314 ---- #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenu[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenu[1] = {{ wxLua_wxXmlResource_LoadMenu, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenu }}; // wxMenu* LoadMenu(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L) *************** *** 317,332 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenu wxMenu* returns = (wxMenu*)self->LoadMenu(name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxMenu, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar1[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar1[1] = {{ wxLua_wxXmlResource_LoadMenuBar1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar1 }}; // wxMenuBar* LoadMenuBar(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L) --- 317,332 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadMenu wxMenu* returns = (wxMenu*)self->LoadMenu(name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMenu); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar1[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar1[1] = {{ wxLua_wxXmlResource_LoadMenuBar1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar1 }}; // wxMenuBar* LoadMenuBar(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L) *************** *** 335,350 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxMenuBar, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar[1] = {{ wxLua_wxXmlResource_LoadMenuBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar }}; // wxMenuBar* LoadMenuBar(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L) --- 335,350 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMenuBar); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar[1] = {{ wxLua_wxXmlResource_LoadMenuBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar }}; // wxMenuBar* LoadMenuBar(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L) *************** *** 353,363 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxMenuBar, returns); return 1; --- 353,363 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMenuBar); return 1; *************** *** 366,372 **** #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadPanel1[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxPanel, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel1[1] = {{ wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel1 }}; // bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L) --- 366,372 ---- #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel1[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxPanel, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel1[1] = {{ wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel1 }}; // bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L) *************** *** 375,383 **** const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); // wxPanel panel ! wxPanel * panel = (wxPanel *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxPanel); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadPanel bool returns = (self->LoadPanel(panel, parent, name)); --- 375,383 ---- const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // wxPanel panel ! wxPanel * panel = (wxPanel *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxPanel); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadPanel bool returns = (self->LoadPanel(panel, parent, name)); *************** *** 388,394 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadPanel[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel[1] = {{ wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel }}; // wxPanel* LoadPanel(wxWindow* parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L) --- 388,394 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel[1] = {{ wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel }}; // wxPanel* LoadPanel(wxWindow* parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L) *************** *** 397,407 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadPanel wxPanel* returns = (wxPanel*)self->LoadPanel(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxPanel, returns); return 1; --- 397,407 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadPanel wxPanel* returns = (wxPanel*)self->LoadPanel(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxPanel); return 1; *************** *** 410,416 **** #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadToolBar[1] = {{ wxLua_wxXmlResource_LoadToolBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar }}; // wxToolBar* LoadToolBar(wxWindow *parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L) --- 410,416 ---- #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadToolBar[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadToolBar[1] = {{ wxLua_wxXmlResource_LoadToolBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadToolBar }}; // wxToolBar* LoadToolBar(wxWindow *parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L) *************** *** 419,429 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadToolBar wxToolBar* returns = (wxToolBar*)self->LoadToolBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxToolBar, returns); return 1; --- 419,429 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadToolBar wxToolBar* returns = (wxToolBar*)self->LoadToolBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxToolBar); return 1; *************** *** 432,443 **** #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_Set[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_Set(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Set[1] = {{ wxLua_wxXmlResource_Set, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Set }}; // static %gc wxXmlResource* Set(%ungc wxXmlResource *res); static int LUACALL wxLua_wxXmlResource_Set(lua_State *L) { // wxXmlResource res ! wxXmlResource * res = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); if (wxluaO_isgcobject(L, res)) wxluaO_undeletegcobject(L, res); // call Set --- 432,443 ---- #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Set[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_Set(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Set[1] = {{ wxLua_wxXmlResource_Set, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_Set }}; // static %gc wxXmlResource* Set(%ungc wxXmlResource *res); static int LUACALL wxLua_wxXmlResource_Set(lua_State *L) { // wxXmlResource res ! wxXmlResource * res = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); if (wxluaO_isgcobject(L, res)) wxluaO_undeletegcobject(L, res); // call Set *************** *** 445,456 **** if (!wxluaO_isgcobject(L, returns)) wxluaO_addgcobject(L, returns); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlResource, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_SetDomain[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_SetDomain(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetDomain[1] = {{ wxLua_wxXmlResource_SetDomain, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_SetDomain }}; // void SetDomain(const wxString& domain) static int LUACALL wxLua_wxXmlResource_SetDomain(lua_State *L) --- 445,456 ---- if (!wxluaO_isgcobject(L, returns)) wxluaO_addgcobject(L, returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_SetDomain[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_SetDomain(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetDomain[1] = {{ wxLua_wxXmlResource_SetDomain, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_SetDomain }}; // void SetDomain(const wxString& domain) static int LUACALL wxLua_wxXmlResource_SetDomain(lua_State *L) *************** *** 459,463 **** const wxString domain = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call SetDomain self->SetDomain(domain); --- 459,463 ---- const wxString domain = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call SetDomain self->SetDomain(domain); *************** *** 466,472 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_SetFlags[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetFlags[1] = {{ wxLua_wxXmlResource_SetFlags, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_SetFlags }}; // void SetFlags(int flags); static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L) --- 466,472 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_SetFlags[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetFlags[1] = {{ wxLua_wxXmlResource_SetFlags, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_SetFlags }}; // void SetFlags(int flags); static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L) *************** *** 475,479 **** int flags = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call SetFlags self->SetFlags(flags); --- 475,479 ---- int flags = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call SetFlags self->SetFlags(flags); *************** *** 482,488 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_Unload[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Unload[1] = {{ wxLua_wxXmlResource_Unload, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_Unload }}; // bool Unload(const wxString& filename) static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L) --- 482,488 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Unload[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Unload[1] = {{ wxLua_wxXmlResource_Unload, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_Unload }}; // bool Unload(const wxString& filename) static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L) *************** *** 491,495 **** const wxString filename = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call Unload bool returns = (self->Unload(filename)); --- 491,495 ---- const wxString filename = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call Unload bool returns = (self->Unload(filename)); *************** *** 500,509 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_delete[] = { &s_wxluatag_wxXmlResource, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_delete }}; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_constructor1[] = { &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor1[1] = {{ wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatagArray_wxLua_wxXmlResource_constructor1 }}; // wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE, const wxString& domain = ""); static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L) --- 500,509 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_delete[] = { &g_wxluatype_wxXmlResource, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_constructor1[] = { &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor1[1] = {{ wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatypeArray_wxLua_wxXmlResource_constructor1 }}; // wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE, const wxString& domain = ""); static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L) *************** *** 522,533 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlResource, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor[1] = {{ wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxXmlResource_constructor }}; // wxXmlResource(int flags = wxXRC_USE_LOCALE, const wxString& domain = ""); static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L) --- 522,533 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor[1] = {{ wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxXmlResource_constructor }}; // wxXmlResource(int flags = wxXRC_USE_LOCALE, const wxString& domain = ""); static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L) *************** *** 544,548 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlResource, returns); return 1; --- 544,548 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; *************** *** 558,566 **** #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadDialog1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog1 }, #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog }, #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) }; --- 558,566 ---- #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadDialog1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog1 }, #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog }, #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) }; *************** *** 575,583 **** #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadMenuBar1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar1 }, #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadMenuBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar }, #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) }; --- 575,583 ---- #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadMenuBar1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar1 }, #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadMenuBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar }, #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) }; *************** *** 590,595 **** static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload[] = { ! { wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel1 }, ! { wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel }, }; static int s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload)/sizeof(wxLuaBindCFunc); --- 590,595 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload[] = { ! { wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel1 }, ! { wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel }, }; static int s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload)/sizeof(wxLuaBindCFunc); *************** *** 598,603 **** static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor_overload[] = { ! { wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatagArray_wxLua_wxXmlResource_constructor1 }, ! { wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxXmlResource_constructor }, }; static int s_wxluafunc_wxLua_wxXmlResource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_constructor_overload)/sizeof(wxLuaBindCFunc); --- 598,603 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor_overload[] = { ! { wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatypeArray_wxLua_wxXmlResource_constructor1 }, ! { wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxXmlResource_constructor }, }; static int s_wxluafunc_wxLua_wxXmlResource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_constructor_overload)/sizeof(wxLuaBindCFunc); Index: wxstc_stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_stc.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxstc_stc.cpp 20 Dec 2007 02:26:57 -0000 1.10 --- wxstc_stc.cpp 22 Dec 2007 06:07:15 -0000 1.11 *************** *** 25,33 **** // Lua MetaTable Tag for Class 'wxStyledTextCtrl' ! int s_wxluatag_wxStyledTextCtrl = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_AddRefDocument[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_LightUserData, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_AddRefDocument(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_AddRefDocument[1] = {{ wxLua_wxStyledTextCtrl_AddRefDocument, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStyledTextCtrl_AddRefDocument }}; // void AddRefDocument(void* docPointer); static int LUACALL wxLua_wxStyledTextCtrl_AddRefDocument(lua_State *L) --- 25,33 ---- [...14188 lines suppressed...] ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxStyledTextEvent_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextEvent_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxStyledTextEvent_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextEvent_constructor[1] = {{ wxLua_wxStyledTextEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxStyledTextEvent_constructor }}; // wxStyledTextEvent(wxEventType commandType = 0, int id = 0) static int LUACALL wxLua_wxStyledTextEvent_constructor(lua_State *L) *************** *** 8680,8684 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxStyledTextEvent, returns); return 1; --- 8680,8684 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxStyledTextEvent); return 1; Index: wxnet_net.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_net.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxnet_net.cpp 20 Dec 2007 02:26:57 -0000 1.8 --- wxnet_net.cpp 22 Dec 2007 06:07:14 -0000 1.9 *************** *** 27,40 **** // Lua MetaTable Tag for Class 'wxSocketBase' ! int s_wxluatag_wxSocketBase = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketBase_Close[] = { &s_wxluatag_wxSocketBase, NULL }; static int LUACALL wxLua_wxSocketBase_Close(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_Close[1] = {{ wxLua_wxSocketBase_Close, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxSocketBase_Close }}; // void Close() static int LUACALL wxLua_wxSocketBase_Close(lua_State *L) { [...3800 lines suppressed...] ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxURL); return 1; *************** *** 2687,2693 **** #if ((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS) ! { wxLua_wxURL_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxURL_constructor1 }, #endif // ((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS) ! { wxLua_wxURL_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxURL_constructor }, }; static int s_wxluafunc_wxLua_wxURL_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxURL_constructor_overload)/sizeof(wxLuaBindCFunc); --- 2687,2693 ---- #if ((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS) ! { wxLua_wxURL_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxURL_constructor1 }, #endif // ((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS) ! { wxLua_wxURL_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxURL_constructor }, }; static int s_wxluafunc_wxLua_wxURL_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxURL_constructor_overload)/sizeof(wxLuaBindCFunc); Index: wxhtml_html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_html.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxhtml_html.cpp 20 Dec 2007 02:26:57 -0000 1.9 --- wxhtml_html.cpp 22 Dec 2007 06:07:14 -0000 1.10 *************** *** 27,36 **** // Lua MetaTable Tag for Class 'wxHtmlCell' ! int s_wxluatag_wxHtmlCell = -1; #if (wxLUA_USE_wxArrayInt) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlCell_AdjustPagebreak[] = { &s_wxluatag_wxHtmlCell, &s_wxluaarg_Number, &s_wxluatag_wxArrayInt, NULL }; static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlCell_AdjustPagebreak[1] = {{ wxLua_wxHtmlCell_AdjustPagebreak, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxHtmlCell_AdjustPagebreak }}; // %override wxLua_wxHtmlCell_AdjustPagebreak // virtual bool AdjustPagebreak(int * pagebreak) [...6486 lines suppressed...] ! { wxLua_wxHtmlHelpController_AddBook1, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxHtmlHelpController_AddBook1 }, #endif // ((wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxHtmlHe... [truncated message content] |