Menu
▾
▴
[Wxlua-commit] wxLua/docs binding.html, 1.23, 1.24 wxlua.html, 1.26, 1.27 wxluaref.html, 1.37, 1.38
|
From: John L. <jr...@us...> - 2007-06-30 00:13:04
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9448/wxLua/docs Modified Files: binding.html wxlua.html wxluaref.html 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: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxluaref.html 28 Jun 2007 21:52:56 -0000 1.37 --- wxluaref.html 30 Jun 2007 00:12:20 -0000 1.38 *************** *** 3352,3355 **** --- 3352,3356 ---- <a href="#wxProtocolError">wxProtocolError</a><br> <a href="#wxRegionContain">wxRegionContain</a><br> + <a href="#wxRegionOp">wxRegionOp</a><br> <a href="#wxRelationship">wxRelationship</a><br> <a href="#wxRendererVersion::dummy">wxRendererVersion::dummy</a><br> *************** *** 6652,6655 **** --- 6653,6658 ---- void SetRefData(<a href="#wxObjectRefData">wxObjectRefData</a>* data)<br> void UnRef()<br> + <br> + <font color=#009900>//<i>%operator</i> <a href="#wxObject">wxObject</a>& operator=(const <a href="#wxObject">wxObject</a>& other)</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11190,11193 **** --- 11193,11198 ---- <i>%include</i> "wx/gdicmn.h"<br> <br> + <font color=#006666><i>%define</i> wxDefaultCoord</font><br> + <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxPoint">wxPoint</a></font></b> <blockquote> *************** *** 11205,11222 **** void Set(int x, int y)<br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member</i> int x <font color=#009900>// GetX() and SetX(int x)</font></font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member</i> int y <font color=#009900>// GetY() and SetY(int y)</font></font><br> <br> <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator=(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <i>%operator</i> bool operator==(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <i>%operator</i> bool operator!=(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator+(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator+=(const <a href="#wxPoint">wxPoint</a>& p)<br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator-=(const <a href="#wxPoint">wxPoint</a>& p)<br> ! <font color=#990099> <i>%rename</i> op_add_assign_Size <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator+=(const <a href="#wxSize">wxSize</a>& s)</font><br> ! <font color=#990099> <i>%rename</i> op_sub_assign_Size <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator-=(const <a href="#wxSize">wxSize</a>& s)</font><br> ! <font color=#990099> <i>%rename</i> op_add_Size <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator+(const <a href="#wxSize">wxSize</a>& s) const</font><br> ! <font color=#990099> <i>%rename</i> op_sub_Size <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-(const <a href="#wxSize">wxSize</a>& s) const</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> --- 11210,11235 ---- void Set(int x, int y)<br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member_func</i> int x <font color=#009900>// GetX() and SetX(int x)</font></font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member_func</i> int y <font color=#009900>// GetY() and SetY(int y)</font></font><br> <br> <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator=(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <br> ! <i>%operator</i> bool operator==(const <a href="#wxPoint">wxPoint</a>& p) const <font color=#009900>//{ return x == p.x && y == p.y; }</font><br> ! <i>%operator</i> bool operator!=(const <a href="#wxPoint">wxPoint</a>& p) const <font color=#009900>//{ return !(*this == p); }</font><br> ! <br> ! <font color=#009900>// arithmetic operations (component wise)</font><br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator+(const <a href="#wxPoint">wxPoint</a>& p) const <font color=#009900>//{ return <a href="#wxPoint">wxPoint</a>(x + p.x, y + p.y); }</font><br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-(const <a href="#wxPoint">wxPoint</a>& p) const <font color=#009900>//{ return <a href="#wxPoint">wxPoint</a>(x - p.x, y - p.y); }</font><br> ! <br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator+=(const <a href="#wxPoint">wxPoint</a>& p) <font color=#009900>//{ x += p.x; y += p.y; return *this; }</font><br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator-=(const <a href="#wxPoint">wxPoint</a>& p) <font color=#009900>//{ x -= p.x; y -= p.y; return *this; }</font><br> ! <br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator+=(const <a href="#wxSize">wxSize</a>& s) <font color=#009900>//{ x += s.GetWidth(); y += s.GetHeight(); return *this; }</font><br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator-=(const <a href="#wxSize">wxSize</a>& s) <font color=#009900>//{ x -= s.GetWidth(); y -= s.GetHeight(); return *this; }</font><br> ! <br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator+(const <a href="#wxSize">wxSize</a>& s) const <font color=#009900>//{ return <a href="#wxPoint">wxPoint</a>(x + s.GetWidth(), y + s.GetHeight()); }</font><br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-(const <a href="#wxSize">wxSize</a>& s) const <font color=#009900>//{ return <a href="#wxPoint">wxPoint</a>(x - s.GetWidth(), y - s.GetHeight()); }</font><br> ! <br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-() const { return <a href="#wxPoint">wxPoint</a>(-x, -y); }<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11257,11260 **** --- 11270,11288 ---- void SetHeight(int height)<br> void SetWidth(int width)<br> + <br> + <i>%operator</i> <a href="#wxSize">wxSize</a>& operator=(const <a href="#wxSize">wxSize</a>& s) const<br> + <br> + <i>%operator</i> bool operator==(const <a href="#wxSize">wxSize</a>& sz) const <font color=#009900>//{ return x == sz.x && y == sz.y; }</font><br> + <i>%operator</i> bool operator!=(const <a href="#wxSize">wxSize</a>& sz) const <font color=#009900>//{ return x != sz.x || y != sz.y; }</font><br> + <br> + <i>%operator</i> <a href="#wxSize">wxSize</a> operator+(const <a href="#wxSize">wxSize</a>& sz) const <font color=#009900>//{ return <a href="#wxSize">wxSize</a>(x + sz.x, y + sz.y); }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a> operator-(const <a href="#wxSize">wxSize</a>& sz) const <font color=#009900>//{ return <a href="#wxSize">wxSize</a>(x - sz.x, y - sz.y); }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a> operator/(int i) const <font color=#009900>//{ return <a href="#wxSize">wxSize</a>(x / i, y / i); }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a> operator*(int i) const <font color=#009900>//{ return <a href="#wxSize">wxSize</a>(x * i, y * i); }</font><br> + <br> + <i>%operator</i> <a href="#wxSize">wxSize</a>& operator+=(const <a href="#wxSize">wxSize</a>& sz) <font color=#009900>//{ x += sz.x; y += sz.y; return *this; }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a>& operator-=(const <a href="#wxSize">wxSize</a>& sz) <font color=#009900>//{ x -= sz.x; y -= sz.y; return *this; }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a>& operator/=(const int i) <font color=#009900>//{ x /= i; y /= i; return *this; }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a>& operator*=(const int i) <font color=#009900>//{ x *= i; y *= i; return *this; }</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11311,11314 **** --- 11339,11348 ---- void SetY(int Y)<br> <a href="#wxRect">wxRect</a> Union(const <a href="#wxRect">wxRect</a>& rect) const <font color=#009900>//<a href="#wxRect">wxRect</a>& Union(const <a href="#wxRect">wxRect</a>& rect);</font><br> + <br> + <i>%operator</i> <a href="#wxRect">wxRect</a>& operator=(const <a href="#wxRect">wxRect</a>& r) const<br> + <br> + <i>%operator</i> bool operator==(const <a href="#wxRect">wxRect</a>& rect) const<br> + <i>%operator</i> <a href="#wxRect">wxRect</a> operator+(const <a href="#wxRect">wxRect</a>& rect) const<br> + <i>%operator</i> <a href="#wxRect">wxRect</a>& operator+=(const <a href="#wxRect">wxRect</a>& rect)<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11340,11343 **** --- 11374,11391 ---- </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> + <i>%if</i> defined(wxHAS_REGION_COMBINE) <font color=#009900>// MSW and MAC</font><br> + <b><font size=+1 color=#0066CC> <i>%enum</i> <a name="wxRegionOp">wxRegionOp</a></font></b> + <blockquote><font color=#0066CC> + wxRGN_AND <font color=#009900>// Creates the intersection of the two combined regions.</font><br> + wxRGN_COPY <font color=#009900>// Creates a copy of the region</font><br> + wxRGN_DIFF <font color=#009900>// Combines the parts of first region that are not in the second one</font><br> + wxRGN_OR <font color=#009900>// Creates the union of two combined regions.</font><br> + wxRGN_XOR <font color=#009900>// Creates the union of two regions except for any overlapping areas.</font><br> + </font> + </blockquote><font color=#0066CC> <i>%endenum</i></font><br> + <br> + <font color=#006666><i>%define</i> wxHAS_REGION_COMBINE 1</font><br> + <i>%endif</i> <font color=#009900>// defined(wxHAS_REGION_COMBINE)</font><br> + <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxRegion">wxRegion</a>, <a href="#wxGDIObject">wxGDIObject</a></font></b> <blockquote> *************** *** 11349,11352 **** --- 11397,11407 ---- <br> void Clear()<br> + <br> + <i>%if</i> defined(wxHAS_REGION_COMBINE) <font color=#009900>// MSW and MAC</font><br> + bool Combine(wxCoord x, wxCoord y, wxCoord w, wxCoord h, <a href="#wxRegionOp">wxRegionOp</a> op);<br> + bool Combine(const <a href="#wxRect">wxRect</a>& rect, <a href="#wxRegionOp">wxRegionOp</a> op);<br> + bool Combine(const <a href="#wxRegion">wxRegion</a>& region, <a href="#wxRegionOp">wxRegionOp</a> op)<br> + <i>%endif</i> <font color=#009900>// defined(wxHAS_REGION_COMBINE)</font><br> + <br> <a href="#wxRegionContain">wxRegionContain</a> Contains(long x, long y)<br> <a href="#wxRegionContain">wxRegionContain</a> Contains(const <a href="#wxPoint">wxPoint</a>& pt)<br> *************** *** 11364,11368 **** bool Intersect(const <a href="#wxRegion">wxRegion</a>& region)<br> bool IsEmpty() const<br> ! <font color=#009900>//<i>%gtk</i> bool Ok() const</font><br> bool Subtract(long x, long y, long width, long height)<br> bool Subtract(const <a href="#wxRect">wxRect</a>& rect)<br> --- 11419,11424 ---- bool Intersect(const <a href="#wxRegion">wxRegion</a>& region)<br> bool IsEmpty() const<br> ! <i>%wxchkver_2_8</i> bool IsEqual(const <a href="#wxRegion">wxRegion</a>& region) const<br> ! <i>%wxchkver_2_8</i> bool Ok() const<br> bool Subtract(long x, long y, long width, long height)<br> bool Subtract(const <a href="#wxRect">wxRect</a>& rect)<br> *************** *** 11377,11380 **** --- 11433,11439 ---- bool Xor(const <a href="#wxRect">wxRect</a>& rect)<br> bool Xor(const <a href="#wxRegion">wxRegion</a>& region)<br> + <br> + <i>%operator</i> <a href="#wxRegion">wxRegion</a>& operator=(const <a href="#wxRegion">wxRegion</a>& r) const<br> + <font color=#009900>// operator == just calls IsEqual()</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11642,11645 **** --- 11701,11707 ---- void SetUnderlined(const bool underlined)<br> void SetWeight(int weight)<br> + <br> + <i>%operator</i> <a href="#wxFont">wxFont</a>& operator=(const <a href="#wxFont">wxFont</a>& f) const<br> + <i>%operator</i> bool operator == (const <a href="#wxFont">wxFont</a>& font) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11826,11829 **** --- 11888,11894 ---- void Set(unsigned long colRGB)<br> <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i></font><br> + <br> + <i>%operator</i> <a href="#wxColour">wxColour</a>& operator=(const <a href="#wxColour">wxColour</a>& c) const<br> + <i>%operator</i> bool operator == (const <a href="#wxColour">wxColour</a>& c) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11915,11918 **** --- 11980,11986 ---- void SetStyle(int style)<br> void SetWidth(int width)<br> + <br> + <i>%operator</i> <a href="#wxPen">wxPen</a>& operator=(const <a href="#wxPen">wxPen</a>& p) const<br> + <i>%operator</i> bool operator == (const <a href="#wxPen">wxPen</a>& p) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11973,11976 **** --- 12041,12047 ---- void SetStipple(const <a href="#wxBitmap">wxBitmap</a>& bitmap)<br> void SetStyle(int style)<br> + <br> + <i>%operator</i> <a href="#wxBrush">wxBrush</a>& operator=(const <a href="#wxBrush">wxBrush</a>& b) const<br> + <i>%operator</i> bool operator == (const <a href="#wxBrush">wxBrush</a>& b) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 12117,12120 **** --- 12188,12193 ---- void SetWidth(int w)<br> <font color=#009900>//<i>%win</i> void SetSize(const <a href="#wxSize">wxSize</a>& size)</font><br> + <br> + <i>%operator</i> <a href="#wxIcon">wxIcon</a>& operator=(const <a href="#wxIcon">wxIcon</a>& i) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 12224,12227 **** --- 12297,12302 ---- <i>%win</i> void SetPalette(const <a href="#wxPalette">wxPalette</a>& palette)<br> void SetWidth(int width)<br> + <br> + <i>%operator</i> <a href="#wxBitmap">wxBitmap</a>& operator=(const <a href="#wxBitmap">wxBitmap</a>& b) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 12303,12306 **** --- 12378,12383 ---- <font color=#009900>//<i>%win</i> void SetDepth(int depth)</font><br> <font color=#009900>//<i>%win</i> void SetSize(const <a href="#wxSize">wxSize</a>& size)</font><br> + <br> + <i>%operator</i> <a href="#wxCursor">wxCursor</a>& operator=(const <a href="#wxCursor">wxCursor</a>& c) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 12324,12327 **** --- 12401,12406 ---- bool Create(const <a href="#wxBitmap">wxBitmap</a>& bitmap, const <a href="#wxColour">wxColour</a>& colour)<br> <i>%win</i> bool Create(const <a href="#wxBitmap">wxBitmap</a>& bitmap, int index)<br> + <br> + <i>%operator</i> <a href="#wxMask">wxMask</a>& operator=(const <a href="#wxMask">wxMask</a>& m) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 13223,13228 **** <font color=#009900>//void ReadFrom( <a href="#wxDataInputStream">wxDataInputStream</a> &stream )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member</i> wxInt32 m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member</i> wxInt32 m_y</font><br> <br> <i>%operator</i> <a href="#wxPoint2DInt">wxPoint2DInt</a> operator-()<br> --- 13302,13307 ---- <font color=#009900>//void ReadFrom( <a href="#wxDataInputStream">wxDataInputStream</a> &stream )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member_func</i> wxInt32 m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member_func</i> wxInt32 m_y</font><br> <br> <i>%operator</i> <a href="#wxPoint2DInt">wxPoint2DInt</a> operator-()<br> *************** *** 13266,13271 **** wxDouble GetCrossProduct( const <a href="#wxPoint2DDouble">wxPoint2DDouble</a> &vec ) const<br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member</i> wxDouble m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member</i> wxDouble m_y</font><br> <br> <i>%operator</i> <a href="#wxPoint2DDouble">wxPoint2DDouble</a> operator-()<br> --- 13345,13350 ---- wxDouble GetCrossProduct( const <a href="#wxPoint2DDouble">wxPoint2DDouble</a> &vec ) const<br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member_func</i> wxDouble m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member_func</i> wxDouble m_y</font><br> <br> <i>%operator</i> <a href="#wxPoint2DDouble">wxPoint2DDouble</a> operator-()<br> *************** *** 13343,13350 **** <font color=#009900>//void Scale( wxInt32 num , wxInt32 denum )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member</i> wxDouble m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member</i> wxDouble m_y</font><br> ! <font color=#CC6600> <i>%rename</i> Width <i>%member</i> wxDouble m_width</font><br> ! <font color=#CC6600> <i>%rename</i> Height <i>%member</i> wxDouble m_height</font><br> <br> <font color=#009900>//<a href="#wxRect2DDouble">wxRect2DDouble</a>& operator = (const <a href="#wxRect2DDouble">wxRect2DDouble</a>& rect) - use copy constructor</font><br> --- 13422,13429 ---- <font color=#009900>//void Scale( wxInt32 num , wxInt32 denum )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member_func</i> wxDouble m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member_func</i> wxDouble m_y</font><br> ! <font color=#CC6600> <i>%rename</i> Width <i>%member_func</i> wxDouble m_width</font><br> ! <font color=#CC6600> <i>%rename</i> Height <i>%member_func</i> wxDouble m_height</font><br> <br> <font color=#009900>//<a href="#wxRect2DDouble">wxRect2DDouble</a>& operator = (const <a href="#wxRect2DDouble">wxRect2DDouble</a>& rect) - use copy constructor</font><br> *************** *** 13419,13426 **** <font color=#009900>//void ReadFrom( <a href="#wxDataInputStream">wxDataInputStream</a> &stream )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member</i> wxInt32 m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member</i> wxInt32 m_y</font><br> ! <font color=#CC6600> <i>%rename</i> Width <i>%member</i> wxInt32 m_width</font><br> ! <font color=#CC6600> <i>%rename</i> Height <i>%member</i> wxInt32 m_height</font><br> <br> <font color=#009900>//<a href="#wxRect2DInt">wxRect2DInt</a>& operator = (const <a href="#wxRect2DInt">wxRect2DInt</a>& rect) - use copy constructor</font><br> --- 13498,13505 ---- <font color=#009900>//void ReadFrom( <a href="#wxDataInputStream">wxDataInputStream</a> &stream )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member_func</i> wxInt32 m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member_func</i> wxInt32 m_y</font><br> ! <font color=#CC6600> <i>%rename</i> Width <i>%member_func</i> wxInt32 m_width</font><br> ! <font color=#CC6600> <i>%rename</i> Height <i>%member_func</i> wxInt32 m_height</font><br> <br> <font color=#009900>//<a href="#wxRect2DInt">wxRect2DInt</a>& operator = (const <a href="#wxRect2DInt">wxRect2DInt</a>& rect) - use copy constructor</font><br> *************** *** 15191,15196 **** <blockquote> <a href="#wxImageHistogramEntry">wxImageHistogramEntry</a>()<br> ! <font color=#CC6600> <i>%rename</i> Index <i>%member</i> unsigned long index <font color=#009900>// GetIndex() only, SetIndex(idx) is not allowed</font></font><br> ! <font color=#CC6600> <i>%rename</i> Value <i>%member</i> unsigned long value <font color=#009900>// GetValue() and SetValue(val)</font></font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> --- 15270,15275 ---- <blockquote> <a href="#wxImageHistogramEntry">wxImageHistogramEntry</a>()<br> ! <font color=#CC6600> <i>%member</i> unsigned long index <font color=#009900>// GetIndex() only, SetIndex(idx) is not allowed</font></font><br> ! <font color=#CC6600> <i>%member</i> unsigned long value <font color=#009900>// GetValue() and SetValue(val)</font></font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 18512,18518 **** <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxVisualAttributes">wxVisualAttributes</a></font></b> <blockquote> ! <font color=#CC6600> <i>%rename</i> Font <i>%member</i> <a href="#wxFont">wxFont</a> font</font><br> ! <font color=#990099> <i>%rename</i> ColFg <a href="#wxColour">wxColour</a> colFg</font><br> ! <font color=#990099> <i>%rename</i> ColBg <a href="#wxColour">wxColour</a> colBg</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> --- 18591,18597 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxVisualAttributes">wxVisualAttributes</a></font></b> <blockquote> ! <font color=#CC6600> <i>%member</i> <a href="#wxFont">wxFont</a> font</font><br> ! <font color=#CC6600> <i>%member</i> <a href="#wxColour">wxColour</a> colFg</font><br> ! <font color=#CC6600> <i>%member</i> <a href="#wxColour">wxColour</a> colBg</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 23169,23174 **** <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// Get information about the status of wxLua.</font><br> - <font color=#009900>//</font><br> - <font color=#009900>// Please take special note of</font><br> <br> <font color=#009900>// Get a table of all tracked top level windows that wxLua will Destroy()</font><br> --- 23248,23251 ---- *************** *** 23242,23256 **** <br> <font color=#009900>// Is this lua_type() (or in lua the type() function) considered equivalent</font><br> ! <font color=#AA0000><i>%function</i> int wxlua_iswxluatype(int luatype, int wxluaarg_tag)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> <a href="#wxString">wxString</a> wxlua_typename(int wxluaarg_tag)</font></font><br> ! <font color=#009900>// C++ Func: <a href="#wxString">wxString</a> wxlua_getwxluatypename(int wxluaarg_tag)</font><br> ! <font color=#009900>// Returns the tag name for both the predefined (negative) as well as the</font><br> ! <font color=#009900>// binding class tags. (C function only does predefined tags)</font><br> ! <font color=#AA0000><i>%function</i> <a href="#wxString">wxString</a> wxlua_typename(int wxluaarg_tag)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> int wxlua_type(void* object)</font></font><br> ! <font color=#009900>// Get the wxlua type (tag) of the object, this is the arg tags number</font><br> ! <font color=#AA0000><i>%function</i> int wxlua_type(void* object)</font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> --- 23319,23336 ---- <br> <font color=#009900>// Is this lua_type() (or in lua the type() function) considered equivalent</font><br> ! <font color=#990099><i>%rename</i> iswxluatype <i>%function</i> int wxlua_iswxluatype(int luatype, int wxluaarg_tag)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> [wxlua_typename, wxlua_type#, lua_typename, lua_type#] type(void* object)</font></font><br> ! <font color=#009900>// Given any type of object, returns four values:</font><br> ! <font color=#009900>// wxlua name of the type - wxLuaState::GetLuaTagName(wxlua_type)</font><br> ! <font color=#009900>// wxlua number of the type - wxlua_getwxluatype(lua_type(L, stack_idx)) or wxlua_ttag</font><br> ! <font color=#009900>// lua name of the type - lua_typename(L, lua_type(L, stack_idx))</font><br> ! <font color=#009900>// lua number of the type - lua_type(L, stack_idx)</font><br> ! <font color=#AA0000><i>%function</i> <a href="#wxString">wxString</a> type(void* object)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> wString typename(int wxluaarg_tag)</font></font><br> ! <font color=#009900>// Returns the wxLua tag name for both the predefined (negative) as well as the</font><br> ! <font color=#009900>// binding class tag numbers.</font><br> ! <font color=#AA0000><i>%function</i> <a href="#wxString">wxString</a> typename(int wxluaarg_tag)</font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxlua.html 16 Jun 2007 06:21:43 -0000 1.26 --- wxlua.html 30 Jun 2007 00:12:20 -0000 1.27 *************** *** 1,8 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> ! <html><head> ! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title> ! <meta content="John Labenski" name="author"></head> ! <body><h2><u>wxLua Documentation</u></h2> <a href="http://wxlua.sourceforge.net">wxLua</a> is a <a href="http://www.lua.org">Lua</a> --- 1,19 ---- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> [...4195 lines suppressed...] ! LuaPCall(int narg, int nresults)</li> ! ! <ul> ! ! <li>Uses lua_call to run a chunk on the stack, but sets ! things up for wxLua first.</li> ! ! <li>Returns lua's error ! code LUA_ERRXXX or 0 on success</li> ! ! </ul> ! ! <li>The other functions are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li> ! ! </ul> ! ! </body> ! </html> Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** binding.html 25 Jun 2007 03:19:38 -0000 1.23 --- binding.html 30 Jun 2007 00:12:20 -0000 1.24 *************** *** 11,14 **** --- 11,15 ---- </head> + <body> *************** *** 866,871 **** accessed in wxLua using <i>wx.NUMBER</i>. </li> ! <li>The ! <i>NUMBER</i> can be a #define or an int. </li> --- 867,871 ---- accessed in wxLua using <i>wx.NUMBER</i>. </li> ! <li>The <i>NUMBER</i> can be a #define or an int. </li> *************** *** 963,968 **** accessed in wxLua using <i>wx.STRING</i>. </li> ! <li>The ! <i>STRING</i> must be defined as <i>"const wxChar* STRING = _("str") or --- 963,967 ---- accessed in wxLua using <i>wx.STRING</i>. </li> ! <li>The <i>STRING</i> must be defined as <i>"const wxChar* STRING = _("str") or *************** *** 1053,1057 **** <li>Note that by default, functions that return a pointer '*' or a reference '&' do NOT add the return value to the list of ! objects to be garbage collected even if it is a <i>%class</i> data type with the <i>%delete</i> tag. This is because it is assumed that the return value is 'owned' by someone else that will --- 1052,1057 ---- <li>Note that by default, functions that return a pointer '*' or a reference '&' do NOT add the return value to the list of ! objects to be garbage collected even if it is a <i>%class</i> ! data type with the <i>%delete</i> tag. This is because it is assumed that the return value is 'owned' by someone else that will *************** *** 1137,1140 **** --- 1137,1159 ---- <ul> + <li>Declare a property to access member + variables in a + class. </li> + + <li>This tag must + be used inside of the <i>%class</i> tag. </li> + + <li>The variables will be accessible only using the '.' + convention as if they were table members.</li> + + <li>If the variable is const, it is only read-only.</li> + + </ul> + + <b><i>%member_func int m_x</i><br> + + </b> + <ul> + <li>Declare a function to access member variables in a *************** *** 1153,1158 **** <li>For example, in wxPoint <i>"%rename X %member int x"</i> will generate wxPoint methods named <span style="font-style: italic;">"pt:GetX()"</span> ! and ! <span style="font-style: italic;">"pt:SetX(5)"</span> for the wxPoint class as well as properties to access them as if they were table members, <span style="font-style: italic;">print(pt:x)</span> --- 1172,1176 ---- <li>For example, in wxPoint <i>"%rename X %member int x"</i> will generate wxPoint methods named <span style="font-style: italic;">"pt:GetX()"</span> ! and <span style="font-style: italic;">"pt:SetX(5)"</span> for the wxPoint class as well as properties to access them as if they were table members, <span style="font-style: italic;">print(pt:x)</span> *************** *** 1197,1267 **** </ul> - "=" = op_assign<br> - - "==" = "op_eq"<br> - - "!=" = "op_ne"<br> - - "<" = "op_lt"<br> - - ">" = "op_gt"<br> - - "<=" = "op_le"<br> - - ">=" = "op_ge"<br> - - <br> - - "|" = "op_or"<br> - - "&" = "op_and"<br> - - "||" = "op_lor" note: lor stands or logical (boolean) or, - same for land.<br> - - "&&" = "op_land"<br> - - "!" = "op_not"<br> - - "^" = "op_xor"<br> - - <br> - - "++" = "op_inc"<br> - - "--" = "op_dec"<br> - - <br> - - "+" = "op_add"<br> - - "-" = "op_sub"<br> - - "- (unary)" = "op_neg"<br> - - "*" = "op_mul"<br> - - "/" = "op_div"<br> - - <br> - - "+=" = "op_add_assign"<br> - - "-=" = "op_sub_assign"<br> - - "*=" = "op_mul_assign"<br> - - "/=" = "op_div_assign"<br> - - "%=" = "op_mod_assign"<br> - - "&=" = "op_and_assign"<br> - - "|=" = "op_or_assign"<br> - - "^=" = "op_xor_assign"<br> - - <br> <i><b>%not_overload int FUNC_NAME(int value)</b></i><br> --- 1215,1260 ---- </ul> + <ul> + <li>"==" = "op_eq"</li> + <li>"!=" = "op_ne"</li> + <li>"<" = "op_lt"</li> + <li>">" = "op_gt"</li> + <li>"<=" = "op_le"</li> + <li>">=" = "op_ge"</li> + </ul> + <ul> + <li>"|" = "op_or"</li> + <li>"&" = "op_and"</li> + <li>"||" = "op_lor" note: "lor" stands for logical (boolean) or, + same for "land."</li> + <li>"&&" = "op_land"</li> + <li>"!" = "op_not"</li> + <li>"^" = "op_xor"</li> + </ul> + <ul> + <li>"++" = "op_inc"</li> + <li>"--" = "op_dec"</li> + <li>"- (unary)" = "op_neg"</li> + </ul> + <ul> + <li>"=" = op_set</li> + <li>"+" = "op_add"</li> + <li>"-" = "op_sub"<br> + </li> + <li>"*" = "op_mul"</li> + <li>"/" = "op_div"</li> + </ul> + <ul> + <li>"+=" = "op_iadd" note: ixxx stands for "inplace" as it modifies the original object.</li> + <li>"-=" = "op_isub"</li> + <li>"*=" = "op_imul"</li> + <li>"/=" = "op_idiv"</li> + <li>"%=" = "op_imod"</li> + <li>"&=" = "op_iand"</li> + <li>"|=" = "op_ior"</li> + <li>"^=" = "op_ixor"<br> + </li> + </ul> <i><b>%not_overload int FUNC_NAME(int value)</b></i><br> |
