From: John L. <jr...@us...> - 2007-06-06 15:20:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3229/wxLua/modules/wxbind/src Modified Files: windows.cpp Log Message: Allow multiple overload functions, but pick the first one which should be the best. Remove duplicate wxWindow::SetSize Static functions are always called using '.' and never ':' Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** windows.cpp 6 Jun 2007 03:53:38 -0000 1.50 --- windows.cpp 6 Jun 2007 15:20:15 -0000 1.51 *************** *** 3373,3382 **** #if wxLUA_USE_wxPointSizeRect ! static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetSize4[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxRect, 0 }; ! static int LUACALL wxLua_wxWindow_SetSize4(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxWindow_SetSize4[1] = {{ wxLua_wxWindow_SetSize4, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetSize4 }}; // virtual void SetSize(const wxRect& rect) ! static int LUACALL wxLua_wxWindow_SetSize4(lua_State *L) { wxLuaState wxlState(L); --- 3373,3382 ---- #if wxLUA_USE_wxPointSizeRect ! static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetSize3[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxRect, 0 }; ! static int LUACALL wxLua_wxWindow_SetSize3(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxWindow_SetSize3[1] = {{ wxLua_wxWindow_SetSize3, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetSize3 }}; // virtual void SetSize(const wxRect& rect) ! static int LUACALL wxLua_wxWindow_SetSize3(lua_State *L) { wxLuaState wxlState(L); *************** *** 3459,3490 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetSize3[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; - static int LUACALL wxLua_wxWindow_SetSize3(lua_State *L); - // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxWindow_SetSize3[1] = {{ wxLua_wxWindow_SetSize3, WXLUAMETHOD_METHOD, 5, 6, s_wxluatagArray_wxLua_wxWindow_SetSize3 }}; - - // virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) - static int LUACALL wxLua_wxWindow_SetSize3(lua_State *L) - { - wxLuaState wxlState(L); - // get number of arguments - int argCount = lua_gettop(L); - // int sizeFlags = wxSIZE_AUTO - int sizeFlags = (argCount >= 6 ? (int)wxlua_getnumbertype(L, 6) : wxSIZE_AUTO); - // int height - int height = (int)wxlua_getnumbertype(L, 5); - // int width - int width = (int)wxlua_getnumbertype(L, 4); - // int y - int y = (int)wxlua_getnumbertype(L, 3); - // int x - int x = (int)wxlua_getnumbertype(L, 2); - // get this - wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); - // call SetSize - self->SetSize(x, y, width, height, sizeFlags); - - return 0; - } - #if wxLUA_USE_wxPointSizeRect --- 3459,3462 ---- *************** *** 4282,4286 **** #if wxLUA_USE_wxPointSizeRect ! { wxLua_wxWindow_SetSize4, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetSize4 }, #endif // wxLUA_USE_wxPointSizeRect --- 4254,4258 ---- #if wxLUA_USE_wxPointSizeRect ! { wxLua_wxWindow_SetSize3, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetSize3 }, #endif // wxLUA_USE_wxPointSizeRect *************** *** 4290,4294 **** { wxLua_wxWindow_SetSize, WXLUAMETHOD_METHOD, 5, 6, s_wxluatagArray_wxLua_wxWindow_SetSize }, { wxLua_wxWindow_SetSize1, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxWindow_SetSize1 }, - { wxLua_wxWindow_SetSize3, WXLUAMETHOD_METHOD, 5, 6, s_wxluatagArray_wxLua_wxWindow_SetSize3 }, }; static int s_wxluafunc_wxLua_wxWindow_SetSize_overload_count = sizeof(s_wxluafunc_wxLua_wxWindow_SetSize_overload)/sizeof(s_wxluafunc_wxLua_wxWindow_SetSize_overload[0]); --- 4262,4265 ---- *************** *** 6047,6069 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBaseEvent_GetSelection[] = { &s_wxluatag_wxBookCtrlBaseEvent, 0 }; - static int LUACALL wxLua_wxBookCtrlBaseEvent_GetSelection(lua_State *L); - static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBookCtrlBaseEvent_GetSelection[1] = {{ wxLua_wxBookCtrlBaseEvent_GetSelection, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxBookCtrlBaseEvent_GetSelection }}; - - // int GetSelection() const - static int LUACALL wxLua_wxBookCtrlBaseEvent_GetSelection(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // get this - wxBookCtrlBaseEvent * self = (wxBookCtrlBaseEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxBookCtrlBaseEvent); - // call GetSelection - returns = self->GetSelection(); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBaseEvent_SetOldSelection[] = { &s_wxluatag_wxBookCtrlBaseEvent, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxBookCtrlBaseEvent_SetOldSelection(lua_State *L); --- 6018,6021 ---- *************** *** 6139,6143 **** { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBookCtrlBaseEvent_Delete, 1, 0 }, { WXLUAMETHOD_METHOD, "GetOldSelection", s_wxluafunc_wxLua_wxBookCtrlBaseEvent_GetOldSelection, 1, 0 }, - { WXLUAMETHOD_METHOD, "GetSelection", s_wxluafunc_wxLua_wxBookCtrlBaseEvent_GetSelection, 1, 0 }, { WXLUAMETHOD_METHOD, "SetOldSelection", s_wxluafunc_wxLua_wxBookCtrlBaseEvent_SetOldSelection, 1, 0 }, { WXLUAMETHOD_METHOD, "SetSelection", s_wxluafunc_wxLua_wxBookCtrlBaseEvent_SetSelection, 1, 0 }, --- 6091,6094 ---- |