From: John L. <jr...@us...> - 2007-06-22 03:20:32
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23505/wxLua/modules/wxbind/src Modified Files: controls.cpp wx_bind.cpp Log Message: Fix wxEVT_CONTEXT_MENU in bindings finish off the controls.wx.lua sample Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** wx_bind.cpp 21 Jun 2007 22:02:57 -0000 1.116 --- wx_bind.cpp 22 Jun 2007 03:20:25 -0000 1.117 *************** *** 277,281 **** { "wxEVT_CONTEXT_MENU", &wxEVT_CONTEXT_MENU, &s_wxluatag_wxContextMenuEvent }, - { "wxEVT_CONTEXT_MENU", &wxEVT_CONTEXT_MENU, &s_wxluatag_wxHelpEvent }, { "wxEVT_CREATE", &wxEVT_CREATE, &s_wxluatag_wxWindowCreateEvent }, --- 277,280 ---- Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** controls.cpp 18 Jun 2007 21:40:37 -0000 1.71 --- controls.cpp 22 Jun 2007 03:20:24 -0000 1.72 *************** *** 8297,8301 **** static int LUACALL wxLua_wxSpinButton_Create(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxSpinButton_Create[1] = {{ wxLua_wxSpinButton_Create, WXLUAMETHOD_METHOD, 2, 7, s_wxluatagArray_wxLua_wxSpinButton_Create }}; ! // bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") static int LUACALL wxLua_wxSpinButton_Create(lua_State *L) { --- 8297,8301 ---- static int LUACALL wxLua_wxSpinButton_Create(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxSpinButton_Create[1] = {{ wxLua_wxSpinButton_Create, WXLUAMETHOD_METHOD, 2, 7, s_wxluatagArray_wxLua_wxSpinButton_Create }}; ! // bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") static int LUACALL wxLua_wxSpinButton_Create(lua_State *L) { *************** *** 8312,8317 **** // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = -1 ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : -1); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 8312,8317 ---- // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 8423,8427 **** static int LUACALL wxLua_wxSpinButton_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxSpinButton_constructor1[1] = {{ wxLua_wxSpinButton_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 6, s_wxluatagArray_wxLua_wxSpinButton_constructor1 }}; ! // wxSpinButton(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") static int LUACALL wxLua_wxSpinButton_constructor1(lua_State *L) { --- 8423,8427 ---- static int LUACALL wxLua_wxSpinButton_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxSpinButton_constructor1[1] = {{ wxLua_wxSpinButton_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 6, s_wxluatagArray_wxLua_wxSpinButton_constructor1 }}; ! // wxSpinButton(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") static int LUACALL wxLua_wxSpinButton_constructor1(lua_State *L) { *************** *** 8439,8444 **** // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = -1 ! wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : -1); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); --- 8439,8444 ---- // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : wxID_ANY); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); |