Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22306/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: Use dummy wxLuaBindDefine for class member enums if they don't have any Some formatting fixes for the generated bindings Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** xml.cpp 6 Jun 2007 23:43:13 -0000 1.33 --- xml.cpp 7 Jun 2007 03:22:08 -0000 1.34 *************** *** 38,42 **** static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_AddChild[1] = {{ wxLua_wxXmlNode_AddChild, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddChild }}; - // void AddChild(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L) --- 38,41 ---- *************** *** 56,60 **** static int LUACALL wxLua_wxXmlNode_AddProperty1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_AddProperty1[1] = {{ wxLua_wxXmlNode_AddProperty1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddProperty1 }}; - // void AddProperty(wxXmlProperty *prop) static int LUACALL wxLua_wxXmlNode_AddProperty1(lua_State *L) --- 55,58 ---- *************** *** 74,78 **** static int LUACALL wxLua_wxXmlNode_AddProperty(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_AddProperty[1] = {{ wxLua_wxXmlNode_AddProperty, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlNode_AddProperty }}; - // void AddProperty(const wxString& name, const wxString& value) static int LUACALL wxLua_wxXmlNode_AddProperty(lua_State *L) --- 72,75 ---- *************** *** 94,98 **** static int LUACALL wxLua_wxXmlNode_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_Delete[1] = {{ wxLua_wxXmlNode_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_Delete }}; - static int LUACALL wxLua_wxXmlNode_Delete(lua_State *L) { --- 91,94 ---- *************** *** 111,115 **** static int LUACALL wxLua_wxXmlNode_DeleteProperty(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_DeleteProperty[1] = {{ wxLua_wxXmlNode_DeleteProperty, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_DeleteProperty }}; - // bool DeleteProperty(const wxString& name) static int LUACALL wxLua_wxXmlNode_DeleteProperty(lua_State *L) --- 107,110 ---- *************** *** 132,136 **** static int LUACALL wxLua_wxXmlNode_GetChildren(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetChildren[1] = {{ wxLua_wxXmlNode_GetChildren, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetChildren }}; - // wxXmlNode *GetChildren() const static int LUACALL wxLua_wxXmlNode_GetChildren(lua_State *L) --- 127,130 ---- *************** *** 151,155 **** static int LUACALL wxLua_wxXmlNode_GetContent(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetContent[1] = {{ wxLua_wxXmlNode_GetContent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetContent }}; - // wxString GetContent() const static int LUACALL wxLua_wxXmlNode_GetContent(lua_State *L) --- 145,148 ---- *************** *** 170,174 **** static int LUACALL wxLua_wxXmlNode_GetName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetName[1] = {{ wxLua_wxXmlNode_GetName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetName }}; - // wxString GetName() const static int LUACALL wxLua_wxXmlNode_GetName(lua_State *L) --- 163,166 ---- *************** *** 189,193 **** static int LUACALL wxLua_wxXmlNode_GetNext(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetNext[1] = {{ wxLua_wxXmlNode_GetNext, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetNext }}; - // wxXmlNode *GetNext() const static int LUACALL wxLua_wxXmlNode_GetNext(lua_State *L) --- 181,184 ---- *************** *** 208,212 **** static int LUACALL wxLua_wxXmlNode_GetParent(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetParent[1] = {{ wxLua_wxXmlNode_GetParent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetParent }}; - // wxXmlNode *GetParent() const static int LUACALL wxLua_wxXmlNode_GetParent(lua_State *L) --- 199,202 ---- *************** *** 227,231 **** static int LUACALL wxLua_wxXmlNode_GetPropVal1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetPropVal1[1] = {{ wxLua_wxXmlNode_GetPropVal1, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal1 }}; - // wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const static int LUACALL wxLua_wxXmlNode_GetPropVal1(lua_State *L) --- 217,220 ---- *************** *** 251,255 **** static int LUACALL wxLua_wxXmlNode_GetPropVal(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetPropVal[1] = {{ wxLua_wxXmlNode_GetPropVal, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal }}; - // %override wxLua_wxXmlNode_GetPropValPtr // %rename GetPropValPtr bool GetPropVal(const wxString& propName, wxString *value) const; --- 240,243 ---- *************** *** 274,281 **** } static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetProperties[] = { &s_wxluatag_wxXmlNode, NULL }; static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetProperties[1] = {{ wxLua_wxXmlNode_GetProperties, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetProperties }}; - // wxXmlProperty *GetProperties() const static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L) --- 262,269 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetProperties[] = { &s_wxluatag_wxXmlNode, NULL }; static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetProperties[1] = {{ wxLua_wxXmlNode_GetProperties, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetProperties }}; // wxXmlProperty *GetProperties() const static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L) *************** *** 296,300 **** static int LUACALL wxLua_wxXmlNode_GetType(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_GetType[1] = {{ wxLua_wxXmlNode_GetType, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetType }}; - // wxXmlNodeType GetType() const static int LUACALL wxLua_wxXmlNode_GetType(lua_State *L) --- 284,287 ---- *************** *** 315,319 **** static int LUACALL wxLua_wxXmlNode_HasProp(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_HasProp[1] = {{ wxLua_wxXmlNode_HasProp, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_HasProp }}; - // bool HasProp(const wxString& propName) const static int LUACALL wxLua_wxXmlNode_HasProp(lua_State *L) --- 302,305 ---- *************** *** 336,340 **** static int LUACALL wxLua_wxXmlNode_InsertChild(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_InsertChild[1] = {{ wxLua_wxXmlNode_InsertChild, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlNode_InsertChild }}; - // void InsertChild(wxXmlNode *child, wxXmlNode *before_node) static int LUACALL wxLua_wxXmlNode_InsertChild(lua_State *L) --- 322,325 ---- *************** *** 356,360 **** static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_RemoveChild[1] = {{ wxLua_wxXmlNode_RemoveChild, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_RemoveChild }}; - // bool RemoveChild(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L) --- 341,344 ---- *************** *** 377,381 **** static int LUACALL wxLua_wxXmlNode_SetChildren(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetChildren[1] = {{ wxLua_wxXmlNode_SetChildren, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetChildren }}; - // void SetChildren(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_SetChildren(lua_State *L) --- 361,364 ---- *************** *** 395,399 **** static int LUACALL wxLua_wxXmlNode_SetContent(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetContent[1] = {{ wxLua_wxXmlNode_SetContent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetContent }}; - // void SetContent(const wxString& con) static int LUACALL wxLua_wxXmlNode_SetContent(lua_State *L) --- 378,381 ---- *************** *** 413,417 **** static int LUACALL wxLua_wxXmlNode_SetName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetName[1] = {{ wxLua_wxXmlNode_SetName, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetName }}; - // void SetName(const wxString& name) static int LUACALL wxLua_wxXmlNode_SetName(lua_State *L) --- 395,398 ---- *************** *** 431,435 **** static int LUACALL wxLua_wxXmlNode_SetNext(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetNext[1] = {{ wxLua_wxXmlNode_SetNext, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetNext }}; - // void SetNext(wxXmlNode *next) static int LUACALL wxLua_wxXmlNode_SetNext(lua_State *L) --- 412,415 ---- *************** *** 449,453 **** static int LUACALL wxLua_wxXmlNode_SetParent(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetParent[1] = {{ wxLua_wxXmlNode_SetParent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetParent }}; - // void SetParent(wxXmlNode *parent) static int LUACALL wxLua_wxXmlNode_SetParent(lua_State *L) --- 429,432 ---- *************** *** 467,471 **** static int LUACALL wxLua_wxXmlNode_SetProperties(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetProperties[1] = {{ wxLua_wxXmlNode_SetProperties, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetProperties }}; - // void SetProperties(wxXmlProperty *prop) static int LUACALL wxLua_wxXmlNode_SetProperties(lua_State *L) --- 446,449 ---- *************** *** 485,489 **** static int LUACALL wxLua_wxXmlNode_SetType(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_SetType[1] = {{ wxLua_wxXmlNode_SetType, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetType }}; - // void SetType(wxXmlNodeType type) static int LUACALL wxLua_wxXmlNode_SetType(lua_State *L) --- 463,466 ---- *************** *** 503,507 **** static int LUACALL wxLua_wxXmlNode_constructor2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_constructor2[1] = {{ wxLua_wxXmlNode_constructor2, WXLUAMETHOD_CONSTRUCTOR, 6, 6, s_wxluatagArray_wxLua_wxXmlNode_constructor2 }}; - // wxXmlNode(wxXmlNode *parent, wxXmlNodeType type, const wxString& name, const wxString& content, wxXmlProperty *props, wxXmlNode *next) static int LUACALL wxLua_wxXmlNode_constructor2(lua_State *L) --- 480,483 ---- *************** *** 535,539 **** static int LUACALL wxLua_wxXmlNode_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_constructor1[1] = {{ wxLua_wxXmlNode_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 3, s_wxluatagArray_wxLua_wxXmlNode_constructor1 }}; - // wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString) static int LUACALL wxLua_wxXmlNode_constructor1(lua_State *L) --- 511,514 ---- *************** *** 562,566 **** static int LUACALL wxLua_wxXmlNode_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlNode_constructor[1] = {{ wxLua_wxXmlNode_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; - // wxXmlNode() static int LUACALL wxLua_wxXmlNode_constructor(lua_State *L) --- 537,540 ---- *************** *** 679,688 **** int wxXmlNode_methodCount = sizeof(wxXmlNode_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxXmlNode_enums[] = { - { NULL, 0, }, - }; - - int wxXmlNode_enumCount = sizeof(wxXmlNode_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 653,656 ---- *************** *** 699,703 **** static int LUACALL wxLua_wxXmlProperty_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_Delete[1] = {{ wxLua_wxXmlProperty_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_Delete }}; - static int LUACALL wxLua_wxXmlProperty_Delete(lua_State *L) { --- 667,670 ---- *************** *** 716,720 **** static int LUACALL wxLua_wxXmlProperty_GetName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_GetName[1] = {{ wxLua_wxXmlProperty_GetName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_GetName }}; - // wxString GetName() static int LUACALL wxLua_wxXmlProperty_GetName(lua_State *L) --- 683,686 ---- *************** *** 735,739 **** static int LUACALL wxLua_wxXmlProperty_GetNext(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_GetNext[1] = {{ wxLua_wxXmlProperty_GetNext, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_GetNext }}; - // wxXmlProperty *GetNext() static int LUACALL wxLua_wxXmlProperty_GetNext(lua_State *L) --- 701,704 ---- *************** *** 754,758 **** static int LUACALL wxLua_wxXmlProperty_GetValue(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_GetValue[1] = {{ wxLua_wxXmlProperty_GetValue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_GetValue }}; - // wxString GetValue() static int LUACALL wxLua_wxXmlProperty_GetValue(lua_State *L) --- 719,722 ---- *************** *** 773,777 **** static int LUACALL wxLua_wxXmlProperty_SetName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_SetName[1] = {{ wxLua_wxXmlProperty_SetName, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlProperty_SetName }}; - // void SetName(const wxString& name) static int LUACALL wxLua_wxXmlProperty_SetName(lua_State *L) --- 737,740 ---- *************** *** 791,795 **** static int LUACALL wxLua_wxXmlProperty_SetNext(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_SetNext[1] = {{ wxLua_wxXmlProperty_SetNext, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlProperty_SetNext }}; - // void SetNext(wxXmlProperty *next) static int LUACALL wxLua_wxXmlProperty_SetNext(lua_State *L) --- 754,757 ---- *************** *** 809,813 **** static int LUACALL wxLua_wxXmlProperty_SetValue(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_SetValue[1] = {{ wxLua_wxXmlProperty_SetValue, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlProperty_SetValue }}; - // void SetValue(const wxString& value) static int LUACALL wxLua_wxXmlProperty_SetValue(lua_State *L) --- 771,774 ---- *************** *** 827,831 **** static int LUACALL wxLua_wxXmlProperty_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_constructor1[1] = {{ wxLua_wxXmlProperty_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxXmlProperty_constructor1 }}; - // wxXmlProperty(const wxString& name, const wxString& value, wxXmlProperty *next) static int LUACALL wxLua_wxXmlProperty_constructor1(lua_State *L) --- 788,791 ---- *************** *** 852,856 **** static int LUACALL wxLua_wxXmlProperty_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlProperty_constructor[1] = {{ wxLua_wxXmlProperty_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; - // wxXmlProperty() static int LUACALL wxLua_wxXmlProperty_constructor(lua_State *L) --- 812,815 ---- *************** *** 911,920 **** int wxXmlProperty_methodCount = sizeof(wxXmlProperty_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxXmlProperty_enums[] = { - { NULL, 0, }, - }; - - int wxXmlProperty_enumCount = sizeof(wxXmlProperty_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 870,873 ---- *************** *** 931,935 **** static int LUACALL wxLua_wxXmlDocument_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_Delete[1] = {{ wxLua_wxXmlDocument_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_Delete }}; - static int LUACALL wxLua_wxXmlDocument_Delete(lua_State *L) { --- 884,887 ---- *************** *** 948,952 **** static int LUACALL wxLua_wxXmlDocument_GetFileEncoding(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_GetFileEncoding[1] = {{ wxLua_wxXmlDocument_GetFileEncoding, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_GetFileEncoding }}; - // wxString GetFileEncoding() const; static int LUACALL wxLua_wxXmlDocument_GetFileEncoding(lua_State *L) --- 900,903 ---- *************** *** 967,971 **** static int LUACALL wxLua_wxXmlDocument_GetRoot(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_GetRoot[1] = {{ wxLua_wxXmlDocument_GetRoot, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_GetRoot }}; - // wxXmlNode *GetRoot() const; static int LUACALL wxLua_wxXmlDocument_GetRoot(lua_State *L) --- 918,921 ---- *************** *** 986,990 **** static int LUACALL wxLua_wxXmlDocument_GetVersion(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_GetVersion[1] = {{ wxLua_wxXmlDocument_GetVersion, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_GetVersion }}; - // wxString GetVersion() const; static int LUACALL wxLua_wxXmlDocument_GetVersion(lua_State *L) --- 936,939 ---- *************** *** 1005,1009 **** static int LUACALL wxLua_wxXmlDocument_IsOk(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_IsOk[1] = {{ wxLua_wxXmlDocument_IsOk, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_IsOk }}; - // bool IsOk() const; static int LUACALL wxLua_wxXmlDocument_IsOk(lua_State *L) --- 954,957 ---- *************** *** 1024,1028 **** static int LUACALL wxLua_wxXmlDocument_Load(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_Load[1] = {{ wxLua_wxXmlDocument_Load, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxXmlDocument_Load }}; - // bool Load(const wxString& filename, const wxString& encoding = "UTF-8"); static int LUACALL wxLua_wxXmlDocument_Load(lua_State *L) --- 972,975 ---- *************** *** 1049,1053 **** static int LUACALL wxLua_wxXmlDocument_Save(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_Save[1] = {{ wxLua_wxXmlDocument_Save, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlDocument_Save }}; - // bool Save(const wxString& filename) const; static int LUACALL wxLua_wxXmlDocument_Save(lua_State *L) --- 996,999 ---- *************** *** 1070,1074 **** static int LUACALL wxLua_wxXmlDocument_SetFileEncoding(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_SetFileEncoding[1] = {{ wxLua_wxXmlDocument_SetFileEncoding, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlDocument_SetFileEncoding }}; - // void SetFileEncoding(const wxString& encoding); static int LUACALL wxLua_wxXmlDocument_SetFileEncoding(lua_State *L) --- 1016,1019 ---- *************** *** 1088,1092 **** static int LUACALL wxLua_wxXmlDocument_SetRoot(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_SetRoot[1] = {{ wxLua_wxXmlDocument_SetRoot, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlDocument_SetRoot }}; - // void SetRoot(wxXmlNode *node); static int LUACALL wxLua_wxXmlDocument_SetRoot(lua_State *L) --- 1033,1036 ---- *************** *** 1106,1110 **** static int LUACALL wxLua_wxXmlDocument_SetVersion(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_SetVersion[1] = {{ wxLua_wxXmlDocument_SetVersion, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlDocument_SetVersion }}; - // void SetVersion(const wxString& version); static int LUACALL wxLua_wxXmlDocument_SetVersion(lua_State *L) --- 1050,1053 ---- *************** *** 1124,1128 **** static int LUACALL wxLua_wxXmlDocument_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_constructor1[1] = {{ wxLua_wxXmlDocument_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxXmlDocument_constructor1 }}; - // wxXmlDocument(const wxString& filename, const wxString& encoding = "UTF-8"); static int LUACALL wxLua_wxXmlDocument_constructor1(lua_State *L) --- 1067,1070 ---- *************** *** 1149,1153 **** static int LUACALL wxLua_wxXmlDocument_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlDocument_constructor[1] = {{ wxLua_wxXmlDocument_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; - // wxXmlDocument(); static int LUACALL wxLua_wxXmlDocument_constructor(lua_State *L) --- 1091,1094 ---- *************** *** 1211,1220 **** int wxXmlDocument_methodCount = sizeof(wxXmlDocument_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxXmlDocument_enums[] = { - { NULL, 0, }, - }; - - int wxXmlDocument_enumCount = sizeof(wxXmlDocument_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 1152,1155 ---- *************** *** 1231,1235 **** 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) --- 1166,1169 ---- *************** *** 1258,1262 **** 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) --- 1192,1195 ---- *************** *** 1274,1278 **** 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) --- 1207,1210 ---- *************** *** 1303,1307 **** static int LUACALL wxLua_wxXmlResource_CreateDialog(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_CreateDialog[1] = {{ wxLua_wxXmlResource_CreateDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_CreateDialog }}; - // %override wxLua_wxXmlResource_CreateDialog // wxFrame* CreateFrame(wxWindow* parent, const wxString& name) --- 1235,1238 ---- *************** *** 1329,1332 **** --- 1260,1264 ---- } + #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXMLResource && wxUSE_XML) *************** *** 1335,1339 **** static int LUACALL wxLua_wxXmlResource_CreateFrame(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_CreateFrame[1] = {{ wxLua_wxXmlResource_CreateFrame, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_CreateFrame }}; - // %override wxLua_wxXmlResource_CreateFrame // wxFrame* CreateFrame(wxWindow* parent, const wxString& name) --- 1267,1270 ---- *************** *** 1361,1364 **** --- 1292,1296 ---- } + #endif // (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXMLResource && wxUSE_XML) *************** *** 1366,1370 **** static int LUACALL wxLua_wxXmlResource_Delete(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Delete[1] = {{ wxLua_wxXmlResource_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Delete }}; - static int LUACALL wxLua_wxXmlResource_Delete(lua_State *L) { --- 1298,1301 ---- *************** *** 1383,1387 **** static int LUACALL wxLua_wxXmlResource_Get(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Get[1] = {{ wxLua_wxXmlResource_Get, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Get }}; - // %override wxLua_wxXmlResource_Get // wxXmlResource* Get() --- 1314,1317 ---- *************** *** 1398,1405 **** } 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) --- 1328,1335 ---- } + 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) *************** *** 1420,1424 **** 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) --- 1350,1353 ---- *************** *** 1439,1443 **** static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetXRCID[1] = {{ wxLua_wxXmlResource_GetXRCID, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_GetXRCID }}; - // %override wxLua_wxXmlResource_GetXRCID // int GetXRCID(const wxString &stringID) --- 1368,1371 ---- *************** *** 1456,1463 **** } 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) --- 1384,1391 ---- } + 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) *************** *** 1475,1479 **** 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) --- 1403,1406 ---- *************** *** 1498,1502 **** 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) --- 1425,1428 ---- *************** *** 1525,1529 **** 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) --- 1451,1454 ---- *************** *** 1550,1554 **** 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) --- 1475,1478 ---- *************** *** 1576,1580 **** 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) --- 1500,1503 ---- *************** *** 1604,1608 **** 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) --- 1527,1530 ---- *************** *** 1631,1635 **** 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) --- 1553,1556 ---- *************** *** 1652,1656 **** 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) --- 1573,1576 ---- *************** *** 1673,1677 **** 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) --- 1593,1596 ---- *************** *** 1698,1702 **** 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) --- 1617,1620 ---- *************** *** 1723,1727 **** 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) --- 1641,1644 ---- *************** *** 1748,1752 **** 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) --- 1665,1668 ---- *************** *** 1773,1777 **** static int LUACALL wxLua_wxXmlResource_Set(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Set[1] = {{ wxLua_wxXmlResource_Set, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_Set }}; - // %override wxLua_wxXmlResource_Set // wxXmlResource* Set(wxXmlResource *res) --- 1689,1692 ---- *************** *** 1790,1797 **** } 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) --- 1705,1712 ---- } + 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) *************** *** 1811,1815 **** 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) --- 1726,1729 ---- *************** *** 1832,1836 **** static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor1[1] = {{ wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxXmlResource_constructor1 }}; - // wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE); static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L) --- 1746,1749 ---- *************** *** 1858,1862 **** static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor[1] = {{ wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxXmlResource_constructor }}; - // wxXmlResource(int flags = wxXRC_USE_LOCALE); static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L) --- 1771,1774 ---- *************** *** 2038,2047 **** int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxXmlResource_enums[] = { - { NULL, 0, }, - }; - - int wxXmlResource_enumCount = sizeof(wxXmlResource_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 1950,1953 ---- Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** defsutil.cpp 6 Jun 2007 23:43:00 -0000 1.35 --- defsutil.cpp 7 Jun 2007 03:22:01 -0000 1.36 *************** *** 39,43 **** static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_CloseOutput[1] = {{ wxLua_wxProcess_CloseOutput, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_CloseOutput }}; - // void CloseOutput() static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L) --- 39,42 ---- *************** *** 57,61 **** static int LUACALL wxLua_wxProcess_Delete(lua_State *L); static wxLuaBindCFunc 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) { --- 56,59 ---- *************** *** 74,78 **** static int LUACALL wxLua_wxProcess_Detach(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_Detach[1] = {{ wxLua_wxProcess_Detach, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_Detach }}; - // void Detach() static int LUACALL wxLua_wxProcess_Detach(lua_State *L) --- 72,75 ---- *************** *** 90,94 **** static int LUACALL wxLua_wxProcess_Exists(lua_State *L); static wxLuaBindCFunc 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) static int LUACALL wxLua_wxProcess_Exists(lua_State *L) --- 87,90 ---- *************** *** 110,114 **** static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_GetErrorStream[1] = {{ wxLua_wxProcess_GetErrorStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetErrorStream }}; - // wxInputStream *GetErrorStream() const static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L) --- 106,109 ---- *************** *** 129,133 **** static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_GetInputStream[1] = {{ wxLua_wxProcess_GetInputStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetInputStream }}; - // wxInputStream *GetInputStream() const static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L) --- 124,127 ---- *************** *** 148,152 **** static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_GetOutputStream[1] = {{ wxLua_wxProcess_GetOutputStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetOutputStream }}; - // wxOutputStream *GetOutputStream() const static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L) --- 142,145 ---- *************** *** 170,174 **** static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_IsErrorAvailable[1] = {{ wxLua_wxProcess_IsErrorAvailable, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsErrorAvailable }}; - // bool IsErrorAvailable() const static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L) --- 163,166 ---- *************** *** 189,193 **** static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_IsInputAvailable[1] = {{ wxLua_wxProcess_IsInputAvailable, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsInputAvailable }}; - // bool IsInputAvailable() const static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L) --- 181,184 ---- *************** *** 208,212 **** static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_IsInputOpened[1] = {{ wxLua_wxProcess_IsInputOpened, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsInputOpened }}; - // bool IsInputOpened() const static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L) --- 199,202 ---- *************** *** 229,233 **** static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_IsRedirected[1] = {{ wxLua_wxProcess_IsRedirected, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsRedirected }}; - // bool IsRedirected() static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L) --- 219,222 ---- *************** *** 248,252 **** static int LUACALL wxLua_wxProcess_Kill(lua_State *L); static wxLuaBindCFunc 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) static int LUACALL wxLua_wxProcess_Kill(lua_State *L) --- 237,240 ---- *************** *** 272,276 **** static int LUACALL wxLua_wxProcess_Open(lua_State *L); static wxLuaBindCFunc 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) static int LUACALL wxLua_wxProcess_Open(lua_State *L) --- 260,263 ---- *************** *** 295,299 **** static int LUACALL wxLua_wxProcess_Redirect(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxProcess_Redirect[1] = {{ wxLua_wxProcess_Redirect, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_Redirect }}; - // void Redirect() static int LUACALL wxLua_wxProcess_Redirect(lua_State *L) --- 282,285 ---- *************** *** 313,317 **** static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L); static wxLuaBindCFunc 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) static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L) --- 299,302 ---- *************** *** 337,341 **** static int LUACALL wxLua_wxProcess_constructor(lua_State *L); static wxLuaBindCFunc 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) static int LUACALL wxLua_wxProcess_constructor(lua_State *L) --- 322,325 ---- *************** *** 401,410 **** int wxProcess_methodCount = sizeof(wxProcess_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxProcess_enums[] = { - { NULL, 0, }, - }; - - int wxProcess_enumCount = sizeof(wxProcess_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxProcess --- 385,388 ---- *************** *** 421,425 **** static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_AltDown[1] = {{ wxLua_wxMouseState_AltDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_AltDown }}; - // bool AltDown() static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L) --- 399,402 ---- *************** *** 440,444 **** static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_CmdDown[1] = {{ wxLua_wxMouseState_CmdDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_CmdDown }}; - // bool CmdDown() static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L) --- 417,420 ---- *************** *** 459,463 **** static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_ControlDown[1] = {{ wxLua_wxMouseState_ControlDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_ControlDown }}; - // bool ControlDown() static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L) --- 435,438 ---- *************** *** 478,482 **** static int LUACALL wxLua_wxMouseState_Delete(lua_State *L); static wxLuaBindCFunc 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) { --- 453,456 ---- *************** *** 495,499 **** static int LUACALL wxLua_wxMouseState_GetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_GetX[1] = {{ wxLua_wxMouseState_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_GetX }}; - // wxCoord GetX() static int LUACALL wxLua_wxMouseState_GetX(lua_State *L) --- 469,472 ---- *************** *** 514,518 **** static int LUACALL wxLua_wxMouseState_GetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_GetY[1] = {{ wxLua_wxMouseState_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_GetY }}; - // wxCoord GetY() static int LUACALL wxLua_wxMouseState_GetY(lua_State *L) --- 487,490 ---- *************** *** 533,537 **** static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_LeftDown[1] = {{ wxLua_wxMouseState_LeftDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_LeftDown }}; - // bool LeftDown() static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L) --- 505,508 ---- *************** *** 552,556 **** static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_MetaDown[1] = {{ wxLua_wxMouseState_MetaDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_MetaDown }}; - // bool MetaDown() static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L) --- 523,526 ---- *************** *** 571,575 **** static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_MiddleDown[1] = {{ wxLua_wxMouseState_MiddleDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_MiddleDown }}; - // bool MiddleDown() static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L) --- 541,544 ---- *************** *** 590,594 **** static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_RightDown[1] = {{ wxLua_wxMouseState_RightDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_RightDown }}; - // bool RightDown() static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L) --- 559,562 ---- *************** *** 609,613 **** static int LUACALL wxLua_wxMouseState_SetAltDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetAltDown[1] = {{ wxLua_wxMouseState_SetAltDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetAltDown }}; - // void SetAltDown(bool down) static int LUACALL wxLua_wxMouseState_SetAltDown(lua_State *L) --- 577,580 ---- *************** *** 627,631 **** static int LUACALL wxLua_wxMouseState_SetControlDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetControlDown[1] = {{ wxLua_wxMouseState_SetControlDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetControlDown }}; - // void SetControlDown(bool down) static int LUACALL wxLua_wxMouseState_SetControlDown(lua_State *L) --- 594,597 ---- *************** *** 645,649 **** static int LUACALL wxLua_wxMouseState_SetLeftDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetLeftDown[1] = {{ wxLua_wxMouseState_SetLeftDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetLeftDown }}; - // void SetLeftDown(bool down) static int LUACALL wxLua_wxMouseState_SetLeftDown(lua_State *L) --- 611,614 ---- *************** *** 663,667 **** static int LUACALL wxLua_wxMouseState_SetMetaDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetMetaDown[1] = {{ wxLua_wxMouseState_SetMetaDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetMetaDown }}; - // void SetMetaDown(bool down) static int LUACALL wxLua_wxMouseState_SetMetaDown(lua_State *L) --- 628,631 ---- *************** *** 681,685 **** static int LUACALL wxLua_wxMouseState_SetMiddleDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetMiddleDown[1] = {{ wxLua_wxMouseState_SetMiddleDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown }}; - // void SetMiddleDown(bool down) static int LUACALL wxLua_wxMouseState_SetMiddleDown(lua_State *L) --- 645,648 ---- *************** *** 699,703 **** static int LUACALL wxLua_wxMouseState_SetRightDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetRightDown[1] = {{ wxLua_wxMouseState_SetRightDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetRightDown }}; - // void SetRightDown(bool down) static int LUACALL wxLua_wxMouseState_SetRightDown(lua_State *L) --- 662,665 ---- *************** *** 717,721 **** static int LUACALL wxLua_wxMouseState_SetShiftDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetShiftDown[1] = {{ wxLua_wxMouseState_SetShiftDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetShiftDown }}; - // void SetShiftDown(bool down) static int LUACALL wxLua_wxMouseState_SetShiftDown(lua_State *L) --- 679,682 ---- *************** *** 735,739 **** static int LUACALL wxLua_wxMouseState_SetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetX[1] = {{ wxLua_wxMouseState_SetX, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetX }}; - // void SetX(wxCoord x) static int LUACALL wxLua_wxMouseState_SetX(lua_State *L) --- 696,699 ---- *************** *** 753,757 **** static int LUACALL wxLua_wxMouseState_SetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_SetY[1] = {{ wxLua_wxMouseState_SetY, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetY }}; - // void SetY(wxCoord y) static int LUACALL wxLua_wxMouseState_SetY(lua_State *L) --- 713,716 ---- *************** *** 771,775 **** static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_ShiftDown[1] = {{ wxLua_wxMouseState_ShiftDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_ShiftDown }}; - // bool ShiftDown() static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L) --- 730,733 ---- *************** *** 789,793 **** static int LUACALL wxLua_wxMouseState_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMouseState_constructor[1] = {{ wxLua_wxMouseState_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; - // wxMouseState() static int LUACALL wxLua_wxMouseState_constructor(lua_State *L) --- 747,750 ---- *************** *** 838,847 **** int wxMouseState_methodCount = sizeof(wxMouseState_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxMouseState_enums[] = { - { NULL, 0, }, - }; - - int wxMouseState_enumCount = sizeof(wxMouseState_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxCHECK_VERSION(2,7,0) --- 795,798 ---- *************** *** 858,862 **** static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L); static wxLuaBindCFunc 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) { --- 809,812 ---- *************** *** 877,881 **** static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxBusyCursor_constructor[1] = {{ wxLua_wxBusyCursor_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxBusyCursor_constructor }}; - // %override wxLua_wxBusyCursor_constructor // wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) --- 827,830 ---- *************** *** 901,904 **** --- 850,854 ---- } + #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) *************** *** 918,927 **** int wxBusyCursor_methodCount = sizeof(wxBusyCursor_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxBusyCursor_enums[] = { - { NULL, 0, }, - }; - - int wxBusyCursor_enumCount = sizeof(wxBusyCursor_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxBusyCursor --- 868,871 ---- *************** *** 938,942 **** static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L); static wxLuaBindCFunc 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) { --- 882,885 ---- *************** *** 955,959 **** static int LUACALL wxLua_wxBusyInfo_constructor(lua_State *L); static wxLuaBindCFunc 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) static int LUACALL wxLua_wxBusyInfo_constructor(lua_State *L) --- 898,901 ---- *************** *** 991,1000 **** int wxBusyInfo_methodCount = sizeof(wxBusyInfo_methods)/sizeof(wxLuaBindMethod) - 1; - - wxLuaBindDefine wxBusyInfo_enums[] = { - { NULL, 0, }, - }; - - int wxBusyInfo_enumCount = sizeof(wxBusyInfo_enums)/sizeof(wxLuaBindDefine) - 1; #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO --- 933,936 ---- Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxlua.cpp 6 Jun 2007 23:43:13 -0000 1.37 --- wxlua.cpp 7 Jun 2007 03:22:08 -0000 1.38 *************** *** 36,40 **** static int LUACALL wxLua_wxLuaState_Delete(lua_State *L); static wxLuaBindCFunc 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) { --- 36,39 ---- *************** *** 61,70 **** - wxLuaBindDefine wxLuaState_enums[] = { - { NULL, 0, }, - }; - - int wxLuaState_enumCount = sizeof(wxLuaState_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxLuaObject --- 60,63 ---- *************** *** 77,81 **** static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L); static wxLuaBindCFunc 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) { --- 70,73 ---- *************** *** 94,98 **** static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags[1] = {{ wxLua_wxLuaObject_GetAllocationFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags }}; - // int GetAllocationFlags() const static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L) --- 86,89 ---- *************** *** 113,117 **** static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetObject }}; - // %override wxLua_wxLuaObject_GetObject // void *GetObject() const --- 104,107 ---- *************** *** 127,134 **** } static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enum, NULL }; static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }}; - // bool HasAllocationFlag(wxLuaObject_Type flag) static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L) --- 117,124 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enum, NULL }; static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }}; // bool HasAllocationFlag(wxLuaObject_Type flag) static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L) *************** *** 151,155 **** static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L); static wxLuaBindCFunc 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) static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L) --- 141,144 ---- *************** *** 174,178 **** static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxLuaObject_SetObject }}; - // %override wxLua_wxLuaObject_SetObject // void SetObject(void *object) --- 163,166 ---- *************** *** 188,194 **** } static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; - // %override wxLua_wxLuaObject_constructor // wxLuaObject(void *object) --- 176,182 ---- } + static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxLuaObject_constructor // wxLuaObject(void *object) *************** *** 210,213 **** --- 198,202 ---- + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxLuaObject_methods[] = { *************** *** 225,234 **** - wxLuaBindDefine wxLuaObject_enums[] = { - { NULL, 0, }, - }; - - int wxLuaObject_enumCount = sizeof(wxLuaObject_enums)/sizeof(wxLuaBindDefine) - 1; - #if wxLUA_USE_wxLuaPrintout --- 214,217 ---- *************** *** 243,247 **** static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L); static wxLuaBindCFunc 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) { --- 226,229 ---- *************** *** 260,264 **** static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaPrintout_GetID[1] = {{ wxLua_wxLuaPrintout_GetID, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaPrintout_GetID }}; - // wxLuaObject *GetID() static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L) --- 242,245 ---- *************** *** 279,283 **** static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L); static wxLuaBindCFunc 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) static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L) --- 260,263 ---- *************** *** 305,309 **** static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L); st... [truncated message content] |