Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src wxbase_datetime.cpp, 1.16, 1.17 wxcore_bind.cpp, 1.27, 1.28
|
From: John L. <jr...@us...> - 2009-10-05 02:51:38
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10796/wxLua/modules/wxbind/src Modified Files: wxbase_datetime.cpp wxcore_bind.cpp Log Message: Add a few more wxDateTime member functions. Speedup check for wxSpinEvent vs wxScrollEvent in wxLuaEventCallback::OnEvent() Reorder list of lightuserdata keys for LUA_REGISTRYINDEX in wxlstate.h Cleanup in wxLuaStackDialog, remove EnumerateGlobalData() and just treat is as a regular table. Fix ignoring events for controls in controls.wx.lua Index: wxcore_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxcore_bind.cpp 1 Oct 2009 04:21:01 -0000 1.27 --- wxcore_bind.cpp 5 Oct 2009 02:51:29 -0000 1.28 *************** *** 7261,7266 **** int ret = wxLuaBinding::RegisterBinding(wxlState); ! p_wxluatype_wxEvent = &wxluatype_wxEvent; ! p_wxluatype_wxWindow = &wxluatype_wxWindow; return ret; --- 7261,7268 ---- int ret = wxLuaBinding::RegisterBinding(wxlState); ! p_wxluatype_wxEvent = &wxluatype_wxEvent; ! p_wxluatype_wxWindow = &wxluatype_wxWindow; ! p_wxluatype_wxScrollEvent = &wxluatype_wxScrollEvent; ! p_wxluatype_wxSpinEvent = &wxluatype_wxSpinEvent; return ret; Index: wxbase_datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_datetime.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxbase_datetime.cpp 1 Oct 2009 04:21:01 -0000 1.16 --- wxbase_datetime.cpp 5 Oct 2009 02:51:29 -0000 1.17 *************** *** 683,686 **** --- 683,702 ---- } + static int LUACALL wxLua_wxDateTime_Now(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDateTime_Now[1] = {{ wxLua_wxDateTime_Now, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, g_wxluaargtypeArray_None }}; + // static wxDateTime Now() + static int LUACALL wxLua_wxDateTime_Now(lua_State *L) + { + // call Now + // allocate a new object using the copy constructor + wxDateTime* returns = new wxDateTime(wxDateTime::Now()); + // add the new object to the tracked memory list + wxluaO_addgcobject(L, returns, wxluatype_wxDateTime); + // push the result datatype + wxluaT_pushuserdatatype(L, returns, wxluatype_wxDateTime); + + return 1; + } + static wxLuaArgType s_wxluatypeArray_wxLua_wxDateTime_ParseDate[] = { &wxluatype_wxDateTime, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxDateTime_ParseDate(lua_State *L); *************** *** 813,816 **** --- 829,846 ---- } + static wxLuaArgType s_wxluatypeArray_wxLua_wxDateTime_SetCountry[] = { &wxluatype_TINTEGER, NULL }; + static int LUACALL wxLua_wxDateTime_SetCountry(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDateTime_SetCountry[1] = {{ wxLua_wxDateTime_SetCountry, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxDateTime_SetCountry }}; + // static void SetCountry(wxDateTime::Country country) + static int LUACALL wxLua_wxDateTime_SetCountry(lua_State *L) + { + // wxDateTime::Country country + wxDateTime::Country country = (wxDateTime::Country)wxlua_getenumtype(L, 1); + // call SetCountry + wxDateTime::SetCountry(country); + + return 0; + } + static wxLuaArgType s_wxluatypeArray_wxLua_wxDateTime_SetDay[] = { &wxluatype_wxDateTime, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxDateTime_SetDay(lua_State *L); *************** *** 1294,1297 **** --- 1324,1359 ---- } + static int LUACALL wxLua_wxDateTime_Today(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDateTime_Today[1] = {{ wxLua_wxDateTime_Today, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, g_wxluaargtypeArray_None }}; + // static wxDateTime Today() + static int LUACALL wxLua_wxDateTime_Today(lua_State *L) + { + // call Today + // allocate a new object using the copy constructor + wxDateTime* returns = new wxDateTime(wxDateTime::Today()); + // add the new object to the tracked memory list + wxluaO_addgcobject(L, returns, wxluatype_wxDateTime); + // push the result datatype + wxluaT_pushuserdatatype(L, returns, wxluatype_wxDateTime); + + return 1; + } + + static int LUACALL wxLua_wxDateTime_UNow(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxDateTime_UNow[1] = {{ wxLua_wxDateTime_UNow, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, g_wxluaargtypeArray_None }}; + // static wxDateTime UNow() + static int LUACALL wxLua_wxDateTime_UNow(lua_State *L) + { + // call UNow + // allocate a new object using the copy constructor + wxDateTime* returns = new wxDateTime(wxDateTime::UNow()); + // add the new object to the tracked memory list + wxluaO_addgcobject(L, returns, wxluatype_wxDateTime); + // push the result datatype + wxluaT_pushuserdatatype(L, returns, wxluatype_wxDateTime); + + return 1; + } + static wxLuaArgType s_wxluatypeArray_wxLua_wxDateTime_delete[] = { &wxluatype_wxDateTime, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxDateTime_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxDateTime_delete }}; *************** *** 1500,1503 **** --- 1562,1566 ---- { "IsWorkDay", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDateTime_IsWorkDay, 1, NULL }, { "MakeGMT", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDateTime_MakeGMT, 1, NULL }, + { "Now", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxDateTime_Now, 1, NULL }, { "ParseDate", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDateTime_ParseDate, 1, NULL }, { "ParseDateTime", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDateTime_ParseDateTime, 1, NULL }, *************** *** 1507,1510 **** --- 1570,1574 ---- { "ResetTime", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDateTime_ResetTime, 1, NULL }, { "Set", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDateTime_Set, 1, NULL }, + { "SetCountry", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxDateTime_SetCountry, 1, NULL }, { "SetDay", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDateTime_SetDay, 1, NULL }, { "SetHour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDateTime_SetHour, 1, NULL }, *************** *** 1541,1544 **** --- 1605,1610 ---- { "ToGMT", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDateTime_ToGMT, 1, NULL }, + { "Today", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxDateTime_Today, 1, NULL }, + { "UNow", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxDateTime_UNow, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxDateTime_delete, 1, NULL }, |
