Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src wxbase_file.cpp, 1.13, 1.14 wxcore_menutool.cpp, 1.13, 1.14
|
From: John L. <jr...@us...> - 2008-04-01 04:19:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv701/wxLua/modules/wxbind/src Modified Files: wxbase_file.cpp wxcore_menutool.cpp Log Message: Added new wxFileName and wxMenuItem methods Index: wxbase_file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_file.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxbase_file.cpp 29 Jan 2008 04:22:52 -0000 1.13 --- wxbase_file.cpp 1 Apr 2008 04:19:42 -0000 1.14 *************** *** 1200,1203 **** --- 1200,1223 ---- } + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_GetPathWithSep[] = { &wxluatype_wxFileName, &wxluatype_TINTEGER, NULL }; + static int LUACALL wxLua_wxFileName_GetPathWithSep(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileName_GetPathWithSep[1] = {{ wxLua_wxFileName_GetPathWithSep, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxFileName_GetPathWithSep }}; + // wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const + static int LUACALL wxLua_wxFileName_GetPathWithSep(lua_State *L) + { + // get number of arguments + int argCount = lua_gettop(L); + // wxPathFormat format = wxPATH_NATIVE + wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE); + // get this + wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileName); + // call GetPathWithSep + wxString returns = (self->GetPathWithSep(format)); + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_GetShortPath[] = { &wxluatype_wxFileName, NULL }; static int LUACALL wxLua_wxFileName_GetShortPath(lua_State *L); *************** *** 1805,1808 **** --- 1825,1842 ---- } + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_RemoveLastDir[] = { &wxluatype_wxFileName, NULL }; + static int LUACALL wxLua_wxFileName_RemoveLastDir(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileName_RemoveLastDir[1] = {{ wxLua_wxFileName_RemoveLastDir, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxFileName_RemoveLastDir }}; + // void RemoveLastDir() + static int LUACALL wxLua_wxFileName_RemoveLastDir(lua_State *L) + { + // get this + wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileName); + // call RemoveLastDir + self->RemoveLastDir(); + + return 0; + } + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_Rmdir1[] = { &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxFileName_Rmdir1(lua_State *L); *************** *** 2482,2485 **** --- 2516,2520 ---- { "GetPathSeparators", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxFileName_GetPathSeparators, 1, NULL }, { "GetPathTerminators", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxFileName_GetPathTerminators, 1, NULL }, + { "GetPathWithSep", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_GetPathWithSep, 1, NULL }, { "GetShortPath", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_GetShortPath, 1, NULL }, *************** *** 2520,2523 **** --- 2555,2559 ---- { "PrependDir", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_PrependDir, 1, NULL }, { "RemoveDir", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_RemoveDir, 1, NULL }, + { "RemoveLastDir", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_RemoveLastDir, 1, NULL }, #if (wxLUA_USE_wxFileName) Index: wxcore_menutool.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_menutool.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxcore_menutool.cpp 29 Jan 2008 04:22:53 -0000 1.13 --- wxcore_menutool.cpp 1 Apr 2008 04:19:42 -0000 1.14 *************** *** 1603,1606 **** --- 1603,1642 ---- } + + #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabel[] = { &wxluatype_wxMenuItem, NULL }; + static int LUACALL wxLua_wxMenuItem_GetItemLabel(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_GetItemLabel[1] = {{ wxLua_wxMenuItem_GetItemLabel, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabel }}; + // wxString GetItemLabel() const + static int LUACALL wxLua_wxMenuItem_GetItemLabel(lua_State *L) + { + // get this + wxMenuItem * self = (wxMenuItem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxMenuItem); + // call GetItemLabel + wxString returns = (self->GetItemLabel()); + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabelText[] = { &wxluatype_wxMenuItem, NULL }; + static int LUACALL wxLua_wxMenuItem_GetItemLabelText(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_GetItemLabelText[1] = {{ wxLua_wxMenuItem_GetItemLabelText, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabelText }}; + // wxString GetItemLabelText() const + static int LUACALL wxLua_wxMenuItem_GetItemLabelText(lua_State *L) + { + // get this + wxMenuItem * self = (wxMenuItem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxMenuItem); + // call GetItemLabelText + wxString returns = (self->GetItemLabelText()); + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetKind[] = { &wxluatype_wxMenuItem, NULL }; static int LUACALL wxLua_wxMenuItem_GetKind(lua_State *L); *************** *** 1651,1654 **** --- 1687,1710 ---- } + + #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetLabelText[] = { &wxluatype_TSTRING, NULL }; + static int LUACALL wxLua_wxMenuItem_GetLabelText(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_GetLabelText[1] = {{ wxLua_wxMenuItem_GetLabelText, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxMenuItem_GetLabelText }}; + // static wxString GetLabelText(const wxString& label) + static int LUACALL wxLua_wxMenuItem_GetLabelText(lua_State *L) + { + // const wxString label + const wxString label = wxlua_getwxStringtype(L, 1); + // call GetLabelText + wxString returns = (wxMenuItem::GetLabelText(label)); + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetMenu[] = { &wxluatype_wxMenuItem, NULL }; static int LUACALL wxLua_wxMenuItem_GetMenu(lua_State *L); *************** *** 1815,1818 **** --- 1871,1894 ---- } + + #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_SetItemLabel[] = { &wxluatype_wxMenuItem, &wxluatype_TSTRING, NULL }; + static int LUACALL wxLua_wxMenuItem_SetItemLabel(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_SetItemLabel[1] = {{ wxLua_wxMenuItem_SetItemLabel, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxMenuItem_SetItemLabel }}; + // void SetItemLabel(const wxString& str) + static int LUACALL wxLua_wxMenuItem_SetItemLabel(lua_State *L) + { + // const wxString str + const wxString str = wxlua_getwxStringtype(L, 2); + // get this + wxMenuItem * self = (wxMenuItem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxMenuItem); + // call SetItemLabel + self->SetItemLabel(str); + + return 0; + } + + #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_SetSubMenu[] = { &wxluatype_wxMenuItem, &wxluatype_wxMenu, NULL }; static int LUACALL wxLua_wxMenuItem_SetSubMenu(lua_State *L); *************** *** 1910,1916 **** --- 1986,2003 ---- { "GetHelp", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetHelp, 1, NULL }, { "GetId", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetId, 1, NULL }, + + #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + { "GetItemLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetItemLabel, 1, NULL }, + { "GetItemLabelText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetItemLabelText, 1, NULL }, + #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + { "GetKind", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetKind, 1, NULL }, { "GetLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetLabel, 1, NULL }, { "GetLabelFromText", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxMenuItem_GetLabelFromText, 1, NULL }, + + #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + { "GetLabelText", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxMenuItem_GetLabelText, 1, NULL }, + #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + { "GetMenu", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetMenu, 1, NULL }, { "GetSubMenu", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetSubMenu, 1, NULL }, *************** *** 1927,1930 **** --- 2014,2022 ---- { "SetHelp", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetHelp, 1, NULL }, + + #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + { "SetItemLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetItemLabel, 1, NULL }, + #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0)) + { "SetSubMenu", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetSubMenu, 1, NULL }, { "SetText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetText, 1, NULL }, |
