Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src wxadv_bind.cpp, 1.14, 1.15 wxaui_bind.cpp, 1.12, 1.13 wxbase_data.cpp, 1.16, 1.17 wxbase_file.cpp, 1.14, 1.15 wxcore_controls.cpp, 1.15, 1.16 wxcore_gdi.cpp, 1.18, 1.19 wxcore_geometry.cpp, 1.12, 1.13 wxcore_image.cpp, 1.15, 1.16 wxnet_bind.cpp, 1.10, 1.11
|
From: John L. <jr...@us...> - 2008-10-29 04:44:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1748/wxLua/modules/wxbind/src Modified Files: wxadv_bind.cpp wxaui_bind.cpp wxbase_data.cpp wxbase_file.cpp wxcore_controls.cpp wxcore_gdi.cpp wxcore_geometry.cpp wxcore_image.cpp wxnet_bind.cpp Log Message: Fix [] operator for returning a reference & to a class. Simplify code for operators that return a reference to the self. (=, +=, -=, etc) Index: wxnet_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_bind.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxnet_bind.cpp 29 Jan 2008 04:22:54 -0000 1.10 --- wxnet_bind.cpp 29 Oct 2008 04:44:33 -0000 1.11 *************** *** 2407,2412 **** wxURI * self = (wxURI *)wxluaT_getuserdatatype(L, 1, wxluatype_wxURI); // call op_set wxURI* returns = self; - *returns = ((*self)=(*uri)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxURI); --- 2407,2412 ---- wxURI * self = (wxURI *)wxluaT_getuserdatatype(L, 1, wxluatype_wxURI); // call op_set + (*self)=(*uri); wxURI* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxURI); Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxaui_bind.cpp 29 Jan 2008 04:22:51 -0000 1.12 --- wxaui_bind.cpp 29 Oct 2008 04:44:33 -0000 1.13 *************** *** 5227,5232 **** wxAuiPaneInfo * self = (wxAuiPaneInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiPaneInfo); // call op_set wxAuiPaneInfo* returns = self; - *returns = ((*self)=(*c)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxAuiPaneInfo); --- 5227,5232 ---- wxAuiPaneInfo * self = (wxAuiPaneInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiPaneInfo); // call op_set + (*self)=(*c); wxAuiPaneInfo* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxAuiPaneInfo); *************** *** 7220,7225 **** wxAuiDockInfo * self = (wxAuiDockInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiDockInfo); // call op_set wxAuiDockInfo* returns = self; - *returns = ((*self)=(*c)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxAuiDockInfo); --- 7220,7225 ---- wxAuiDockInfo * self = (wxAuiDockInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiDockInfo); // call op_set + (*self)=(*c); wxAuiDockInfo* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxAuiDockInfo); Index: wxbase_file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_file.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxbase_file.cpp 1 Apr 2008 04:19:42 -0000 1.14 --- wxbase_file.cpp 29 Oct 2008 04:44:33 -0000 1.15 *************** *** 2157,2162 **** wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileName); // call op_set wxFileName* returns = self; - *returns = ((*self)=(*filename)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxFileName); --- 2157,2162 ---- wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileName); // call op_set + (*self)=(*filename); wxFileName* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxFileName); Index: wxcore_geometry.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_geometry.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxcore_geometry.cpp 22 Oct 2008 05:31:45 -0000 1.12 --- wxcore_geometry.cpp 29 Oct 2008 04:44:33 -0000 1.13 *************** *** 275,280 **** wxPoint2DInt * self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt); // call op_iadd wxPoint2DInt* returns = self; - *returns = ((*self)+=(*pt)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DInt); --- 275,280 ---- wxPoint2DInt * self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt); // call op_iadd + (*self)+=(*pt); wxPoint2DInt* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DInt); *************** *** 294,299 **** wxPoint2DInt * self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt); // call op_idiv wxPoint2DInt* returns = self; - *returns = ((*self)/=(*pt)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DInt); --- 294,299 ---- wxPoint2DInt * self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt); // call op_idiv + (*self)/=(*pt); wxPoint2DInt* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DInt); *************** *** 313,318 **** wxPoint2DInt * self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt); // call op_imul wxPoint2DInt* returns = self; - *returns = ((*self)*=(*pt)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DInt); --- 313,318 ---- wxPoint2DInt * self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt); // call op_imul + (*self)*=(*pt); wxPoint2DInt* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DInt); *************** *** 332,337 **** wxPoint2DInt * self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt); // call op_isub wxPoint2DInt* returns = self; - *returns = ((*self)-=(*pt)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DInt); --- 332,337 ---- wxPoint2DInt * self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt); // call op_isub + (*self)-=(*pt); wxPoint2DInt* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DInt); *************** *** 370,375 **** wxPoint2DInt * self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt); // call op_set wxPoint2DInt* returns = self; - *returns = ((*self)=(*pt)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DInt); --- 370,375 ---- wxPoint2DInt * self = (wxPoint2DInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DInt); // call op_set + (*self)=(*pt); wxPoint2DInt* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DInt); *************** *** 732,737 **** wxPoint2DDouble * self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble); // call op_iadd wxPoint2DDouble* returns = self; - *returns = ((*self)+=(*pt)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DDouble); --- 732,737 ---- wxPoint2DDouble * self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble); // call op_iadd + (*self)+=(*pt); wxPoint2DDouble* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DDouble); *************** *** 751,756 **** wxPoint2DDouble * self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble); // call op_idiv wxPoint2DDouble* returns = self; - *returns = ((*self)/=(*pt)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DDouble); --- 751,756 ---- wxPoint2DDouble * self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble); // call op_idiv + (*self)/=(*pt); wxPoint2DDouble* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DDouble); *************** *** 770,775 **** wxPoint2DDouble * self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble); // call op_imul wxPoint2DDouble* returns = self; - *returns = ((*self)*=(*pt)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DDouble); --- 770,775 ---- wxPoint2DDouble * self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble); // call op_imul + (*self)*=(*pt); wxPoint2DDouble* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DDouble); *************** *** 789,794 **** wxPoint2DDouble * self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble); // call op_isub wxPoint2DDouble* returns = self; - *returns = ((*self)-=(*pt)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DDouble); --- 789,794 ---- wxPoint2DDouble * self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble); // call op_isub + (*self)-=(*pt); wxPoint2DDouble* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DDouble); *************** *** 827,832 **** wxPoint2DDouble * self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble); // call op_set wxPoint2DDouble* returns = self; - *returns = ((*self)=(*pt)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DDouble); --- 827,832 ---- wxPoint2DDouble * self = (wxPoint2DDouble *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint2DDouble); // call op_set + (*self)=(*pt); wxPoint2DDouble* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint2DDouble); Index: wxadv_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxadv_bind.cpp 17 Mar 2008 03:05:02 -0000 1.14 --- wxadv_bind.cpp 29 Oct 2008 04:44:33 -0000 1.15 *************** *** 10116,10121 **** wxGridCellCoords * self = (wxGridCellCoords *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGridCellCoords); // call op_set wxGridCellCoords* returns = self; - *returns = ((*self)=(*other)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxGridCellCoords); --- 10116,10121 ---- wxGridCellCoords * self = (wxGridCellCoords *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGridCellCoords); // call op_set + (*self)=(*other); wxGridCellCoords* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxGridCellCoords); Index: wxcore_controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_controls.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxcore_controls.cpp 26 Mar 2008 05:01:31 -0000 1.15 --- wxcore_controls.cpp 29 Oct 2008 04:44:33 -0000 1.16 *************** *** 10954,10959 **** wxTreeItemId * self = (wxTreeItemId *)wxluaT_getuserdatatype(L, 1, wxluatype_wxTreeItemId); // call op_set wxTreeItemId* returns = self; - *returns = ((*self)=(*otherId)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxTreeItemId); --- 10954,10959 ---- wxTreeItemId * self = (wxTreeItemId *)wxluaT_getuserdatatype(L, 1, wxluatype_wxTreeItemId); // call op_set + (*self)=(*otherId); wxTreeItemId* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxTreeItemId); Index: wxcore_gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_gdi.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxcore_gdi.cpp 24 Oct 2008 04:40:12 -0000 1.18 --- wxcore_gdi.cpp 29 Oct 2008 04:44:33 -0000 1.19 *************** *** 204,209 **** wxPoint * self = (wxPoint *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint); // call op_iadd wxPoint* returns = self; - *returns = ((*self)+=(*s)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint); --- 204,209 ---- wxPoint * self = (wxPoint *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint); // call op_iadd + (*self)+=(*s); wxPoint* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint); *************** *** 223,228 **** wxPoint * self = (wxPoint *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint); // call op_iadd wxPoint* returns = self; - *returns = ((*self)+=(*p)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint); --- 223,228 ---- wxPoint * self = (wxPoint *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint); // call op_iadd + (*self)+=(*p); wxPoint* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint); *************** *** 242,247 **** wxPoint * self = (wxPoint *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint); // call op_isub wxPoint* returns = self; - *returns = ((*self)-=(*s)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint); --- 242,247 ---- wxPoint * self = (wxPoint *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint); // call op_isub + (*self)-=(*s); wxPoint* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint); *************** *** 261,266 **** wxPoint * self = (wxPoint *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint); // call op_isub wxPoint* returns = self; - *returns = ((*self)-=(*p)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint); --- 261,266 ---- wxPoint * self = (wxPoint *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint); // call op_isub + (*self)-=(*p); wxPoint* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint); *************** *** 317,322 **** wxPoint * self = (wxPoint *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint); // call op_set wxPoint* returns = self; - *returns = ((*self)=(*p)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint); --- 317,322 ---- wxPoint * self = (wxPoint *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPoint); // call op_set + (*self)=(*p); wxPoint* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPoint); *************** *** 791,796 **** wxSize * self = (wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize); // call op_iadd wxSize* returns = self; - *returns = ((*self)+=(*sz)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxSize); --- 791,796 ---- wxSize * self = (wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize); // call op_iadd + (*self)+=(*sz); wxSize* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxSize); *************** *** 810,815 **** wxSize * self = (wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize); // call op_idiv wxSize* returns = self; - *returns = ((*self)/=(i)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxSize); --- 810,815 ---- wxSize * self = (wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize); // call op_idiv + (*self)/=(i); wxSize* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxSize); *************** *** 829,834 **** wxSize * self = (wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize); // call op_imul wxSize* returns = self; - *returns = ((*self)*=(i)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxSize); --- 829,834 ---- wxSize * self = (wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize); // call op_imul + (*self)*=(i); wxSize* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxSize); *************** *** 848,853 **** wxSize * self = (wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize); // call op_isub wxSize* returns = self; - *returns = ((*self)-=(*sz)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxSize); --- 848,853 ---- wxSize * self = (wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize); // call op_isub + (*self)-=(*sz); wxSize* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxSize); *************** *** 906,911 **** wxSize * self = (wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize); // call op_set wxSize* returns = self; - *returns = ((*self)=(*s)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxSize); --- 906,911 ---- wxSize * self = (wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize); // call op_set + (*self)=(*s); wxSize* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxSize); *************** *** 1796,1801 **** wxRect * self = (wxRect *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect); // call op_iadd wxRect* returns = self; - *returns = ((*self)+=(*rect)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxRect); --- 1796,1801 ---- wxRect * self = (wxRect *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect); // call op_iadd + (*self)+=(*rect); wxRect* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxRect); *************** *** 1815,1820 **** wxRect * self = (wxRect *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect); // call op_set wxRect* returns = self; - *returns = ((*self)=(*r)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxRect); --- 1815,1820 ---- wxRect * self = (wxRect *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRect); // call op_set + (*self)=(*r); wxRect* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxRect); *************** *** 2731,2736 **** wxRegion * self = (wxRegion *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRegion); // call op_set wxRegion* returns = self; - *returns = ((*self)=(*r)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxRegion); --- 2731,2736 ---- wxRegion * self = (wxRegion *)wxluaT_getuserdatatype(L, 1, wxluatype_wxRegion); // call op_set + (*self)=(*r); wxRegion* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxRegion); *************** *** 3724,3729 **** wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFont); // call op_set wxFont* returns = self; - *returns = ((*self)=(*f)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxFont); --- 3724,3729 ---- wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFont); // call op_set + (*self)=(*f); wxFont* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxFont); *************** *** 5275,5280 **** wxColour * self = (wxColour *)wxluaT_getuserdatatype(L, 1, wxluatype_wxColour); // call op_set wxColour* returns = self; - *returns = ((*self)=(*c)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxColour); --- 5275,5280 ---- wxColour * self = (wxColour *)wxluaT_getuserdatatype(L, 1, wxluatype_wxColour); // call op_set + (*self)=(*c); wxColour* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxColour); *************** *** 5857,5862 **** wxPen * self = (wxPen *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPen); // call op_set wxPen* returns = self; - *returns = ((*self)=(*p)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPen); --- 5857,5862 ---- wxPen * self = (wxPen *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPen); // call op_set + (*self)=(*p); wxPen* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxPen); *************** *** 6305,6310 **** wxBrush * self = (wxBrush *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBrush); // call op_set wxBrush* returns = self; - *returns = ((*self)=(*b)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxBrush); --- 6305,6310 ---- wxBrush * self = (wxBrush *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBrush); // call op_set + (*self)=(*b); wxBrush* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxBrush); *************** *** 7075,7080 **** wxIcon * self = (wxIcon *)wxluaT_getuserdatatype(L, 1, wxluatype_wxIcon); // call op_set wxIcon* returns = self; - *returns = ((*self)=(*i)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxIcon); --- 7075,7080 ---- wxIcon * self = (wxIcon *)wxluaT_getuserdatatype(L, 1, wxluatype_wxIcon); // call op_set + (*self)=(*i); wxIcon* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxIcon); *************** *** 7766,7771 **** wxBitmap * self = (wxBitmap *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmap); // call op_set wxBitmap* returns = self; - *returns = ((*self)=(*b)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxBitmap); --- 7766,7771 ---- wxBitmap * self = (wxBitmap *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmap); // call op_set + (*self)=(*b); wxBitmap* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxBitmap); *************** *** 8205,8210 **** wxCursor * self = (wxCursor *)wxluaT_getuserdatatype(L, 1, wxluatype_wxCursor); // call op_set wxCursor* returns = self; - *returns = ((*self)=(*c)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxCursor); --- 8205,8210 ---- wxCursor * self = (wxCursor *)wxluaT_getuserdatatype(L, 1, wxluatype_wxCursor); // call op_set + (*self)=(*c); wxCursor* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxCursor); *************** *** 8432,8437 **** wxMask * self = (wxMask *)wxluaT_getuserdatatype(L, 1, wxluatype_wxMask); // call op_set wxMask* returns = self; - *returns = ((*self)=(*m)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxMask); --- 8432,8437 ---- wxMask * self = (wxMask *)wxluaT_getuserdatatype(L, 1, wxluatype_wxMask); // call op_set + (*self)=(*m); wxMask* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxMask); *************** *** 12596,12599 **** --- 12596,12617 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxArrayVideoModes_delete }}; + static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_op_index[] = { &wxluatype_wxArrayVideoModes, &wxluatype_TNUMBER, NULL }; + static int LUACALL wxLua_wxArrayVideoModes_op_index(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_op_index[1] = {{ wxLua_wxArrayVideoModes_op_index, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxArrayVideoModes_op_index }}; + // %operator wxVideoMode& operator[](size_t nIndex) + static int LUACALL wxLua_wxArrayVideoModes_op_index(lua_State *L) + { + // size_t nIndex + size_t nIndex = (size_t)wxlua_getnumbertype(L, 2); + // get this + wxArrayVideoModes * self = (wxArrayVideoModes *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayVideoModes); + // call op_index + wxVideoMode* returns = &(*self)[(nIndex)]; + // push the result datatype + wxluaT_pushuserdatatype(L, returns, wxluatype_wxVideoMode); + + return 1; + } + static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_constructor1[] = { &wxluatype_wxArrayVideoModes, NULL }; static int LUACALL wxLua_wxArrayVideoModes_constructor1(lua_State *L); *************** *** 12657,12660 **** --- 12675,12679 ---- { "Shrink", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxArrayVideoModes_Shrink, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxArrayVideoModes_delete, 1, NULL }, + { "op_index", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxArrayVideoModes_op_index, 1, NULL }, #if (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) Index: wxbase_data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_data.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxbase_data.cpp 29 Jan 2008 04:22:51 -0000 1.16 --- wxbase_data.cpp 29 Oct 2008 04:44:33 -0000 1.17 *************** *** 1859,1862 **** --- 1859,1880 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayInt_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxArrayInt_delete }}; + static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayInt_op_index[] = { &wxluatype_wxArrayInt, &wxluatype_TNUMBER, NULL }; + static int LUACALL wxLua_wxArrayInt_op_index(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayInt_op_index[1] = {{ wxLua_wxArrayInt_op_index, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxArrayInt_op_index }}; + // %operator int operator[](size_t nIndex) + static int LUACALL wxLua_wxArrayInt_op_index(lua_State *L) + { + // size_t nIndex + size_t nIndex = (size_t)wxlua_getnumbertype(L, 2); + // get this + wxArrayInt * self = (wxArrayInt *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayInt); + // call op_index + int returns = ((*self)[(nIndex)]); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayInt_constructor1[] = { &wxluatype_wxArrayInt, NULL }; static int LUACALL wxLua_wxArrayInt_constructor1(lua_State *L); *************** *** 1922,1925 **** --- 1940,1944 ---- { "ToLuaTable", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxArrayInt_ToLuaTable, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxArrayInt_delete, 1, NULL }, + { "op_index", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxArrayInt_op_index, 1, NULL }, #if (wxLUA_USE_wxArrayInt) *************** *** 2205,2208 **** --- 2224,2245 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayString_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxArrayString_delete }}; + static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayString_op_index[] = { &wxluatype_wxArrayString, &wxluatype_TNUMBER, NULL }; + static int LUACALL wxLua_wxArrayString_op_index(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayString_op_index[1] = {{ wxLua_wxArrayString_op_index, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxArrayString_op_index }}; + // %operator wxString& operator[](size_t nIndex) + static int LUACALL wxLua_wxArrayString_op_index(lua_State *L) + { + // size_t nIndex + size_t nIndex = (size_t)wxlua_getnumbertype(L, 2); + // get this + wxArrayString * self = (wxArrayString *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayString); + // call op_index + wxString returns = (*self)[(nIndex)]; + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayString_constructor1[] = { &wxluatype_wxArrayString, NULL }; static int LUACALL wxLua_wxArrayString_constructor1(lua_State *L); *************** *** 2270,2273 **** --- 2307,2311 ---- { "ToLuaTable", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxArrayString_ToLuaTable, 1, NULL }, { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxArrayString_delete, 1, NULL }, + { "op_index", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxArrayString_op_index, 1, NULL }, #if (wxLUA_USE_wxArrayString) Index: wxcore_image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_image.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxcore_image.cpp 29 Jan 2008 04:22:53 -0000 1.15 --- wxcore_image.cpp 29 Oct 2008 04:44:33 -0000 1.16 *************** *** 1649,1654 **** wxImage * self = (wxImage *)wxluaT_getuserdatatype(L, 1, wxluatype_wxImage); // call op_set wxImage* returns = self; - *returns = ((*self)=(*image)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxImage); --- 1649,1654 ---- wxImage * self = (wxImage *)wxluaT_getuserdatatype(L, 1, wxluatype_wxImage); // call op_set + (*self)=(*image); wxImage* returns = self; // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxImage); *************** *** 2294,2299 **** wxImageHistogram::iterator * self = (wxImageHistogram::iterator *)wxluaT_getuserdatatype(L, 1, wxluatype_wxImageHistogram_iterator); // call op_inc ! wxImageHistogram::iterator* returns = self; ! *returns = (++(*self)); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxImageHistogram_iterator); --- 2294,2298 ---- wxImageHistogram::iterator * self = (wxImageHistogram::iterator *)wxluaT_getuserdatatype(L, 1, wxluatype_wxImageHistogram_iterator); // call op_inc ! wxImageHistogram::iterator* returns = &++(*self); // push the result datatype wxluaT_pushuserdatatype(L, returns, wxluatype_wxImageHistogram_iterator); |
