Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src controls.cpp, 1.73, 1.74 datetime.cpp, 1.55, 1.56 file.cpp, 1.55, 1.56 gdi.cpp, 1.81, 1.82 geometry.cpp, 1.34, 1.35 grid.cpp, 1.47, 1.48 image.cpp, 1.50, 1.51 print.cpp, 1.48, 1.49 socket.cpp, 1.47, 1.48 windows.cpp, 1.70, 1.71 wx_bind.cpp, 1.123, 1.124
|
From: John L. <jr...@us...> - 2007-06-30 00:12:32
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9448/wxLua/modules/wxbind/src Modified Files: controls.cpp datetime.cpp file.cpp gdi.cpp geometry.cpp grid.cpp image.cpp print.cpp socket.cpp windows.cpp wx_bind.cpp Log Message: Fix for MingW added in wxWidgets bindings for wxDefaultPoint and wxEVT_FILEPICKER/DIRPICKER... Rename the functions to get the type names from wxLua to match closer to the lua type() function, wxlua.i Change op_add_assign to just op_iadd (others as well) = op_assign is now op_set Index: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** print.cpp 18 Jun 2007 21:40:46 -0000 1.48 --- print.cpp 30 Jun 2007 00:12:25 -0000 1.49 *************** *** 1208,1216 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintData_op_assign[] = { &s_wxluatag_wxPrintData, &s_wxluatag_wxPrintData, NULL }; ! static int LUACALL wxLua_wxPrintData_op_assign(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxPrintData_op_assign[1] = {{ wxLua_wxPrintData_op_assign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPrintData_op_assign }}; // %operator void operator=(const wxPrintData& data) ! static int LUACALL wxLua_wxPrintData_op_assign(lua_State *L) { wxLuaState wxlState(L); --- 1208,1216 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintData_op_set[] = { &s_wxluatag_wxPrintData, &s_wxluatag_wxPrintData, NULL }; ! static int LUACALL wxLua_wxPrintData_op_set(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxPrintData_op_set[1] = {{ wxLua_wxPrintData_op_set, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPrintData_op_set }}; // %operator void operator=(const wxPrintData& data) ! static int LUACALL wxLua_wxPrintData_op_set(lua_State *L) { wxLuaState wxlState(L); *************** *** 1219,1223 **** // get this wxPrintData * self = (wxPrintData *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintData); ! // call op_assign (*self)=(*data); --- 1219,1223 ---- // get this wxPrintData * self = (wxPrintData *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintData); ! // call op_set (*self)=(*data); *************** *** 1352,1356 **** { "SetQuality", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPrintData_SetQuality, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxPrintData_delete, 1, NULL }, ! { "op_assign", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPrintData_op_assign, 1, NULL }, #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) --- 1352,1356 ---- { "SetQuality", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPrintData_SetQuality, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxPrintData_delete, 1, NULL }, ! { "op_set", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPrintData_op_set, 1, NULL }, #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) *************** *** 2894,2902 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintDialogData_op_assign[] = { &s_wxluatag_wxPrintDialogData, &s_wxluatag_wxPrintDialogData, NULL }; ! static int LUACALL wxLua_wxPrintDialogData_op_assign(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxPrintDialogData_op_assign[1] = {{ wxLua_wxPrintDialogData_op_assign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPrintDialogData_op_assign }}; // %operator void operator=(const wxPrintDialogData& data) ! static int LUACALL wxLua_wxPrintDialogData_op_assign(lua_State *L) { wxLuaState wxlState(L); --- 2894,2902 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintDialogData_op_set[] = { &s_wxluatag_wxPrintDialogData, &s_wxluatag_wxPrintDialogData, NULL }; ! static int LUACALL wxLua_wxPrintDialogData_op_set(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxPrintDialogData_op_set[1] = {{ wxLua_wxPrintDialogData_op_set, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPrintDialogData_op_set }}; // %operator void operator=(const wxPrintDialogData& data) ! static int LUACALL wxLua_wxPrintDialogData_op_set(lua_State *L) { wxLuaState wxlState(L); *************** *** 2905,2909 **** // get this wxPrintDialogData * self = (wxPrintDialogData *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintDialogData); ! // call op_assign (*self)=(*data); --- 2905,2909 ---- // get this wxPrintDialogData * self = (wxPrintDialogData *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintDialogData); ! // call op_set (*self)=(*data); *************** *** 3027,3031 **** { "SetToPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPrintDialogData_SetToPage, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxPrintDialogData_delete, 1, NULL }, ! { "op_assign", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPrintDialogData_op_assign, 1, NULL }, #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) --- 3027,3031 ---- { "SetToPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPrintDialogData_SetToPage, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxPrintDialogData_delete, 1, NULL }, ! { "op_set", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPrintDialogData_op_set, 1, NULL }, #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** controls.cpp 25 Jun 2007 03:19:41 -0000 1.73 --- controls.cpp 30 Jun 2007 00:12:22 -0000 1.74 *************** *** 12505,12529 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeItemId_op_assign[] = { &s_wxluatag_wxTreeItemId, &s_wxluatag_wxTreeItemId, NULL }; - static int LUACALL wxLua_wxTreeItemId_op_assign(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreeItemId_op_assign[1] = {{ wxLua_wxTreeItemId_op_assign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTreeItemId_op_assign }}; - // %operator wxTreeItemId& operator=(const wxTreeItemId& otherId) - static int LUACALL wxLua_wxTreeItemId_op_assign(lua_State *L) - { - wxLuaState wxlState(L); - wxTreeItemId *returns; - // const wxTreeItemId otherId - const wxTreeItemId * otherId = (const wxTreeItemId *)wxlState.GetUserDataType(2, s_wxluatag_wxTreeItemId); - // get this - wxTreeItemId * self = (wxTreeItemId *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeItemId); - // call op_assign - returns = self; - *returns = ((*self)=(*otherId)); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns); - - return 1; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeItemId_op_eq[] = { &s_wxluatag_wxTreeItemId, &s_wxluatag_wxTreeItemId, NULL }; static int LUACALL wxLua_wxTreeItemId_op_eq(lua_State *L); --- 12505,12508 ---- *************** *** 12546,12549 **** --- 12525,12549 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeItemId_op_set[] = { &s_wxluatag_wxTreeItemId, &s_wxluatag_wxTreeItemId, NULL }; + static int LUACALL wxLua_wxTreeItemId_op_set(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTreeItemId_op_set[1] = {{ wxLua_wxTreeItemId_op_set, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTreeItemId_op_set }}; + // %operator wxTreeItemId& operator=(const wxTreeItemId& otherId) + static int LUACALL wxLua_wxTreeItemId_op_set(lua_State *L) + { + wxLuaState wxlState(L); + wxTreeItemId *returns; + // const wxTreeItemId otherId + const wxTreeItemId * otherId = (const wxTreeItemId *)wxlState.GetUserDataType(2, s_wxluatag_wxTreeItemId); + // get this + wxTreeItemId * self = (wxTreeItemId *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeItemId); + // call op_set + returns = self; + *returns = ((*self)=(*otherId)); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeItemId_constructor1[] = { &s_wxluatag_wxTreeItemId, NULL }; static int LUACALL wxLua_wxTreeItemId_constructor1(lua_State *L); *************** *** 12613,12618 **** { "IsOk", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeItemId_IsOk, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxTreeItemId_delete, 1, NULL }, - { "op_assign", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeItemId_op_assign, 1, NULL }, { "op_eq", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeItemId_op_eq, 1, NULL }, #if (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) --- 12613,12618 ---- { "IsOk", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeItemId_IsOk, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxTreeItemId_delete, 1, NULL }, { "op_eq", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeItemId_op_eq, 1, NULL }, + { "op_set", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTreeItemId_op_set, 1, NULL }, #if (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** grid.cpp 25 Jun 2007 03:19:44 -0000 1.47 --- grid.cpp 30 Jun 2007 00:12:24 -0000 1.48 *************** *** 3276,3300 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxGridCellCoords_op_assign[] = { &s_wxluatag_wxGridCellCoords, &s_wxluatag_wxGridCellCoords, NULL }; - static int LUACALL wxLua_wxGridCellCoords_op_assign(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxGridCellCoords_op_assign[1] = {{ wxLua_wxGridCellCoords_op_assign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxGridCellCoords_op_assign }}; - // %operator wxGridCellCoords& operator=( const wxGridCellCoords& other ) - static int LUACALL wxLua_wxGridCellCoords_op_assign(lua_State *L) - { - wxLuaState wxlState(L); - wxGridCellCoords *returns; - // const wxGridCellCoords other - const wxGridCellCoords * other = (const wxGridCellCoords *)wxlState.GetUserDataType(2, s_wxluatag_wxGridCellCoords); - // get this - wxGridCellCoords * self = (wxGridCellCoords *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellCoords); - // call op_assign - returns = self; - *returns = ((*self)=(*other)); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxGridCellCoords, returns); - - return 1; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxGridCellCoords_op_eq[] = { &s_wxluatag_wxGridCellCoords, &s_wxluatag_wxGridCellCoords, NULL }; static int LUACALL wxLua_wxGridCellCoords_op_eq(lua_State *L); --- 3276,3279 ---- *************** *** 3317,3320 **** --- 3296,3320 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxGridCellCoords_op_set[] = { &s_wxluatag_wxGridCellCoords, &s_wxluatag_wxGridCellCoords, NULL }; + static int LUACALL wxLua_wxGridCellCoords_op_set(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxGridCellCoords_op_set[1] = {{ wxLua_wxGridCellCoords_op_set, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxGridCellCoords_op_set }}; + // %operator wxGridCellCoords& operator=( const wxGridCellCoords& other ) + static int LUACALL wxLua_wxGridCellCoords_op_set(lua_State *L) + { + wxLuaState wxlState(L); + wxGridCellCoords *returns; + // const wxGridCellCoords other + const wxGridCellCoords * other = (const wxGridCellCoords *)wxlState.GetUserDataType(2, s_wxluatag_wxGridCellCoords); + // get this + wxGridCellCoords * self = (wxGridCellCoords *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellCoords); + // call op_set + returns = self; + *returns = ((*self)=(*other)); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxGridCellCoords, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxGridCellCoords_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxGridCellCoords_constructor(lua_State *L); *************** *** 3353,3358 **** { "SetRow", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGridCellCoords_SetRow, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxGridCellCoords_delete, 1, NULL }, - { "op_assign", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGridCellCoords_op_assign, 1, NULL }, { "op_eq", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGridCellCoords_op_eq, 1, NULL }, { "wxGridCellCoords", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGridCellCoords_constructor, 1, NULL }, --- 3353,3358 ---- { "SetRow", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGridCellCoords_SetRow, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxGridCellCoords_delete, 1, NULL }, { "op_eq", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGridCellCoords_op_eq, 1, NULL }, + { "op_set", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGridCellCoords_op_set, 1, NULL }, { "wxGridCellCoords", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGridCellCoords_constructor, 1, NULL }, Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** file.cpp 25 Jun 2007 03:19:42 -0000 1.55 --- file.cpp 30 Jun 2007 00:12:23 -0000 1.56 *************** *** 2027,2051 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_op_assign[] = { &s_wxluatag_wxFileName, &s_wxluatag_wxFileName, NULL }; - static int LUACALL wxLua_wxFileName_op_assign(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileName_op_assign[1] = {{ wxLua_wxFileName_op_assign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFileName_op_assign }}; - // %operator wxFileName& operator=(const wxFileName& filename) - static int LUACALL wxLua_wxFileName_op_assign(lua_State *L) - { - wxLuaState wxlState(L); - wxFileName *returns; - // const wxFileName filename - const wxFileName * filename = (const wxFileName *)wxlState.GetUserDataType(2, s_wxluatag_wxFileName); - // get this - wxFileName * self = (wxFileName *)wxlState.GetUserDataType(1, s_wxluatag_wxFileName); - // call op_assign - returns = self; - *returns = ((*self)=(*filename)); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxFileName, returns); - - return 1; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_op_eq[] = { &s_wxluatag_wxFileName, &s_wxluatag_wxFileName, NULL }; static int LUACALL wxLua_wxFileName_op_eq(lua_State *L); --- 2027,2030 ---- *************** *** 2068,2071 **** --- 2047,2071 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_op_set[] = { &s_wxluatag_wxFileName, &s_wxluatag_wxFileName, NULL }; + static int LUACALL wxLua_wxFileName_op_set(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileName_op_set[1] = {{ wxLua_wxFileName_op_set, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFileName_op_set }}; + // %operator wxFileName& operator=(const wxFileName& filename) + static int LUACALL wxLua_wxFileName_op_set(lua_State *L) + { + wxLuaState wxlState(L); + wxFileName *returns; + // const wxFileName filename + const wxFileName * filename = (const wxFileName *)wxlState.GetUserDataType(2, s_wxluatag_wxFileName); + // get this + wxFileName * self = (wxFileName *)wxlState.GetUserDataType(1, s_wxluatag_wxFileName); + // call op_set + returns = self; + *returns = ((*self)=(*filename)); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxFileName, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_constructor4[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxFileName_constructor4(lua_State *L); *************** *** 2624,2629 **** { "Touch", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_Touch, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxFileName_delete, 1, NULL }, - { "op_assign", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_op_assign, 1, NULL }, { "op_eq", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_op_eq, 1, NULL }, #if (wxLUA_USE_wxFileName) --- 2624,2629 ---- { "Touch", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_Touch, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxFileName_delete, 1, NULL }, { "op_eq", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_op_eq, 1, NULL }, + { "op_set", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_op_set, 1, NULL }, #if (wxLUA_USE_wxFileName) Index: socket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/socket.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** socket.cpp 25 Jun 2007 03:19:48 -0000 1.47 --- socket.cpp 30 Jun 2007 00:12:25 -0000 1.48 *************** *** 2732,2756 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxURI_op_assign[] = { &s_wxluatag_wxURI, &s_wxluatag_wxURI, NULL }; - static int LUACALL wxLua_wxURI_op_assign(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxURI_op_assign[1] = {{ wxLua_wxURI_op_assign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxURI_op_assign }}; - // %operator wxURI& operator = (const wxURI& uri); - static int LUACALL wxLua_wxURI_op_assign(lua_State *L) - { - wxLuaState wxlState(L); - wxURI *returns; - // const wxURI uri - const wxURI * uri = (const wxURI *)wxlState.GetUserDataType(2, s_wxluatag_wxURI); - // get this - wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); - // call op_assign - returns = self; - *returns = ((*self)=(*uri)); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxURI, returns); - - return 1; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxURI_op_eq[] = { &s_wxluatag_wxURI, &s_wxluatag_wxURI, NULL }; static int LUACALL wxLua_wxURI_op_eq(lua_State *L); --- 2732,2735 ---- *************** *** 2773,2776 **** --- 2752,2776 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxURI_op_set[] = { &s_wxluatag_wxURI, &s_wxluatag_wxURI, NULL }; + static int LUACALL wxLua_wxURI_op_set(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxURI_op_set[1] = {{ wxLua_wxURI_op_set, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxURI_op_set }}; + // %operator wxURI& operator = (const wxURI& uri); + static int LUACALL wxLua_wxURI_op_set(lua_State *L) + { + wxLuaState wxlState(L); + wxURI *returns; + // const wxURI uri + const wxURI * uri = (const wxURI *)wxlState.GetUserDataType(2, s_wxluatag_wxURI); + // get this + wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI); + // call op_set + returns = self; + *returns = ((*self)=(*uri)); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxURI, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxURI_constructor2[] = { &s_wxluatag_wxURI, NULL }; static int LUACALL wxLua_wxURI_constructor2(lua_State *L); *************** *** 2883,2888 **** { "Unescape", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxURI_Unescape, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxURI_delete, 1, NULL }, - { "op_assign", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxURI_op_assign, 1, NULL }, { "op_eq", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxURI_op_eq, 1, NULL }, #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) --- 2883,2888 ---- { "Unescape", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxURI_Unescape, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxURI_delete, 1, NULL }, { "op_eq", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxURI_op_eq, 1, NULL }, + { "op_set", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxURI_op_set, 1, NULL }, #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** datetime.cpp 27 Jun 2007 15:57:14 -0000 1.55 --- datetime.cpp 30 Jun 2007 00:12:22 -0000 1.56 *************** *** 5447,5456 **** { "Description", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxLanguageInfo_Set_Description, 1, NULL }, { "Description", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxLanguageInfo_Get_Description, 1, NULL }, ! { "Get_CanonicalName", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Get_CanonicalName, 1, NULL }, ! { "Get_Description", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Get_Description, 1, NULL }, ! { "Get_Language", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Get_Language, 1, NULL }, #if ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) ! { "Get_LayoutDirection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Get_LayoutDirection, 1, NULL }, #endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) --- 5447,5456 ---- { "Description", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxLanguageInfo_Set_Description, 1, NULL }, { "Description", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxLanguageInfo_Get_Description, 1, NULL }, ! // %member { "Get_CanonicalName", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Get_CanonicalName, 1, NULL }, ! // %member { "Get_Description", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Get_Description, 1, NULL }, ! // %member { "Get_Language", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Get_Language, 1, NULL }, #if ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) ! // %member { "Get_LayoutDirection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Get_LayoutDirection, 1, NULL }, #endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) *************** *** 5463,5472 **** #endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) ! { "Set_CanonicalName", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_CanonicalName, 1, NULL }, ! { "Set_Description", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_Description, 1, NULL }, ! { "Set_Language", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_Language, 1, NULL }, #if ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) ! { "Set_LayoutDirection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_LayoutDirection, 1, NULL }, #endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) --- 5463,5472 ---- #endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) ! // %member { "Set_CanonicalName", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_CanonicalName, 1, NULL }, ! // %member { "Set_Description", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_Description, 1, NULL }, ! // %member { "Set_Language", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_Language, 1, NULL }, #if ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) ! // %member { "Set_LayoutDirection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_LayoutDirection, 1, NULL }, #endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** windows.cpp 27 Jun 2007 14:29:54 -0000 1.70 --- windows.cpp 30 Jun 2007 00:12:25 -0000 1.71 *************** *** 150,192 **** #if wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxVisualAttributes_ColBg[] = { &s_wxluatag_wxVisualAttributes, NULL }; ! static int LUACALL wxLua_wxVisualAttributes_ColBg(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxVisualAttributes_ColBg[1] = {{ wxLua_wxVisualAttributes_ColBg, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxVisualAttributes_ColBg }}; ! // %rename ColBg wxColour colBg ! static int LUACALL wxLua_wxVisualAttributes_ColBg(lua_State *L) { wxLuaState wxlState(L); - wxColour *returns; // get this ! wxVisualAttributes * self = (wxVisualAttributes *)wxlState.GetUserDataType(1, s_wxluatag_wxVisualAttributes); ! // call colBg ! // allocate a new object using the copy constructor ! returns = new wxColour(self->colBg); ! // add the new object to the tracked memory list ! wxlState.AddTrackedObject((wxColour *)returns); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxColour, returns); ! return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxVisualAttributes_ColFg[] = { &s_wxluatag_wxVisualAttributes, NULL }; ! static int LUACALL wxLua_wxVisualAttributes_ColFg(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxVisualAttributes_ColFg[1] = {{ wxLua_wxVisualAttributes_ColFg, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxVisualAttributes_ColFg }}; ! // %rename ColFg wxColour colFg ! static int LUACALL wxLua_wxVisualAttributes_ColFg(lua_State *L) { wxLuaState wxlState(L); - wxColour *returns; // get this ! wxVisualAttributes * self = (wxVisualAttributes *)wxlState.GetUserDataType(1, s_wxluatag_wxVisualAttributes); ! // call colFg ! // allocate a new object using the copy constructor ! returns = new wxColour(self->colFg); ! // add the new object to the tracked memory list ! wxlState.AddTrackedObject((wxColour *)returns); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxColour, returns); ! return 1; } --- 150,180 ---- #if wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxVisualAttributes_Get_colBg[] = { &s_wxluatag_wxVisualAttributes, NULL }; ! static int LUACALL wxLua_wxVisualAttributes_Get_colBg(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxVisualAttributes_Get_colBg[1] = {{ wxLua_wxVisualAttributes_Get_colBg, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxVisualAttributes_Get_colBg }}; ! // %member wxColour colBg ! static int LUACALL wxLua_wxVisualAttributes_Get_colBg(lua_State *L) { wxLuaState wxlState(L); // get this ! wxVisualAttributes *self = (wxVisualAttributes *) wxlState.GetUserDataType(1, s_wxluatag_wxVisualAttributes); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxColour, &self->colBg); ! // return the number of values return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxVisualAttributes_Get_colFg[] = { &s_wxluatag_wxVisualAttributes, NULL }; ! static int LUACALL wxLua_wxVisualAttributes_Get_colFg(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxVisualAttributes_Get_colFg[1] = {{ wxLua_wxVisualAttributes_Get_colFg, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxVisualAttributes_Get_colFg }}; ! // %member wxColour colFg ! static int LUACALL wxLua_wxVisualAttributes_Get_colFg(lua_State *L) { wxLuaState wxlState(L); // get this ! wxVisualAttributes *self = (wxVisualAttributes *) wxlState.GetUserDataType(1, s_wxluatag_wxVisualAttributes); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxColour, &self->colFg); ! // return the number of values return 1; } *************** *** 195,203 **** #if wxLUA_USE_wxFont ! static wxLuaArgTag s_wxluatagArray_wxLua_wxVisualAttributes_GetFont[] = { &s_wxluatag_wxVisualAttributes, NULL }; ! static int LUACALL wxLua_wxVisualAttributes_GetFont(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxVisualAttributes_GetFont[1] = {{ wxLua_wxVisualAttributes_GetFont, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxVisualAttributes_GetFont }}; ! // %rename Font %member wxFont font ! static int LUACALL wxLua_wxVisualAttributes_GetFont(lua_State *L) { wxLuaState wxlState(L); --- 183,191 ---- #if wxLUA_USE_wxFont ! static wxLuaArgTag s_wxluatagArray_wxLua_wxVisualAttributes_Get_font[] = { &s_wxluatag_wxVisualAttributes, NULL }; ! static int LUACALL wxLua_wxVisualAttributes_Get_font(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxVisualAttributes_Get_font[1] = {{ wxLua_wxVisualAttributes_Get_font, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxVisualAttributes_Get_font }}; ! // %member wxFont font ! static int LUACALL wxLua_wxVisualAttributes_Get_font(lua_State *L) { wxLuaState wxlState(L); *************** *** 210,218 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxVisualAttributes_SetFont[] = { &s_wxluatag_wxVisualAttributes, &s_wxluatag_wxFont, NULL }; ! static int LUACALL wxLua_wxVisualAttributes_SetFont(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxVisualAttributes_SetFont[1] = {{ wxLua_wxVisualAttributes_SetFont, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxVisualAttributes_SetFont }}; ! // %rename Font %member wxFont font ! static int LUACALL wxLua_wxVisualAttributes_SetFont(lua_State *L) { wxLuaState wxlState(L); --- 198,244 ---- } ! #endif // wxLUA_USE_wxFont ! ! #if wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxVisualAttributes_Set_colBg[] = { &s_wxluatag_wxVisualAttributes, &s_wxluatag_wxColour, NULL }; ! static int LUACALL wxLua_wxVisualAttributes_Set_colBg(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxVisualAttributes_Set_colBg[1] = {{ wxLua_wxVisualAttributes_Set_colBg, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxVisualAttributes_Set_colBg }}; ! // %member wxColour colBg ! static int LUACALL wxLua_wxVisualAttributes_Set_colBg(lua_State *L) ! { ! wxLuaState wxlState(L); ! // get the data type value ! wxColour* val = (wxColour*)wxlState.GetUserDataType(2, s_wxluatag_wxColour); ! // get this ! wxVisualAttributes *self = (wxVisualAttributes *)wxlState.GetUserDataType(1, s_wxluatag_wxVisualAttributes); ! self->colBg = *val; ! // return the number of values ! return 0; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxVisualAttributes_Set_colFg[] = { &s_wxluatag_wxVisualAttributes, &s_wxluatag_wxColour, NULL }; ! static int LUACALL wxLua_wxVisualAttributes_Set_colFg(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxVisualAttributes_Set_colFg[1] = {{ wxLua_wxVisualAttributes_Set_colFg, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxVisualAttributes_Set_colFg }}; ! // %member wxColour colFg ! static int LUACALL wxLua_wxVisualAttributes_Set_colFg(lua_State *L) ! { ! wxLuaState wxlState(L); ! // get the data type value ! wxColour* val = (wxColour*)wxlState.GetUserDataType(2, s_wxluatag_wxColour); ! // get this ! wxVisualAttributes *self = (wxVisualAttributes *)wxlState.GetUserDataType(1, s_wxluatag_wxVisualAttributes); ! self->colFg = *val; ! // return the number of values ! return 0; ! } ! ! #endif // wxLUA_USE_wxColourPenBrush ! ! #if wxLUA_USE_wxFont ! static wxLuaArgTag s_wxluatagArray_wxLua_wxVisualAttributes_Set_font[] = { &s_wxluatag_wxVisualAttributes, &s_wxluatag_wxFont, NULL }; ! static int LUACALL wxLua_wxVisualAttributes_Set_font(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxVisualAttributes_Set_font[1] = {{ wxLua_wxVisualAttributes_Set_font, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxVisualAttributes_Set_font }}; ! // %member wxFont font ! static int LUACALL wxLua_wxVisualAttributes_Set_font(lua_State *L) { wxLuaState wxlState(L); *************** *** 228,231 **** --- 254,260 ---- #endif // wxLUA_USE_wxFont + #if wxLUA_USE_wxColourPenBrush + #endif // wxLUA_USE_wxColourPenBrush + static wxLuaArgTag s_wxluatagArray_wxLua_wxVisualAttributes_delete[] = { &s_wxluatag_wxVisualAttributes, NULL }; static int LUACALL wxLua_wxVisualAttributes_delete(lua_State *L); *************** *** 253,270 **** wxLuaBindMethod wxVisualAttributes_methods[] = { #if wxLUA_USE_wxColourPenBrush ! { "ColBg", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxVisualAttributes_ColBg, 1, NULL }, ! { "ColFg", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxVisualAttributes_ColFg, 1, NULL }, #endif // wxLUA_USE_wxColourPenBrush #if wxLUA_USE_wxFont ! { "GetFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxVisualAttributes_GetFont, 1, NULL }, ! { "SetFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxVisualAttributes_SetFont, 1, NULL }, #endif // wxLUA_USE_wxFont { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxVisualAttributes_delete, 1, NULL }, #if wxLUA_USE_wxFont ! { "font", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxVisualAttributes_SetFont, 1, NULL }, ! { "font", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxVisualAttributes_GetFont, 1, NULL }, #endif // wxLUA_USE_wxFont --- 282,314 ---- wxLuaBindMethod wxVisualAttributes_methods[] = { #if wxLUA_USE_wxColourPenBrush ! // %member { "Get_colBg", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxVisualAttributes_Get_colBg, 1, NULL }, ! // %member { "Get_colFg", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxVisualAttributes_Get_colFg, 1, NULL }, #endif // wxLUA_USE_wxColourPenBrush #if wxLUA_USE_wxFont ! // %member { "Get_font", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxVisualAttributes_Get_font, 1, NULL }, #endif // wxLUA_USE_wxFont + #if wxLUA_USE_wxColourPenBrush + // %member { "Set_colBg", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxVisualAttributes_Set_colBg, 1, NULL }, + // %member { "Set_colFg", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxVisualAttributes_Set_colFg, 1, NULL }, + #endif // wxLUA_USE_wxColourPenBrush + + #if wxLUA_USE_wxFont + // %member { "Set_font", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxVisualAttributes_Set_font, 1, NULL }, + #endif // wxLUA_USE_wxFont + + #if wxLUA_USE_wxColourPenBrush + { "colBg", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxVisualAttributes_Set_colBg, 1, NULL }, + { "colBg", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxVisualAttributes_Get_colBg, 1, NULL }, + { "colFg", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxVisualAttributes_Set_colFg, 1, NULL }, + { "colFg", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxVisualAttributes_Get_colFg, 1, NULL }, + #endif // wxLUA_USE_wxColourPenBrush + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxVisualAttributes_delete, 1, NULL }, #if wxLUA_USE_wxFont ! { "font", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxVisualAttributes_Set_font, 1, NULL }, ! { "font", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxVisualAttributes_Get_font, 1, NULL }, #endif // wxLUA_USE_wxFont Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** image.cpp 25 Jun 2007 03:19:44 -0000 1.50 --- image.cpp 30 Jun 2007 00:12:25 -0000 1.51 *************** *** 1734,1742 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_op_assign[] = { &s_wxluatag_wxImage, &s_wxluatag_wxImage, NULL }; ! static int LUACALL wxLua_wxImage_op_assign(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxImage_op_assign[1] = {{ wxLua_wxImage_op_assign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxImage_op_assign }}; // %operator wxImage& operator=(const wxImage& image) ! static int LUACALL wxLua_wxImage_op_assign(lua_State *L) { wxLuaState wxlState(L); --- 1734,1742 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_op_set[] = { &s_wxluatag_wxImage, &s_wxluatag_wxImage, NULL }; ! static int LUACALL wxLua_wxImage_op_set(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxImage_op_set[1] = {{ wxLua_wxImage_op_set, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxImage_op_set }}; // %operator wxImage& operator=(const wxImage& image) ! static int LUACALL wxLua_wxImage_op_set(lua_State *L) { wxLuaState wxlState(L); *************** *** 1746,1750 **** // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); ! // call op_assign returns = self; *returns = ((*self)=(*image)); --- 1746,1750 ---- // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); ! // call op_set returns = self; *returns = ((*self)=(*image)); *************** *** 2265,2269 **** { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxImage_delete, 1, NULL }, ! { "op_assign", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImage_op_assign, 1, NULL }, #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage && wxUSE_IMAGE))||(wxLUA_USE_wxImage && wxUSE_IMAGE) --- 2265,2269 ---- { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxImage_delete, 1, NULL }, ! { "op_set", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImage_op_set, 1, NULL }, #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImage && wxUSE_IMAGE))||(wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 2287,2295 **** int s_wxluatag_wxImageHistogramEntry = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHistogramEntry_GetIndex[] = { &s_wxluatag_wxImageHistogramEntry, NULL }; ! static int LUACALL wxLua_wxImageHistogramEntry_GetIndex(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogramEntry_GetIndex[1] = {{ wxLua_wxImageHistogramEntry_GetIndex, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxImageHistogramEntry_GetIndex }}; ! // %rename Index %member unsigned long index // GetIndex() only, SetIndex(idx) is not allowed ! static int LUACALL wxLua_wxImageHistogramEntry_GetIndex(lua_State *L) { wxLuaState wxlState(L); --- 2287,2295 ---- int s_wxluatag_wxImageHistogramEntry = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHistogramEntry_Get_index[] = { &s_wxluatag_wxImageHistogramEntry, NULL }; ! static int LUACALL wxLua_wxImageHistogramEntry_Get_index(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogramEntry_Get_index[1] = {{ wxLua_wxImageHistogramEntry_Get_index, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxImageHistogramEntry_Get_index }}; ! // %member unsigned long index // GetIndex() only, SetIndex(idx) is not allowed ! static int LUACALL wxLua_wxImageHistogramEntry_Get_index(lua_State *L) { wxLuaState wxlState(L); *************** *** 2302,2310 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHistogramEntry_GetValue[] = { &s_wxluatag_wxImageHistogramEntry, NULL }; ! static int LUACALL wxLua_wxImageHistogramEntry_GetValue(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogramEntry_GetValue[1] = {{ wxLua_wxImageHistogramEntry_GetValue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxImageHistogramEntry_GetValue }}; ! // %rename Value %member unsigned long value // GetValue() and SetValue(val) ! static int LUACALL wxLua_wxImageHistogramEntry_GetValue(lua_State *L) { wxLuaState wxlState(L); --- 2302,2310 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHistogramEntry_Get_value[] = { &s_wxluatag_wxImageHistogramEntry, NULL }; ! static int LUACALL wxLua_wxImageHistogramEntry_Get_value(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogramEntry_Get_value[1] = {{ wxLua_wxImageHistogramEntry_Get_value, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxImageHistogramEntry_Get_value }}; ! // %member unsigned long value // GetValue() and SetValue(val) ! static int LUACALL wxLua_wxImageHistogramEntry_Get_value(lua_State *L) { wxLuaState wxlState(L); *************** *** 2317,2325 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHistogramEntry_SetIndex[] = { &s_wxluatag_wxImageHistogramEntry, &s_wxluaarg_Number, NULL }; ! static int LUACALL wxLua_wxImageHistogramEntry_SetIndex(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogramEntry_SetIndex[1] = {{ wxLua_wxImageHistogramEntry_SetIndex, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxImageHistogramEntry_SetIndex }}; ! // %rename Index %member unsigned long index // GetIndex() only, SetIndex(idx) is not allowed ! static int LUACALL wxLua_wxImageHistogramEntry_SetIndex(lua_State *L) { wxLuaState wxlState(L); --- 2317,2325 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHistogramEntry_Set_index[] = { &s_wxluatag_wxImageHistogramEntry, &s_wxluaarg_Number, NULL }; ! static int LUACALL wxLua_wxImageHistogramEntry_Set_index(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogramEntry_Set_index[1] = {{ wxLua_wxImageHistogramEntry_Set_index, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxImageHistogramEntry_Set_index }}; ! // %member unsigned long index // GetIndex() only, SetIndex(idx) is not allowed ! static int LUACALL wxLua_wxImageHistogramEntry_Set_index(lua_State *L) { wxLuaState wxlState(L); *************** *** 2333,2341 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHistogramEntry_SetValue[] = { &s_wxluatag_wxImageHistogramEntry, &s_wxluaarg_Number, NULL }; ! static int LUACALL wxLua_wxImageHistogramEntry_SetValue(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogramEntry_SetValue[1] = {{ wxLua_wxImageHistogramEntry_SetValue, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxImageHistogramEntry_SetValue }}; ! // %rename Value %member unsigned long value // GetValue() and SetValue(val) ! static int LUACALL wxLua_wxImageHistogramEntry_SetValue(lua_State *L) { wxLuaState wxlState(L); --- 2333,2341 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHistogramEntry_Set_value[] = { &s_wxluatag_wxImageHistogramEntry, &s_wxluaarg_Number, NULL }; ! static int LUACALL wxLua_wxImageHistogramEntry_Set_value(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogramEntry_Set_value[1] = {{ wxLua_wxImageHistogramEntry_Set_value, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxImageHistogramEntry_Set_value }}; ! // %member unsigned long value // GetValue() and SetValue(val) ! static int LUACALL wxLua_wxImageHistogramEntry_Set_value(lua_State *L) { wxLuaState wxlState(L); *************** *** 2388,2400 **** // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxImageHistogramEntry_methods[] = { ! { "GetIndex", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogramEntry_GetIndex, 1, NULL }, ! { "GetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogramEntry_GetValue, 1, NULL }, ! { "SetIndex", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogramEntry_SetIndex, 1, NULL }, ! { "SetValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogramEntry_SetValue, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxImageHistogramEntry_delete, 1, NULL }, ! { "index", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxImageHistogramEntry_SetIndex, 1, NULL }, ! { "index", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxImageHistogramEntry_GetIndex, 1, NULL }, ! { "value", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxImageHistogramEntry_SetValue, 1, NULL }, ! { "value", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxImageHistogramEntry_GetValue, 1, NULL }, { "wxImageHistogramEntry", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxImageHistogramEntry_constructor, 1, NULL }, --- 2388,2400 ---- // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxImageHistogramEntry_methods[] = { ! // %member { "Get_index", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogramEntry_Get_index, 1, NULL }, ! // %member { "Get_value", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogramEntry_Get_value, 1, NULL }, ! // %member { "Set_index", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogramEntry_Set_index, 1, NULL }, ! // %member { "Set_value", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogramEntry_Set_value, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxImageHistogramEntry_delete, 1, NULL }, ! { "index", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxImageHistogramEntry_Set_index, 1, NULL }, ! { "index", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxImageHistogramEntry_Get_index, 1, NULL }, ! { "value", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxImageHistogramEntry_Set_value, 1, NULL }, ! { "value", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxImageHistogramEntry_Get_value, 1, NULL }, { "wxImageHistogramEntry", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxImageHistogramEntry_constructor, 1, NULL }, *************** *** 2549,2556 **** // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxImageHistogram_iterator_methods[] = { ! { "Get_first", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogram_iterator_Get_first, 1, NULL }, ! { "Get_second", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogram_iterator_Get_second, 1, NULL }, ! { "Set_first", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogram_iterator_Set_first, 1, NULL }, ! { "Set_second", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogram_iterator_Set_second, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxImageHistogram_iterator_delete, 1, NULL }, { "first", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxImageHistogram_iterator_Set_first, 1, NULL }, --- 2549,2556 ---- // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxImageHistogram_iterator_methods[] = { ! // %member { "Get_first", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogram_iterator_Get_first, 1, NULL }, ! // %member { "Get_second", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogram_iterator_Get_second, 1, NULL }, ! // %member { "Set_first", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogram_iterator_Set_first, 1, NULL }, ! // %member { "Set_second", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxImageHistogram_iterator_Set_second, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxImageHistogram_iterator_delete, 1, NULL }, { "first", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxImageHistogram_iterator_Set_first, 1, NULL }, Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** wx_bind.cpp 27 Jun 2007 19:56:30 -0000 1.123 --- wx_bind.cpp 30 Jun 2007 00:12:25 -0000 1.124 *************** *** 63,70 **** #if defined(__MINGW32__) || defined(__GNUWIN32__) // FIX: "internal compiler error: output_operand: invalid expression as operand" ! const wxPoint wxLua_wxDefaultPositionHack = wxDefaultPosition; ! const wxSize wxLua_wxDefaultSizeHack = wxDefaultSize; ! #define wxDefaultPosition wxLua_wxDefaultPositionHack ! #define wxDefaultSize wxLua_wxDefaultSizeHack #endif //__MINGW32__ --- 63,76 ---- #if defined(__MINGW32__) || defined(__GNUWIN32__) // FIX: "internal compiler error: output_operand: invalid expression as operand" ! // We set their value again later since some compilers (gcc) won't set their value yet ! static wxPoint wxLua_wxDefaultPosition = wxDefaultPosition; ! static wxSize wxLua_wxDefaultSize = wxDefaultSize; ! static wxEventType wxLua_wxEVT_COMMAND_DIRPICKER_CHANGED = wxEVT_COMMAND_DIRPICKER_CHANGED; ! static wxEventType wxLua_wxEVT_COMMAND_FILEPICKER_CHANGED = wxEVT_COMMAND_FILEPICKER_CHANGED; ! ! #define wxDefaultPosition wxLua_wxDefaultPosition ! #define wxDefaultSize wxLua_wxDefaultSize ! #define wxEVT_COMMAND_DIRPICKER_CHANGED wxLua_wxEVT_COMMAND_DIRPICKER_CHANGED ! #define wxEVT_COMMAND_FILEPICKER_CHANGED wxLua_wxEVT_COMMAND_FILEPICKER_CHANGED #endif //__MINGW32__ *************** *** 1311,1314 **** --- 1317,1324 ---- #endif // wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE + #if wxLUA_USE_wxPointSizeRect + { "wxDefaultCoord", wxDefaultCoord }, + #endif // wxLUA_USE_wxPointSizeRect + #if wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP { "wxDragCancel", wxDragCancel }, *************** *** 1649,1652 **** --- 1659,1666 ---- #endif // (defined(wxHAS_NATIVE_RENDERER)) && (wxLUA_USE_wxRenderer) + #if (wxLUA_USE_wxRegion) && (defined (wxHAS_REGION_COMBINE )) + { "wxHAS_REGION_COMBINE", 1 }, + #endif // (wxLUA_USE_wxRegion) && (defined (wxHAS_REGION_COMBINE )) + #if wxLUA_USE_wxRenderer { "wxHDR_SORT_ICON_DOWN", wxHDR_SORT_ICON_DOWN }, *************** *** 2947,2950 **** --- 2961,2972 ---- #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX + #if (wxLUA_USE_wxRegion) && (defined (wxHAS_REGION_COMBINE )) + { "wxRGN_AND", wxRGN_AND }, + { "wxRGN_COPY", wxRGN_COPY }, + { "wxRGN_DIFF", wxRGN_DIFF }, + { "wxRGN_OR", wxRGN_OR }, + { "wxRGN_XOR", wxRGN_XOR }, + #endif // (wxLUA_USE_wxRegion) && (defined (wxHAS_REGION_COMBINE )) + { "wxRIGHT", wxRIGHT }, *************** *** 8199,8202 **** --- 8221,8235 ---- void wxLuaBinding_wx::PreRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable) { + #if defined(__MINGW32__) || defined(__GNUWIN32__) + #undef wxDefaultPosition + #undef wxDefaultSize + #undef wxEVT_COMMAND_DIRPICKER_CHANGED + #undef wxEVT_COMMAND_FILEPICKER_CHANGED + wxLua_wxDefaultPosition = wxDefaultPosition; + wxLua_wxDefaultSize = wxDefaultSize; + wxLua_wxEVT_COMMAND_DIRPICKER_CHANGED = wxEVT_COMMAND_DIRPICKER_CHANGED; + wxLua_wxEVT_COMMAND_FILEPICKER_CHANGED = wxEVT_COMMAND_FILEPICKER_CHANGED; + #endif //__MINGW32__ + // ugly hack for wxWidgets >2.7 change to use wxStockGDI::GetXXX if (wxLua_wxBLACK == NULL) Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** gdi.cpp 27 Jun 2007 14:29:54 -0000 1.81 --- gdi.cpp 30 Jun 2007 00:12:23 -0000 1.82 *************** *** 38,42 **** static int LUACALL wxLua_wxPoint_GetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint_GetX[1] = {{ wxLua_wxPoint_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxPoint_GetX }}; ! // %rename X %member int x // GetX() and SetX(int x) static int LUACALL wxLua_wxPoint_GetX(lua_State *L) { --- 38,42 ---- static int LUACALL wxLua_wxPoint_GetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint_GetX[1] = {{ wxLua_wxPoint_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxPoint_GetX }}; ! // %rename X %member_func int x // GetX() and SetX(int x) static int LUACALL wxLua_wxPoint_GetX(lua_State *L) [...1693 lines suppressed...] #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer) ! // %member { "Set_m_selectionColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_selectionColour, 1, NULL }, #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer) *************** *** 16292,16297 **** // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxRendererVersion_methods[] = { ! { "Get_age", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxRendererVersion_Get_age, 1, NULL }, ! { "Get_version", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxRendererVersion_Get_version, 1, NULL }, { "IsCompatible", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxRendererVersion_IsCompatible, 1, NULL }, { "age", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxRendererVersion_Get_age, 1, NULL }, --- 17176,17181 ---- // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxRendererVersion_methods[] = { ! // %member { "Get_age", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxRendererVersion_Get_age, 1, NULL }, ! // %member { "Get_version", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxRendererVersion_Get_version, 1, NULL }, { "IsCompatible", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxRendererVersion_IsCompatible, 1, NULL }, { "age", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxRendererVersion_Get_age, 1, NULL }, Index: geometry.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/geometry.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** geometry.cpp 17 Jun 2007 18:36:20 -0000 1.34 --- geometry.cpp 30 Jun 2007 00:12:24 -0000 1.35 *************** *** 154,158 **** static int LUACALL wxLua_wxPoint2DInt_GetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_GetX[1] = {{ wxLua_wxPoint2DInt_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxPoint2DInt_GetX }}; ! // %rename X %member wxInt32 m_x static int LUACALL wxLua_wxPoint2DInt_GetX(lua_State *L) { --- 154,158 ---- static int LUACALL wxLua_wxPoint2DInt_GetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_GetX[1] = {{ wxLua_wxPoint2DInt_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxPoint2DInt_GetX }}; ! // %rename X %member_func wxInt32 m_x static int LUACALL wxLua_wxPoint2DInt_GetX(lua_State *L) { *************** *** 169,173 **** static int LUACALL wxLua_wxPoint2DInt_GetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_GetY[1] = {{ wxLua_wxPoint2DInt_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxPoint2DInt_GetY }}; ! // %rename Y %member wxInt32 m_y static int LUACALL wxLua_wxPoint2DInt_GetY(lua_State *L) { --- 169,173 ---- static int LUACALL wxLua_wxPoint2DInt_GetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_GetY[1] = {{ wxLua_wxPoint2DInt_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxPoint2DInt_GetY }}; ! // %rename Y %member_func wxInt32 m_y static int LUACALL wxLua_wxPoint2DInt_GetY(lua_State *L) { *************** *** 233,237 **** static int LUACALL wxLua_wxPoint2DInt_SetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_SetX[1] = {{ wxLua_wxPoint2DInt_SetX, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPoint2DInt_SetX }}; ! // %rename X %member wxInt32 m_x static int LUACALL wxLua_wxPoint2DInt_SetX(lua_State *L) { --- 233,237 ---- static int LUACALL wxLua_wxPoint2DInt_SetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_SetX[1] = {{ wxLua_wxPoint2DInt_SetX, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPoint2DInt_SetX }}; ! // %rename X %member_func wxInt32 m_x static int LUACALL wxLua_wxPoint2DInt_SetX(lua_State *L) { *************** *** 249,253 **** static int LUACALL wxLua_wxPoint2DInt_SetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_SetY[1] = {{ wxLua_wxPoint2DInt_SetY, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPoint2DInt_SetY }}; ! // %rename Y %member wxInt32 m_y static int LUACALL wxLua_wxPoint2DInt_SetY(lua_State *L) { --- 249,253 ---- static int LUACALL wxLua_wxPoint2DInt_SetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_SetY[1] = {{ wxLua_wxPoint2DInt_SetY, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPoint2DInt_SetY }}; ! // %rename Y %member_func wxInt32 m_y static int LUACALL wxLua_wxPoint2DInt_SetY(lua_State *L) { *************** *** 278,307 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPoint2DInt_op_add_assign[] = { &s_wxluatag_wxPoint2DInt, &s_wxluatag_wxPoint2DInt, NULL }; ! static int LUACALL wxLua_wxPoint2DInt_op_add_assign(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_op_add_assign[1] = {{ wxLua_wxPoint2DInt_op_add_assign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPoint2DInt_op_add_assign }}; ! // %operator wxPoint2DInt& operator+=(const wxPoint2DInt& pt) ! static int LUACALL wxLua_wxPoint2DInt_op_add_assign(lua_State *L) { wxLuaState wxlState(L); ! wxPoint2DInt *returns; // const wxPoint2DInt pt const wxPoint2DInt * pt = (const wxPoint2DInt *)wxlState.GetUserDataType(2, s_wxluatag_wxPoint2DInt); // get this wxPoint2DInt * self = (wxPoint2DInt *)wxlState.GetUserDataType(1, s_wxluatag_wxPoint2DInt); ! // call op_add_assign ! returns = self; ! *returns = ((*self)+=(*pt)); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxPoint2DInt, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPoint2DInt_op_assign[] = { &s_wxluatag_wxPoint2DInt, &s_wxluatag_wxPoint2DInt, NULL }; ! static int LUACALL wxLua_wxPoint2DInt_op_assign(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_op_assign[1] = {{ wxLua_wxPoint2DInt_op_assign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPoint2DInt_op_assign }}; ! // %operator wxPoint2DInt& operator=(const wxPoint2DInt& pt) ! static int LUACALL wxLua_wxPoint2DInt_op_assign(lua_State *L) { wxLuaState wxlState(L); --- 278,306 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPoint2DInt_op_eq[] = { &s_wxluatag_wxPoint2DInt, &s_wxluatag_wxPoint2DInt, NULL }; ! static int LUACALL wxLua_wxPoint2DInt_op_eq(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_op_eq[1] = {{ wxLua_wxPoint2DInt_op_eq, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPoint2DInt_op_eq }}; ! // %operator bool operator==(const wxPoint2DInt& pt) const ! static int LUACALL wxLua_wxPoint2DInt_op_eq(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // const wxPoint2DInt pt const wxPoint2DInt * pt = (const wxPoint2DInt *)wxlState.GetUserDataType(2, s_wxluatag_wxPoint2DInt); // get this wxPoint2DInt * self = (wxPoint2DInt *)wxlState.GetUserDataType(1, s_wxluatag_wxPoint2DInt); ! // call op_eq ! returns = ((*self)==(*pt)); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPoint2DInt_op_iadd[] = { &s_wxluatag_wxPoint2DInt, &s_wxluatag_wxPoint2DInt, NULL }; ! static int LUACALL wxLua_wxPoint2DInt_op_iadd(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_op_iadd[1] = {{ wxLua_wxPoint2DInt_op_iadd, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPoint2DInt_op_iadd }}; ! // %operator wxPoint2DInt& operator+=(const wxPoint2DInt& pt) ! static int LUACALL wxLua_wxPoint2DInt_op_iadd(lua_State *L) { wxLuaState wxlState(L); *************** *** 311,317 **** // get this wxPoint2DInt * self = (wxPoint2DInt *)wxlState.GetUserDataType(1, s_wxluatag_wxPoint2DInt); ! // call op_assign returns = self; ! *returns = ((*self)=(*pt)); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxPoint2DInt, returns); --- 310,316 ---- // get this wxPoint2DInt * self = (wxPoint2DInt *)wxlState.GetUserDataType(1, s_wxluatag_wxPoint2DInt); ! // call op_iadd returns = self; ! *returns = ((*self)+=(*pt)); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxPoint2DInt, returns); *************** *** 320,328 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxPoint2DInt_op_div_assign[] = { &s_wxluatag_wxPoint2DInt, &s_wxluatag_wxPoint2DInt, NULL }; ! static int LUACALL wxLua_wxPoint2DInt_op_div_assign(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxPoint2DInt_op_div_assign[1] = {{ wxLua_wxPoint2DInt_op_div_assign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxPoint2DInt_op... [truncated message content] |
