Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.50, 1.51 controls.cpp, 1.62, 1.63 data.cpp, 1.49, 1.50 dialogs.cpp, 1.44, 1.45 gdi.cpp, 1.67, 1.68 help.cpp, 1.38, 1.39 html.cpp, 1.44, 1.45 mdi.cpp, 1.38, 1.39 menutool.cpp, 1.41, 1.42 socket.cpp, 1.41, 1.42 windows.cpp, 1.57, 1.58 wx_bind.cpp, 1.103, 1.104
|
From: John L. <jr...@us...> - 2007-06-13 04:15:33
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9645/wxLua/modules/wxbind/src Modified Files: appframe.cpp controls.cpp data.cpp dialogs.cpp gdi.cpp help.cpp html.cpp mdi.cpp menutool.cpp socket.cpp windows.cpp wx_bind.cpp Log Message: Remove class member functions that are duplicates of their baseclass functions Fix wxClassInfo is NOT a wxObject Add more capability to bindings.wx.lua Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** controls.cpp 13 Jun 2007 00:08:58 -0000 1.62 --- controls.cpp 13 Jun 2007 04:15:23 -0000 1.63 *************** *** 4061,4085 **** } - - #if (wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL) && (wxLUA_USE_wxColourPenBrush) - static wxLuaArgTag s_wxluatagArray_wxLua_wxListCtrl_SetBackgroundColour[] = { &s_wxluatag_wxListCtrl, &s_wxluatag_wxColour, NULL }; - static int LUACALL wxLua_wxListCtrl_SetBackgroundColour(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxListCtrl_SetBackgroundColour[1] = {{ wxLua_wxListCtrl_SetBackgroundColour, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxListCtrl_SetBackgroundColour }}; - // void SetBackgroundColour(const wxColour& col) - static int LUACALL wxLua_wxListCtrl_SetBackgroundColour(lua_State *L) - { - wxLuaState wxlState(L); - // const wxColour col - const wxColour * col = (const wxColour *)wxlState.GetUserDataType(2, s_wxluatag_wxColour); - // get this - wxListCtrl * self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl); - // call SetBackgroundColour - self->SetBackgroundColour(*col); - - return 0; - } - - #endif // (wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL) && (wxLUA_USE_wxColourPenBrush) - static wxLuaArgTag s_wxluatagArray_wxLua_wxListCtrl_SetColumn[] = { &s_wxluatag_wxListCtrl, &s_wxluaarg_Number, &s_wxluatag_wxListItem, NULL }; static int LUACALL wxLua_wxListCtrl_SetColumn(lua_State *L); --- 4061,4064 ---- *************** *** 4422,4442 **** #endif // (wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL) && (wxLUA_USE_wxColourPenBrush) - static wxLuaArgTag s_wxluatagArray_wxLua_wxListCtrl_SetWindowStyleFlag[] = { &s_wxluatag_wxListCtrl, &s_wxluaarg_Number, NULL }; - static int LUACALL wxLua_wxListCtrl_SetWindowStyleFlag(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxListCtrl_SetWindowStyleFlag[1] = {{ wxLua_wxListCtrl_SetWindowStyleFlag, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxListCtrl_SetWindowStyleFlag }}; - // void SetWindowStyleFlag(long style) - static int LUACALL wxLua_wxListCtrl_SetWindowStyleFlag(lua_State *L) - { - wxLuaState wxlState(L); - // long style - long style = (long)wxlua_getnumbertype(L, 2); - // get this - wxListCtrl * self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl); - // call SetWindowStyleFlag - self->SetWindowStyleFlag(style); - - return 0; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxListCtrl_SortItems[] = { &s_wxluatag_wxListCtrl, &s_wxluaarg_LuaFunction, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxListCtrl_SortItems(lua_State *L); --- 4401,4404 ---- *************** *** 4771,4779 **** { "ScrollList", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxListCtrl_ScrollList, 1, NULL }, - - #if (wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL) && (wxLUA_USE_wxColourPenBrush) - { "SetBackgroundColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxListCtrl_SetBackgroundColour, 1, NULL }, - #endif // (wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL) && (wxLUA_USE_wxColourPenBrush) - { "SetColumn", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxListCtrl_SetColumn, 1, NULL }, { "SetColumnWidth", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxListCtrl_SetColumnWidth, 1, NULL }, --- 4733,4736 ---- *************** *** 4812,4816 **** #endif // (wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL) && (wxLUA_USE_wxColourPenBrush) - { "SetWindowStyleFlag", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxListCtrl_SetWindowStyleFlag, 1, NULL }, { "SortItems", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxListCtrl_SortItems, 1, NULL }, --- 4769,4772 ---- *************** *** 11643,11663 **** #endif // (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxImageList) - static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_SetWindowStyle[] = { &s_wxluatag_wxTreeCtrl, &s_wxluaarg_Number, NULL }; - static int LUACALL wxLua_wxTreeCtrl_SetWindowStyle(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreeCtrl_SetWindowStyle[1] = {{ wxLua_wxTreeCtrl_SetWindowStyle, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTreeCtrl_SetWindowStyle }}; - // void SetWindowStyle(long styles) - static int LUACALL wxLua_wxTreeCtrl_SetWindowStyle(lua_State *L) - { - wxLuaState wxlState(L); - // long styles - long styles = (long)wxlua_getnumbertype(L, 2); - // get this - wxTreeCtrl * self = (wxTreeCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeCtrl); - // call SetWindowStyle - self->SetWindowStyle(styles); - - return 0; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_SortChildren[] = { &s_wxluatag_wxTreeCtrl, &s_wxluatag_wxTreeItemId, NULL }; static int LUACALL wxLua_wxTreeCtrl_SortChildren(lua_State *L); --- 11599,11602 ---- *************** *** 11988,11992 **** #endif // (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxImageList) - { "SetWindowStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeCtrl_SetWindowStyle, 1, NULL }, { "SortChildren", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeCtrl_SortChildren, 1, NULL }, { "Toggle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeCtrl_Toggle, 1, NULL }, --- 11927,11930 ---- Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** data.cpp 13 Jun 2007 00:08:58 -0000 1.49 --- data.cpp 13 Jun 2007 04:15:24 -0000 1.50 *************** *** 314,317 **** --- 314,337 ---- #endif // (wxLUA_USE_wxObject) && (wxLUA_USE_wxClassInfo) + static wxLuaArgTag s_wxluatagArray_wxLua_wxObject_IsSameAs[] = { &s_wxluatag_wxObject, &s_wxluatag_wxObject, NULL }; + static int LUACALL wxLua_wxObject_IsSameAs(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxObject_IsSameAs[1] = {{ wxLua_wxObject_IsSameAs, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxObject_IsSameAs }}; + // bool IsSameAs(const wxObject& o) const + static int LUACALL wxLua_wxObject_IsSameAs(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // const wxObject o + const wxObject * o = (const wxObject *)wxlState.GetUserDataType(2, s_wxluatag_wxObject); + // get this + wxObject * self = (wxObject *)wxlState.GetUserDataType(1, s_wxluatag_wxObject); + // call IsSameAs + returns = self->IsSameAs(*o); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxObject_Ref[] = { &s_wxluatag_wxObject, &s_wxluatag_wxObject, NULL }; static int LUACALL wxLua_wxObject_Ref(lua_State *L); *************** *** 399,402 **** --- 419,423 ---- #endif // (wxLUA_USE_wxObject) && (wxLUA_USE_wxClassInfo) + { "IsSameAs", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxObject_IsSameAs, 1, NULL }, { "Ref", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxObject_Ref, 1, NULL }, { "SetRefData", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxObject_SetRefData, 1, NULL }, *************** *** 500,503 **** --- 521,560 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxClassInfo_GetBaseClass1[] = { &s_wxluatag_wxClassInfo, NULL }; + static int LUACALL wxLua_wxClassInfo_GetBaseClass1(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxClassInfo_GetBaseClass1[1] = {{ wxLua_wxClassInfo_GetBaseClass1, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxClassInfo_GetBaseClass1 }}; + // const wxClassInfo *GetBaseClass1() const + static int LUACALL wxLua_wxClassInfo_GetBaseClass1(lua_State *L) + { + wxLuaState wxlState(L); + const wxClassInfo *returns; + // get this + wxClassInfo * self = (wxClassInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxClassInfo); + // call GetBaseClass1 + returns = (const wxClassInfo *)self->GetBaseClass1(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxClassInfo, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxClassInfo_GetBaseClass2[] = { &s_wxluatag_wxClassInfo, NULL }; + static int LUACALL wxLua_wxClassInfo_GetBaseClass2(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxClassInfo_GetBaseClass2[1] = {{ wxLua_wxClassInfo_GetBaseClass2, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxClassInfo_GetBaseClass2 }}; + // const wxClassInfo *GetBaseClass2() const + static int LUACALL wxLua_wxClassInfo_GetBaseClass2(lua_State *L) + { + wxLuaState wxlState(L); + const wxClassInfo *returns; + // get this + wxClassInfo * self = (wxClassInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxClassInfo); + // call GetBaseClass2 + returns = (const wxClassInfo *)self->GetBaseClass2(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxClassInfo, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxClassInfo_GetBaseClassName1[] = { &s_wxluatag_wxClassInfo, NULL }; static int LUACALL wxLua_wxClassInfo_GetBaseClassName1(lua_State *L); *************** *** 554,557 **** --- 611,647 ---- } + static int LUACALL wxLua_wxClassInfo_GetFirst(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxClassInfo_GetFirst[1] = {{ wxLua_wxClassInfo_GetFirst, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; + // static const wxClassInfo *GetFirst() + static int LUACALL wxLua_wxClassInfo_GetFirst(lua_State *L) + { + wxLuaState wxlState(L); + const wxClassInfo *returns; + // call GetFirst + returns = (const wxClassInfo *)wxClassInfo::GetFirst(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxClassInfo, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxClassInfo_GetNext[] = { &s_wxluatag_wxClassInfo, NULL }; + static int LUACALL wxLua_wxClassInfo_GetNext(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxClassInfo_GetNext[1] = {{ wxLua_wxClassInfo_GetNext, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxClassInfo_GetNext }}; + // const wxClassInfo *GetNext() const + static int LUACALL wxLua_wxClassInfo_GetNext(lua_State *L) + { + wxLuaState wxlState(L); + const wxClassInfo *returns; + // get this + wxClassInfo * self = (wxClassInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxClassInfo); + // call GetNext + returns = (const wxClassInfo *)self->GetNext(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxClassInfo, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxClassInfo_GetSize[] = { &s_wxluatag_wxClassInfo, NULL }; static int LUACALL wxLua_wxClassInfo_GetSize(lua_State *L); *************** *** 572,575 **** --- 662,683 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxClassInfo_IsDynamic[] = { &s_wxluatag_wxClassInfo, NULL }; + static int LUACALL wxLua_wxClassInfo_IsDynamic(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxClassInfo_IsDynamic[1] = {{ wxLua_wxClassInfo_IsDynamic, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxClassInfo_IsDynamic }}; + // bool IsDynamic() + static int LUACALL wxLua_wxClassInfo_IsDynamic(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxClassInfo * self = (wxClassInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxClassInfo); + // call IsDynamic + returns = self->IsDynamic(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxClassInfo_IsKindOf[] = { &s_wxluatag_wxClassInfo, &s_wxluatag_wxClassInfo, NULL }; static int LUACALL wxLua_wxClassInfo_IsKindOf(lua_State *L); *************** *** 623,630 **** --- 731,743 ---- { "FindClass", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxClassInfo_FindClass, 1, NULL }, + { "GetBaseClass1", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxClassInfo_GetBaseClass1, 1, NULL }, + { "GetBaseClass2", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxClassInfo_GetBaseClass2, 1, NULL }, { "GetBaseClassName1", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxClassInfo_GetBaseClassName1, 1, NULL }, { "GetBaseClassName2", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxClassInfo_GetBaseClassName2, 1, NULL }, { "GetClassName", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxClassInfo_GetClassName, 1, NULL }, + { "GetFirst", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxClassInfo_GetFirst, 1, NULL }, + { "GetNext", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxClassInfo_GetNext, 1, NULL }, { "GetSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxClassInfo_GetSize, 1, NULL }, + { "IsDynamic", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxClassInfo_IsDynamic, 1, NULL }, { "IsKindOf", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxClassInfo_IsKindOf, 1, NULL }, { "wxClassInfo", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxClassInfo_constructor, 1, NULL }, Index: help.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/help.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** help.cpp 13 Jun 2007 00:09:01 -0000 1.38 --- help.cpp 13 Jun 2007 04:15:26 -0000 1.39 *************** *** 1278,1296 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlHelpController_DisplayContents[] = { &s_wxluatag_wxHtmlHelpController, NULL }; - static int LUACALL wxLua_wxHtmlHelpController_DisplayContents(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlHelpController_DisplayContents[1] = {{ wxLua_wxHtmlHelpController_DisplayContents, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxHtmlHelpController_DisplayContents }}; - // void DisplayContents() - static int LUACALL wxLua_wxHtmlHelpController_DisplayContents(lua_State *L) - { - wxLuaState wxlState(L); - // get this - wxHtmlHelpController * self = (wxHtmlHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlHelpController); - // call DisplayContents - self->DisplayContents(); - - return 0; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlHelpController_DisplayIndex[] = { &s_wxluatag_wxHtmlHelpController, NULL }; static int LUACALL wxLua_wxHtmlHelpController_DisplayIndex(lua_State *L); --- 1278,1281 ---- *************** *** 1521,1525 **** #endif // ((wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) && (wxLUA_USE_wxHelpController && wxUSE_HELP)) - { "DisplayContents", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHtmlHelpController_DisplayContents, 1, NULL }, { "DisplayIndex", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHtmlHelpController_DisplayIndex, 1, NULL }, --- 1506,1509 ---- Index: socket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/socket.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** socket.cpp 13 Jun 2007 00:09:02 -0000 1.41 --- socket.cpp 13 Jun 2007 04:15:27 -0000 1.42 *************** *** 1941,1967 **** #endif // (wxLUA_USE_wxArrayString) && ((wxUSE_PROTOCOL_FTP) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS)) - #if (wxUSE_STREAMS) && ((wxUSE_PROTOCOL_FTP) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS)) - static wxLuaArgTag s_wxluatagArray_wxLua_wxFTP_GetInputStream[] = { &s_wxluatag_wxFTP, &s_wxluaarg_String, NULL }; - static int LUACALL wxLua_wxFTP_GetInputStream(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxFTP_GetInputStream[1] = {{ wxLua_wxFTP_GetInputStream, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFTP_GetInputStream }}; - // wxInputStream * GetInputStream(const wxString& path) - static int LUACALL wxLua_wxFTP_GetInputStream(lua_State *L) - { - wxLuaState wxlState(L); - wxInputStream *returns; - // const wxString path - const wxString path = wxlState.GetwxStringType(2); - // get this - wxFTP * self = (wxFTP *)wxlState.GetUserDataType(1, s_wxluatag_wxFTP); - // call GetInputStream - returns = (wxInputStream *)self->GetInputStream(path); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns); - - return 1; - } - - #endif // (wxUSE_STREAMS) && ((wxUSE_PROTOCOL_FTP) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS)) - static wxLuaArgTag s_wxluatagArray_wxLua_wxFTP_GetLastResult[] = { &s_wxluatag_wxFTP, NULL }; static int LUACALL wxLua_wxFTP_GetLastResult(lua_State *L); --- 1941,1944 ---- *************** *** 2179,2199 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxFTP_SetPassword[] = { &s_wxluatag_wxFTP, &s_wxluaarg_String, NULL }; - static int LUACALL wxLua_wxFTP_SetPassword(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxFTP_SetPassword[1] = {{ wxLua_wxFTP_SetPassword, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFTP_SetPassword }}; - // void SetPassword(const wxString& passwd) - static int LUACALL wxLua_wxFTP_SetPassword(lua_State *L) - { - wxLuaState wxlState(L); - // const wxString passwd - const wxString passwd = wxlState.GetwxStringType(2); - // get this - wxFTP * self = (wxFTP *)wxlState.GetUserDataType(1, s_wxluatag_wxFTP); - // call SetPassword - self->SetPassword(passwd); - - return 0; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxFTP_SetTransferMode[] = { &s_wxluatag_wxFTP, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxFTP_SetTransferMode(lua_State *L); --- 2156,2159 ---- *************** *** 2216,2236 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxFTP_SetUser[] = { &s_wxluatag_wxFTP, &s_wxluaarg_String, NULL }; - static int LUACALL wxLua_wxFTP_SetUser(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxFTP_SetUser[1] = {{ wxLua_wxFTP_SetUser, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFTP_SetUser }}; - // void SetUser(const wxString& user) - static int LUACALL wxLua_wxFTP_SetUser(lua_State *L) - { - wxLuaState wxlState(L); - // const wxString user - const wxString user = wxlState.GetwxStringType(2); - // get this - wxFTP * self = (wxFTP *)wxlState.GetUserDataType(1, s_wxluatag_wxFTP); - // call SetUser - self->SetUser(user); - - return 0; - } - static int LUACALL wxLua_wxFTP_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxFTP_constructor[1] = {{ wxLua_wxFTP_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; --- 2176,2179 ---- *************** *** 2271,2278 **** #endif // (wxLUA_USE_wxArrayString) && ((wxUSE_PROTOCOL_FTP) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS)) - #if (wxUSE_STREAMS) && ((wxUSE_PROTOCOL_FTP) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS)) - { "GetInputStream", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFTP_GetInputStream, 1, NULL }, - #endif // (wxUSE_STREAMS) && ((wxUSE_PROTOCOL_FTP) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS)) - { "GetLastResult", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFTP_GetLastResult, 1, NULL }, --- 2214,2217 ---- *************** *** 2290,2296 **** { "SetBinary", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFTP_SetBinary, 1, NULL }, { "SetPassive", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFTP_SetPassive, 1, NULL }, - { "SetPassword", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFTP_SetPassword, 1, NULL }, { "SetTransferMode", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFTP_SetTransferMode, 1, NULL }, - { "SetUser", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFTP_SetUser, 1, NULL }, { "wxFTP", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFTP_constructor, 1, NULL }, --- 2229,2233 ---- Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** dialogs.cpp 13 Jun 2007 00:08:59 -0000 1.44 --- dialogs.cpp 13 Jun 2007 04:15:24 -0000 1.45 *************** *** 35,58 **** int s_wxluatag_wxDialog = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_Centre[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; - static int LUACALL wxLua_wxDialog_Centre(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxDialog_Centre[1] = {{ wxLua_wxDialog_Centre, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxDialog_Centre }}; - // void Centre(int direction = wxBOTH) - static int LUACALL wxLua_wxDialog_Centre(lua_State *L) - { - wxLuaState wxlState(L); - // get number of arguments - int argCount = lua_gettop(L); - // int direction = wxBOTH - int direction = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxBOTH); - // get this - wxDialog * self = (wxDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxDialog); - // call Centre - self->Centre(direction); - - return 0; - } - - #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDialog) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_Create[] = { &s_wxluatag_wxDialog, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; --- 35,38 ---- *************** *** 219,240 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_GetTitle[] = { &s_wxluatag_wxDialog, NULL }; - static int LUACALL wxLua_wxDialog_GetTitle(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxDialog_GetTitle[1] = {{ wxLua_wxDialog_GetTitle, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxDialog_GetTitle }}; - // wxString GetTitle() const - static int LUACALL wxLua_wxDialog_GetTitle(lua_State *L) - { - wxLuaState wxlState(L); - wxString returns; - // get this - wxDialog * self = (wxDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxDialog); - // call GetTitle - returns = self->GetTitle(); - // push the result string - wxlState.lua_PushString(returns); - - return 1; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_IsModal[] = { &s_wxluatag_wxDialog, NULL }; static int LUACALL wxLua_wxDialog_IsModal(lua_State *L); --- 199,202 ---- *************** *** 272,295 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_Show[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Boolean, NULL }; - static int LUACALL wxLua_wxDialog_Show(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxDialog_Show[1] = {{ wxLua_wxDialog_Show, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxDialog_Show }}; - // bool Show(const bool show) - static int LUACALL wxLua_wxDialog_Show(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // const bool show - const bool show = wxlua_getbooleantype(L, 2); - // get this - wxDialog * self = (wxDialog *)wxlState.GetUserDataType(1, s_wxluatag_wxDialog); - // call Show - returns = self->Show(show); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_ShowModal[] = { &s_wxluatag_wxDialog, NULL }; static int LUACALL wxLua_wxDialog_ShowModal(lua_State *L); --- 234,237 ---- *************** *** 395,400 **** // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxDialog_methods[] = { - { "Centre", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_Centre, 1, NULL }, - #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDialog) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_Create, 1, NULL }, --- 337,340 ---- *************** *** 419,426 **** { "EndModal", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_EndModal, 1, NULL }, { "GetReturnCode", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_GetReturnCode, 1, NULL }, - { "GetTitle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_GetTitle, 1, NULL }, { "IsModal", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_IsModal, 1, NULL }, { "SetReturnCode", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_SetReturnCode, 1, NULL }, - { "Show", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_Show, 1, NULL }, { "ShowModal", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_ShowModal, 1, NULL }, --- 359,364 ---- Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** appframe.cpp 13 Jun 2007 00:08:58 -0000 1.50 --- appframe.cpp 13 Jun 2007 04:15:23 -0000 1.51 *************** *** 1608,1631 **** int s_wxluatag_wxFrame = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxFrame_Centre[] = { &s_wxluatag_wxFrame, &s_wxluaarg_Number, NULL }; - static int LUACALL wxLua_wxFrame_Centre(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxFrame_Centre[1] = {{ wxLua_wxFrame_Centre, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxFrame_Centre }}; - // void Centre(int direction = wxBOTH) - static int LUACALL wxLua_wxFrame_Centre(lua_State *L) - { - wxLuaState wxlState(L); - // get number of arguments - int argCount = lua_gettop(L); - // int direction = wxBOTH - int direction = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxBOTH); - // get this - wxFrame * self = (wxFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxFrame); - // call Centre - self->Centre(direction); - - return 0; - } - - #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxFrame_Create[] = { &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; --- 1608,1611 ---- *************** *** 2067,2072 **** // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxFrame_methods[] = { - { "Centre", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFrame_Centre, 1, NULL }, - #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxPointSizeRect) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFrame_Create, 1, NULL }, --- 2047,2050 ---- Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** windows.cpp 13 Jun 2007 00:09:02 -0000 1.57 --- windows.cpp 13 Jun 2007 04:15:27 -0000 1.58 *************** *** 4734,4752 **** #endif // wxLUA_USE_wxPointSizeRect - static wxLuaArgTag s_wxluatagArray_wxLua_wxPanel_InitDialog[] = { &s_wxluatag_wxPanel, NULL }; - static int LUACALL wxLua_wxPanel_InitDialog(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxPanel_InitDialog[1] = {{ wxLua_wxPanel_InitDialog, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxPanel_InitDialog }}; - // void InitDialog() - static int LUACALL wxLua_wxPanel_InitDialog(lua_State *L) - { - wxLuaState wxlState(L); - // get this - wxPanel * self = (wxPanel *)wxlState.GetUserDataType(1, s_wxluatag_wxPanel); - // call InitDialog - self->InitDialog(); - - return 0; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxPanel_SetFocusIgnoringChildren[] = { &s_wxluatag_wxPanel, NULL }; static int LUACALL wxLua_wxPanel_SetFocusIgnoringChildren(lua_State *L); --- 4734,4737 ---- *************** *** 4850,4854 **** #endif // wxLUA_USE_wxPointSizeRect - { "InitDialog", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPanel_InitDialog, 1, NULL }, { "SetFocusIgnoringChildren", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPanel_SetFocusIgnoringChildren, 1, NULL }, --- 4835,4838 ---- *************** *** 4925,4949 **** #endif // (wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxPointSizeRect) - #if !wxCHECK_VERSION(2,6,0) - static wxLuaArgTag s_wxluatagArray_wxLua_wxControl_GetLabel[] = { &s_wxluatag_wxControl, NULL }; - static int LUACALL wxLua_wxControl_GetLabel(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxControl_GetLabel[1] = {{ wxLua_wxControl_GetLabel, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxControl_GetLabel }}; - // !%wxchkver_2_6 wxString GetLabel() // see wxWindow - static int LUACALL wxLua_wxControl_GetLabel(lua_State *L) - { - wxLuaState wxlState(L); - wxString returns; - // get this - wxControl * self = (wxControl *)wxlState.GetUserDataType(1, s_wxluatag_wxControl); - // call GetLabel - returns = self->GetLabel(); - // push the result string - wxlState.lua_PushString(returns); - - return 1; - } - - #endif // !wxCHECK_VERSION(2,6,0) - #if wxCHECK_VERSION(2,8,0) static wxLuaArgTag s_wxluatagArray_wxLua_wxControl_GetLabelText[] = { &s_wxluatag_wxControl, NULL }; --- 4909,4912 ---- *************** *** 4967,4990 **** #endif // wxCHECK_VERSION(2,8,0) - #if !wxCHECK_VERSION(2,6,0) - static wxLuaArgTag s_wxluatagArray_wxLua_wxControl_SetLabel[] = { &s_wxluatag_wxControl, &s_wxluaarg_String, NULL }; - static int LUACALL wxLua_wxControl_SetLabel(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxControl_SetLabel[1] = {{ wxLua_wxControl_SetLabel, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxControl_SetLabel }}; - // !%wxchkver_2_6 void SetLabel(const wxString& label) // see wxWindow - static int LUACALL wxLua_wxControl_SetLabel(lua_State *L) - { - wxLuaState wxlState(L); - // const wxString label - const wxString label = wxlState.GetwxStringType(2); - // get this - wxControl * self = (wxControl *)wxlState.GetUserDataType(1, s_wxluatag_wxControl); - // call SetLabel - self->SetLabel(label); - - return 0; - } - - #endif // !wxCHECK_VERSION(2,6,0) - #if (wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxControl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; --- 4930,4933 ---- *************** *** 5076,5091 **** #endif // (wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxPointSizeRect) - #if !wxCHECK_VERSION(2,6,0) - { "GetLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxControl_GetLabel, 1, NULL }, - #endif // !wxCHECK_VERSION(2,6,0) - #if wxCHECK_VERSION(2,8,0) { "GetLabelText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxControl_GetLabelText, 1, NULL }, #endif // wxCHECK_VERSION(2,8,0) - #if !wxCHECK_VERSION(2,6,0) - { "SetLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxControl_SetLabel, 1, NULL }, - #endif // !wxCHECK_VERSION(2,6,0) - #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxPointSizeRect)) { "wxControl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxControl_constructor_overload, s_wxluafunc_wxLua_wxControl_constructor_overload_count, 0 }, --- 5019,5026 ---- *************** *** 8861,8903 **** - static wxLuaArgTag s_wxluatagArray_wxLua_wxScrolledWindow_GetVirtualSize[] = { &s_wxluatag_wxScrolledWindow, NULL }; - static int LUACALL wxLua_wxScrolledWindow_GetVirtualSize(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxScrolledWindow_GetVirtualSize[1] = {{ wxLua_wxScrolledWindow_GetVirtualSize, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxScrolledWindow_GetVirtualSize }}; - // %override wxLua_wxScrolledWindow_GetVirtualSize - // void GetVirtualSize(int* x, int* y) const - static int LUACALL wxLua_wxScrolledWindow_GetVirtualSize(lua_State *L) - { - wxLuaState wxlState(L); - int y; - int x; - // get this - wxScrolledWindow *self = (wxScrolledWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxScrolledWindow); - // call GetVirtualSize - self->GetVirtualSize(&x, &y); - lua_pushnumber(L, x); - lua_pushnumber(L, y); - // return the number of parameters - return 2; - } - - - static wxLuaArgTag s_wxluatagArray_wxLua_wxScrolledWindow_IsRetained[] = { &s_wxluatag_wxScrolledWindow, NULL }; - static int LUACALL wxLua_wxScrolledWindow_IsRetained(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxScrolledWindow_IsRetained[1] = {{ wxLua_wxScrolledWindow_IsRetained, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxScrolledWindow_IsRetained }}; - // bool IsRetained() const - static int LUACALL wxLua_wxScrolledWindow_IsRetained(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // get this - wxScrolledWindow * self = (wxScrolledWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxScrolledWindow); - // call IsRetained - returns = self->IsRetained(); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - #if (wxLUA_USE_wxScrolledWindow) && (wxLUA_USE_wxDC) --- 8796,8799 ---- *************** *** 9100,9105 **** { "GetScrollPixelsPerUnit", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxScrolledWindow_GetScrollPixelsPerUnit, 1, NULL }, { "GetViewStart", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxScrolledWindow_GetViewStart, 1, NULL }, - { "GetVirtualSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxScrolledWindow_GetVirtualSize, 1, NULL }, - { "IsRetained", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxScrolledWindow_IsRetained, 1, NULL }, #if (wxLUA_USE_wxScrolledWindow) && (wxLUA_USE_wxDC) --- 8996,8999 ---- *************** *** 10165,10203 **** #endif // (wxLUA_USE_wxStaticText && wxUSE_STATTEXT) && (wxLUA_USE_wxPointSizeRect) - static wxLuaArgTag s_wxluatagArray_wxLua_wxStaticText_GetLabel[] = { &s_wxluatag_wxStaticText, NULL }; - static int LUACALL wxLua_wxStaticText_GetLabel(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxStaticText_GetLabel[1] = {{ wxLua_wxStaticText_GetLabel, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStaticText_GetLabel }}; - // wxString GetLabel() const - static int LUACALL wxLua_wxStaticText_GetLabel(lua_State *L) - { - wxLuaState wxlState(L); - wxString returns; - // get this - wxStaticText * self = (wxStaticText *)wxlState.GetUserDataType(1, s_wxluatag_wxStaticText); - // call GetLabel - returns = self->GetLabel(); - // push the result string - wxlState.lua_PushString(returns); - - return 1; - } - - static wxLuaArgTag s_wxluatagArray_wxLua_wxStaticText_SetLabel[] = { &s_wxluatag_wxStaticText, &s_wxluaarg_String, NULL }; - static int LUACALL wxLua_wxStaticText_SetLabel(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxStaticText_SetLabel[1] = {{ wxLua_wxStaticText_SetLabel, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStaticText_SetLabel }}; - // virtual void SetLabel(const wxString& label) - static int LUACALL wxLua_wxStaticText_SetLabel(lua_State *L) - { - wxLuaState wxlState(L); - // const wxString label - const wxString label = wxlState.GetwxStringType(2); - // get this - wxStaticText * self = (wxStaticText *)wxlState.GetUserDataType(1, s_wxluatag_wxStaticText); - // call SetLabel - self->SetLabel(label); - - return 0; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxStaticText_Wrap[] = { &s_wxluatag_wxStaticText, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxStaticText_Wrap(lua_State *L); --- 10059,10062 ---- *************** *** 10306,10311 **** #endif // (wxLUA_USE_wxStaticText && wxUSE_STATTEXT) && (wxLUA_USE_wxPointSizeRect) - { "GetLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStaticText_GetLabel, 1, NULL }, - { "SetLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStaticText_SetLabel, 1, NULL }, { "Wrap", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStaticText_Wrap, 1, NULL }, --- 10165,10168 ---- Index: menutool.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/menutool.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** menutool.cpp 13 Jun 2007 00:09:01 -0000 1.41 --- menutool.cpp 13 Jun 2007 04:15:26 -0000 1.42 *************** *** 2172,2255 **** int s_wxluatag_wxMenuItemList = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxMenuItemList_Clear[] = { &s_wxluatag_wxMenuItemList, NULL }; - static int LUACALL wxLua_wxMenuItemList_Clear(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItemList_Clear[1] = {{ wxLua_wxMenuItemList_Clear, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMenuItemList_Clear }}; - // void Clear() - static int LUACALL wxLua_wxMenuItemList_Clear(lua_State *L) - { - wxLuaState wxlState(L); - // get this - wxMenuItemList * self = (wxMenuItemList *)wxlState.GetUserDataType(1, s_wxluatag_wxMenuItemList); - // call Clear - self->Clear(); - - return 0; - } - - static wxLuaArgTag s_wxluatagArray_wxLua_wxMenuItemList_DeleteContents[] = { &s_wxluatag_wxMenuItemList, &s_wxluaarg_Boolean, NULL }; - static int LUACALL wxLua_wxMenuItemList_DeleteContents(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItemList_DeleteContents[1] = {{ wxLua_wxMenuItemList_DeleteContents, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMenuItemList_DeleteContents }}; - // void DeleteContents(bool destroy) - static int LUACALL wxLua_wxMenuItemList_DeleteContents(lua_State *L) - { - wxLuaState wxlState(L); - // bool destroy - bool destroy = wxlua_getbooleantype(L, 2); - // get this - wxMenuItemList * self = (wxMenuItemList *)wxlState.GetUserDataType(1, s_wxluatag_wxMenuItemList); - // call DeleteContents - self->DeleteContents(destroy); - - return 0; - } - - static wxLuaArgTag s_wxluatagArray_wxLua_wxMenuItemList_DeleteObject[] = { &s_wxluatag_wxMenuItemList, &s_wxluatag_wxMenuItem, NULL }; - static int LUACALL wxLua_wxMenuItemList_DeleteObject(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItemList_DeleteObject[1] = {{ wxLua_wxMenuItemList_DeleteObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMenuItemList_DeleteObject }}; - // bool DeleteObject(wxMenuItem *pMenuItem) - static int LUACALL wxLua_wxMenuItemList_DeleteObject(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // wxMenuItem pMenuItem - wxMenuItem * pMenuItem = (wxMenuItem *)wxlState.GetUserDataType(2, s_wxluatag_wxMenuItem); - // get this - wxMenuItemList * self = (wxMenuItemList *)wxlState.GetUserDataType(1, s_wxluatag_wxMenuItemList); - // call DeleteObject - returns = self->DeleteObject(pMenuItem); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - - static wxLuaArgTag s_wxluatagArray_wxLua_wxMenuItemList_GetCount[] = { &s_wxluatag_wxMenuItemList, NULL }; - static int LUACALL wxLua_wxMenuItemList_GetCount(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItemList_GetCount[1] = {{ wxLua_wxMenuItemList_GetCount, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMenuItemList_GetCount }}; - // int GetCount() const - static int LUACALL wxLua_wxMenuItemList_GetCount(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // get this - wxMenuItemList * self = (wxMenuItemList *)wxlState.GetUserDataType(1, s_wxluatag_wxMenuItemList); - // call GetCount - returns = self->GetCount(); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - - // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxMenuItemList_methods[] = { - { "Clear", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItemList_Clear, 1, NULL }, - { "DeleteContents", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItemList_DeleteContents, 1, NULL }, - { "DeleteObject", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItemList_DeleteObject, 1, NULL }, - { "GetCount", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItemList_GetCount, 1, NULL }, - { 0, 0, 0, 0 }, }; --- 2172,2179 ---- Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** mdi.cpp 12 Jun 2007 00:08:39 -0000 1.38 --- mdi.cpp 13 Jun 2007 04:15:26 -0000 1.39 *************** *** 189,210 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxMDIParentFrame_GetToolBar[] = { &s_wxluatag_wxMDIParentFrame, NULL }; - static int LUACALL wxLua_wxMDIParentFrame_GetToolBar(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxMDIParentFrame_GetToolBar[1] = {{ wxLua_wxMDIParentFrame_GetToolBar, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMDIParentFrame_GetToolBar }}; - // virtual wxWindow* GetToolBar() const - static int LUACALL wxLua_wxMDIParentFrame_GetToolBar(lua_State *L) - { - wxLuaState wxlState(L); - wxWindow *returns; - // get this - wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame); - // call GetToolBar - returns = (wxWindow *)self->GetToolBar(); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); - - return 1; - } - #if ((defined(__WXMSW__)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxMenu && wxUSE_MENUS) --- 189,192 ---- *************** *** 227,253 **** } - #endif // ((defined(__WXMSW__)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxMenu && wxUSE_MENUS) - - #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxToolbar) - static wxLuaArgTag s_wxluatagArray_wxLua_wxMDIParentFrame_SetToolBar[] = { &s_wxluatag_wxMDIParentFrame, &s_wxluatag_wxToolBar, NULL }; - static int LUACALL wxLua_wxMDIParentFrame_SetToolBar(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxMDIParentFrame_SetToolBar[1] = {{ wxLua_wxMDIParentFrame_SetToolBar, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMDIParentFrame_SetToolBar }}; - // virtual void SetToolBar(wxToolBar* toolbar) - static int LUACALL wxLua_wxMDIParentFrame_SetToolBar(lua_State *L) - { - wxLuaState wxlState(L); - // wxToolBar toolbar - wxToolBar * toolbar = (wxToolBar *)wxlState.GetUserDataType(2, s_wxluatag_wxToolBar); - // get this - wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame); - // call SetToolBar - self->SetToolBar(toolbar); - - return 0; - } - - #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxToolbar) - - #if ((defined(__WXMSW__)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxMenu && wxUSE_MENUS) static wxLuaArgTag s_wxluatagArray_wxLua_wxMDIParentFrame_SetWindowMenu[] = { &s_wxluatag_wxMDIParentFrame, &s_wxluatag_wxMenu, NULL }; static int LUACALL wxLua_wxMDIParentFrame_SetWindowMenu(lua_State *L); --- 209,212 ---- *************** *** 384,398 **** { "GetActiveChild", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMDIParentFrame_GetActiveChild, 1, NULL }, { "GetClientWindow", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMDIParentFrame_GetClientWindow, 1, NULL }, - { "GetToolBar", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMDIParentFrame_GetToolBar, 1, NULL }, #if ((defined(__WXMSW__)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxMenu && wxUSE_MENUS) { "GetWindowMenu", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMDIParentFrame_GetWindowMenu, 1, NULL }, - #endif // ((defined(__WXMSW__)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxMenu && wxUSE_MENUS) - - #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxToolbar) - { "SetToolBar", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMDIParentFrame_SetToolBar, 1, NULL }, - #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxToolbar) - - #if ((defined(__WXMSW__)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxMenu && wxUSE_MENUS) { "SetWindowMenu", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMDIParentFrame_SetWindowMenu, 1, NULL }, #endif // ((defined(__WXMSW__)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxMenu && wxUSE_MENUS) --- 343,349 ---- Index: html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/html.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** html.cpp 13 Jun 2007 00:09:01 -0000 1.44 --- html.cpp 13 Jun 2007 04:15:26 -0000 1.45 *************** *** 1001,1046 **** #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxHTML && wxUSE_HTML) - #if ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxHTML && wxUSE_HTML) - static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlContainerCell_GetFirstCell[] = { &s_wxluatag_wxHtmlContainerCell, NULL }; - static int LUACALL wxLua_wxHtmlContainerCell_GetFirstCell(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlContainerCell_GetFirstCell[1] = {{ wxLua_wxHtmlContainerCell_GetFirstCell, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxHtmlContainerCell_GetFirstCell }}; - // !%wxchkver_2_5 wxHtmlCell* GetFirstCell() - static int LUACALL wxLua_wxHtmlContainerCell_GetFirstCell(lua_State *L) - { - wxLuaState wxlState(L); - wxHtmlCell *returns; - // get this - wxHtmlContainerCell * self = (wxHtmlContainerCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlContainerCell); - // call GetFirstCell - returns = (wxHtmlCell *)self->GetFirstCell(); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxHtmlCell, returns); - - return 1; - } - - #endif // ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxHTML && wxUSE_HTML) - - #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxHTML && wxUSE_HTML) - static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlContainerCell_GetFirstChild[] = { &s_wxluatag_wxHtmlContainerCell, NULL }; - static int LUACALL wxLua_wxHtmlContainerCell_GetFirstChild(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlContainerCell_GetFirstChild[1] = {{ wxLua_wxHtmlContainerCell_GetFirstChild, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxHtmlContainerCell_GetFirstChild }}; - // %wxchkver_2_5 wxHtmlCell* GetFirstChild() - static int LUACALL wxLua_wxHtmlContainerCell_GetFirstChild(lua_State *L) - { - wxLuaState wxlState(L); - wxHtmlCell *returns; - // get this - wxHtmlContainerCell * self = (wxHtmlContainerCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlContainerCell); - // call GetFirstChild - returns = (wxHtmlCell *)self->GetFirstChild(); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxHtmlCell, returns); - - return 1; - } - - #endif // ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxHTML && wxUSE_HTML) - static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlContainerCell_GetIndent[] = { &s_wxluatag_wxHtmlContainerCell, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxHtmlContainerCell_GetIndent(lua_State *L); --- 1001,1004 ---- *************** *** 1326,1337 **** #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxHTML && wxUSE_HTML) - #if ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxHTML && wxUSE_HTML) - { "GetFirstCell", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHtmlContainerCell_GetFirstCell, 1, NULL }, - #endif // ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxHTML && wxUSE_HTML) - - #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxHTML && wxUSE_HTML) - { "GetFirstChild", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHtmlContainerCell_GetFirstChild, 1, NULL }, - #endif // ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) && (wxLUA_USE_wxHTML && wxUSE_HTML) - { "GetIndent", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHtmlContainerCell_GetIndent, 1, NULL }, { "GetIndentUnits", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHtmlContainerCell_GetIndentUnits, 1, NULL }, --- 1284,1287 ---- Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** wx_bind.cpp 13 Jun 2007 00:09:02 -0000 1.103 --- wx_bind.cpp 13 Jun 2007 04:15:28 -0000 1.104 *************** *** 6724,6728 **** #if wxLUA_USE_wxClassInfo ! { "wxClassInfo", wxClassInfo_methods, wxClassInfo_methodCount, NULL, &s_wxluatag_wxClassInfo, "wxObject", NULL ,s_wxluadefineArray_None, 0, }, #endif // wxLUA_USE_wxClassInfo --- 6724,6728 ---- #if wxLUA_USE_wxClassInfo ! { "wxClassInfo", wxClassInfo_methods, wxClassInfo_methodCount, NULL, &s_wxluatag_wxClassInfo, NULL, NULL ,s_wxluadefineArray_None, 0, }, #endif // wxLUA_USE_wxClassInfo Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** gdi.cpp 13 Jun 2007 00:08:59 -0000 1.67 --- gdi.cpp 13 Jun 2007 04:15:25 -0000 1.68 *************** *** 8552,8577 **** } - #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxCursor) - - static wxLuaArgTag s_wxluatagArray_wxLua_wxCursor_Ok[] = { &s_wxluatag_wxCursor, NULL }; - static int LUACALL wxLua_wxCursor_Ok(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxCursor_Ok[1] = {{ wxLua_wxCursor_Ok, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxCursor_Ok }}; - // bool Ok() - static int LUACALL wxLua_wxCursor_Ok(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // get this - wxCursor * self = (wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor); - // call Ok - returns = self->Ok(); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - - - #if (defined(__WXMSW__)) && (wxLUA_USE_wxCursor) static wxLuaArgTag s_wxluatagArray_wxLua_wxCursor_SetDepth[] = { &s_wxluatag_wxCursor, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxCursor_SetDepth(lua_State *L); --- 8552,8555 ---- *************** *** 8785,8793 **** { "GetHeight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCursor_GetHeight, 1, NULL }, { "GetWidth", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCursor_GetWidth, 1, NULL }, - #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxCursor) - - { "Ok", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCursor_Ok, 1, NULL }, - - #if (defined(__WXMSW__)) && (wxLUA_USE_wxCursor) { "SetDepth", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCursor_SetDepth, 1, NULL }, { "SetHeight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCursor_SetHeight, 1, NULL }, --- 8763,8766 ---- |
