Menu
▾
▴
wxlua-commit
|
From: John L. <jr...@us...> - 2006-05-03 22:52:21
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27806/wxLua/bindings/wxwidgets Modified Files: geometry.i Log Message: don't track pushed wxWindows using EVT_DESTROY twice update geometry.i to 2.6.3 fix unary op - to use op_neg and fix binding operators in general update docs for op_neg Index: geometry.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/geometry.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** geometry.i 26 Apr 2006 22:54:13 -0000 1.4 --- geometry.i 3 May 2006 22:52:17 -0000 1.5 *************** *** 5,8 **** --- 5,9 ---- // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence + // wxWidgets: Updated to 2.6.3 ///////////////////////////////////////////////////////////////////////////// *************** *** 21,24 **** --- 22,110 ---- /////////////////////////////////////////////////////////////////////////////// + // wxPoint2DInt + + %include "wx/geometry.h" + %class %delete %noclassinfo %encapsulate wxPoint2DInt + //wxPoint2DInt() + %overload wxPoint2DInt( wxInt32 x=0, wxInt32 y=0 ) + %overload %constructor wxPoint2DIntCopy( const wxPoint2DInt &pt ) + %overload %constructor wxPoint2DIntFromPoint( const wxPoint &pt ) + + //void GetFloor( wxInt32 *x , wxInt32 *y ) const + //void GetRounded( wxInt32 *x , wxInt32 *y ) const + wxDouble GetVectorLength() const + wxDouble GetVectorAngle() const + void SetVectorLength( wxDouble length ) + void SetVectorAngle( wxDouble degrees ) + //void SetPolarCoordinates( wxInt32 angle, wxInt32 length ) - no function body in wxWidgets + void Normalize() + wxDouble GetDistance( const wxPoint2DInt &pt ) const + wxDouble GetDistanceSquare( const wxPoint2DInt &pt ) const + wxInt32 GetDotProduct( const wxPoint2DInt &vec ) const + wxInt32 GetCrossProduct( const wxPoint2DInt &vec ) const + + //void WriteTo( wxDataOutputStream &stream ) const + //void ReadFrom( wxDataInputStream &stream ) + + %rename X %member wxInt32 m_x + %rename Y %member wxInt32 m_y + + %operator wxPoint2DInt operator-() + %operator wxPoint2DInt& operator=(const wxPoint2DInt& pt) + %operator wxPoint2DInt& operator+=(const wxPoint2DInt& pt) + %operator wxPoint2DInt& operator-=(const wxPoint2DInt& pt) + %operator wxPoint2DInt& operator*=(const wxPoint2DInt& pt) + //wxPoint2DInt& operator*=(wxDouble n) - no function body in wxWidgets + //wxPoint2DInt& operator*=(wxInt32 n) - no function body in wxWidgets + %operator wxPoint2DInt& operator/=(const wxPoint2DInt& pt) + //wxPoint2DInt& operator/=(wxDouble n) - no function body in wxWidgets + //wxPoint2DInt& operator/=(wxInt32 n) - no function body in wxWidgets + //operator wxPoint() const + %operator bool operator==(const wxPoint2DInt& pt) const + //bool operator!=(const wxPoint2DInt& pt) const + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxPoint2DDouble + + %include "wx/geometry.h" + %class %delete %noclassinfo %encapsulate wxPoint2DDouble + //wxPoint2DDouble() + wxPoint2DDouble( wxDouble x=0, wxDouble y=0 ) + %constructor wxPoint2DDoubleCopy( const wxPoint2DDouble &pt ) + %constructor wxPoint2DDoubleFromPointInt( const wxPoint2DInt &pt ) + %constructor wxPoint2DDoubleFromPoint( const wxPoint &pt ) + + //void GetFloor( wxInt32 *x , wxInt32 *y ) const + //void GetRounded( wxInt32 *x , wxInt32 *y ) const + wxDouble GetVectorLength() const + wxDouble GetVectorAngle() const + void SetVectorLength( wxDouble length ) + void SetVectorAngle( wxDouble degrees ) + //void SetPolarCoordinates( wxDouble angle, wxDouble length ) - no function body in wxWidgets + //void Normalize() - no function body in wxWidgets + wxDouble GetDistance( const wxPoint2DDouble &pt ) const + wxDouble GetDistanceSquare( const wxPoint2DDouble &pt ) const + wxDouble GetDotProduct( const wxPoint2DDouble &vec ) const + wxDouble GetCrossProduct( const wxPoint2DDouble &vec ) const + + %rename X %member wxDouble m_x + %rename Y %member wxDouble m_y + + %operator wxPoint2DDouble operator-() + %operator wxPoint2DDouble& operator=(const wxPoint2DDouble& pt) + %operator wxPoint2DDouble& operator+=(const wxPoint2DDouble& pt) + %operator wxPoint2DDouble& operator-=(const wxPoint2DDouble& pt) + %operator wxPoint2DDouble& operator*=(const wxPoint2DDouble& pt) + //wxPoint2DDouble& operator*=(wxDouble n) + //wxPoint2DDouble& operator*=(wxInt32 n) + %operator wxPoint2DDouble& operator/=(const wxPoint2DDouble& pt) + //wxPoint2DDouble& operator/=(wxDouble n) + //wxPoint2DDouble& operator/=(wxInt32 n) + %operator bool operator==(const wxPoint2DDouble& pt) const + //bool operator!=(const wxPoint2DDouble& pt) const + %endclass + + /////////////////////////////////////////////////////////////////////////////// // wxRect2DDouble *************** *** 27,30 **** --- 113,117 ---- //wxRect2DDouble() wxRect2DDouble(wxDouble x=0, wxDouble y=0, wxDouble w=0, wxDouble h=0) + %constructor wxRect2DDoubleCopy(const wxRect2DDouble& rect) wxPoint2DDouble GetPosition() *************** *** 58,63 **** void MoveCentreTo( const wxPoint2DDouble &pt ) wxOutCode GetOutCode( const wxPoint2DDouble &pt ) const ! %rename ContainsPoint bool Contains( const wxPoint2DDouble &pt ) const ! %rename ContainsRect bool Contains( const wxRect2DDouble &rect ) const bool IsEmpty() const bool HaveEqualSize( const wxRect2DDouble &rect ) const --- 145,150 ---- void MoveCentreTo( const wxPoint2DDouble &pt ) wxOutCode GetOutCode( const wxPoint2DDouble &pt ) const ! %overload %rename ContainsPoint bool Contains( const wxPoint2DDouble &pt ) const ! %overload bool Contains( const wxRect2DDouble &rect ) const bool IsEmpty() const bool HaveEqualSize( const wxRect2DDouble &rect ) const *************** *** 72,77 **** bool Intersects( const wxRect2DDouble &rect ) const //static void Union( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest ) ! void Union( const wxRect2DDouble &otherRect ) ! //void Union( const wxPoint2DDouble &pt ) wxRect2DDouble CreateUnion( const wxRect2DDouble &otherRect ) const void Scale( wxDouble f ) --- 159,164 ---- bool Intersects( const wxRect2DDouble &rect ) const //static void Union( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest ) ! %overload void Union( const wxRect2DDouble &otherRect ) ! %overload %rename UnionPoint void Union( const wxPoint2DDouble &pt ) wxRect2DDouble CreateUnion( const wxRect2DDouble &otherRect ) const void Scale( wxDouble f ) *************** *** 79,148 **** %rename X %member wxDouble m_x ! %member wxDouble m_y %rename Width %member wxDouble m_width ! %member wxDouble m_height ! %endclass ! ! /////////////////////////////////////////////////////////////////////////////// ! // wxPoint2DDouble ! ! %include "wx/geometry.h" ! %class %delete %noclassinfo %encapsulate wxPoint2DDouble ! //wxPoint2DDouble() ! wxPoint2DDouble( wxDouble x=0, wxDouble y=0 ) ! //%constructor wxPoint2DDouble( const wxPoint2DDouble &pt ) ! //%constructor wxPoint2DDouble( const wxPoint2DInt &pt ) ! //%constructor wxPoint2DDouble( const wxPoint &pt ) ! //void GetFloor( wxInt32 *x , wxInt32 *y ) const ! //void GetRounded( wxInt32 *x , wxInt32 *y ) const ! wxDouble GetVectorLength() const ! wxDouble GetVectorAngle() const ! void SetVectorLength( wxDouble length ) ! void SetVectorAngle( wxDouble degrees ) ! //void SetPolarCoordinates( wxDouble angle , wxDouble length ) ! //void Normalize() ! wxDouble GetDistance( const wxPoint2DDouble &pt ) const ! wxDouble GetDistanceSquare( const wxPoint2DDouble &pt ) const ! wxDouble GetDotProduct( const wxPoint2DDouble &vec ) const ! wxDouble GetCrossProduct( const wxPoint2DDouble &vec ) const ! //wxPoint2DDouble operator-() ! //wxPoint2DDouble& operator=(const wxPoint2DDouble& pt) ! //wxPoint2DDouble& operator+=(const wxPoint2DDouble& pt) ! //wxPoint2DDouble& operator-=(const wxPoint2DDouble& pt) ! //wxPoint2DDouble& operator*=(const wxPoint2DDouble& pt) ! //wxPoint2DDouble& operator*=(wxDouble n) ! //wxPoint2DDouble& operator*=(wxInt32 n) ! //wxPoint2DDouble& operator/=(const wxPoint2DDouble& pt) ! //wxPoint2DDouble& operator/=(wxDouble n) ! //wxPoint2DDouble& operator/=(wxInt32 n) ! //bool operator==(const wxPoint2DDouble& pt) const ! //bool operator!=(const wxPoint2DDouble& pt) const ! //%member wxDouble m_x ! //%member wxDouble m_y %endclass /////////////////////////////////////////////////////////////////////////////// - // wxTransform2D - - //%include "wx/geometry.h" - //%class %noclassinfo wxTransform2D - // virtual void Transform( wxPoint2DInt* pt )const = 0 - // virtual void Transform( wxRect2DInt* r ) const - // virtual wxPoint2DInt Transform( const wxPoint2DInt &pt ) const - // virtual wxRect2DInt Transform( const wxRect2DInt &r ) const - // virtual void InverseTransform( wxPoint2DInt* pt ) const = 0 - // virtual void InverseTransform( wxRect2DInt* r ) const - // virtual wxPoint2DInt InverseTransform( const wxPoint2DInt &pt ) const - // virtual wxRect2DInt InverseTransform( const wxRect2DInt &r ) const - // void wxTransform2D::Transform( wxRect2DInt* r ) const - // wxPoint2DInt wxTransform2D::Transform( const wxPoint2DInt &pt ) const - // wxRect2DInt wxTransform2D::Transform( const wxRect2DInt &r ) const - // void wxTransform2D::InverseTransform( wxRect2DInt* r ) const - // wxPoint2DInt wxTransform2D::InverseTransform( const wxPoint2DInt &pt ) const - // wxRect2DInt wxTransform2D::InverseTransform( const wxRect2DInt &r ) const - //%endclass - - /////////////////////////////////////////////////////////////////////////////// // wxRect2DInt --- 166,179 ---- %rename X %member wxDouble m_x ! %rename Y %member wxDouble m_y %rename Width %member wxDouble m_width ! %rename Height %member wxDouble m_height ! //wxRect2DDouble& operator = (const wxRect2DDouble& rect) - use copy constructor ! %operator bool operator==(const wxRect2DDouble& rect) ! //bool operator != (const wxRect2DDouble& rect) const %endclass /////////////////////////////////////////////////////////////////////////////// // wxRect2DInt *************** *** 151,158 **** //wxRect2DInt() wxRect2DInt(wxInt32 x=0, wxInt32 y=0, wxInt32 w=0, wxInt32 h=0) %constructor wxRect2DIntFromwxRect( const wxRect& r ) %constructor wxRect2DIntFromPoints(const wxPoint2DInt& topLeft, const wxPoint2DInt& bottomRight) //%constructor wxRect2DInt(const wxPoint2DInt& pos, const wxSize& size) ! %constructor wxRect2DIntFromwxRect2DInt(const wxRect2DInt& rect) wxPoint2DInt GetPosition() wxSize GetSize() --- 182,190 ---- //wxRect2DInt() wxRect2DInt(wxInt32 x=0, wxInt32 y=0, wxInt32 w=0, wxInt32 h=0) + %constructor wxRect2DIntCopy(const wxRect2DInt& rect) %constructor wxRect2DIntFromwxRect( const wxRect& r ) %constructor wxRect2DIntFromPoints(const wxPoint2DInt& topLeft, const wxPoint2DInt& bottomRight) //%constructor wxRect2DInt(const wxPoint2DInt& pos, const wxSize& size) ! wxPoint2DInt GetPosition() wxSize GetSize() *************** *** 185,195 **** void MoveCentreTo( const wxPoint2DInt &pt ) wxOutCode GetOutCode( const wxPoint2DInt &pt ) const ! wxOutCode GetOutcode( const wxPoint2DInt &pt ) const ! %rename ContainsPoint bool Contains( const wxPoint2DInt &pt ) const ! %rename ContainsRect bool Contains( const wxRect2DInt &rect ) const bool IsEmpty() const bool HaveEqualSize( const wxRect2DInt &rect ) const //void Inset( wxInt32 x , wxInt32 y ) ! void Inset( wxInt32 left , wxInt32 top ,wxInt32 right , wxInt32 bottom ) void Offset( const wxPoint2DInt &pt ) void ConstrainTo( const wxRect2DInt &rect ) --- 217,226 ---- void MoveCentreTo( const wxPoint2DInt &pt ) wxOutCode GetOutCode( const wxPoint2DInt &pt ) const ! %overload %rename ContainsPoint bool Contains( const wxPoint2DInt &pt ) const ! %overload bool Contains( const wxRect2DInt &rect ) const bool IsEmpty() const bool HaveEqualSize( const wxRect2DInt &rect ) const //void Inset( wxInt32 x , wxInt32 y ) ! void Inset( wxInt32 left, wxInt32 top, wxInt32 right, wxInt32 bottom ) void Offset( const wxPoint2DInt &pt ) void ConstrainTo( const wxRect2DInt &rect ) *************** *** 200,205 **** bool Intersects( const wxRect2DInt &rect ) const //static void Union( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest ) ! void Union( const wxRect2DInt &otherRect ) ! //void Union( const wxPoint2DInt &pt ) wxRect2DInt CreateUnion( const wxRect2DInt &otherRect ) const void Scale( wxInt32 f ) --- 231,236 ---- bool Intersects( const wxRect2DInt &rect ) const //static void Union( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest ) ! %overload void Union( const wxRect2DInt &otherRect ) ! %overload %rename UnionPoint void Union( const wxPoint2DInt &pt ) wxRect2DInt CreateUnion( const wxRect2DInt &otherRect ) const void Scale( wxInt32 f ) *************** *** 209,261 **** //void ReadFrom( wxDataInputStream &stream ) ! //%member wxInt32 m_x ! //%member wxInt32 m_y ! //%member wxInt32 m_width ! //%member wxInt32 m_height ! //wxRect2DInt& operator = (const wxRect2DInt& rect) ! //bool operator == (const wxRect2DInt& rect) const //bool operator != (const wxRect2DInt& rect) const %endclass /////////////////////////////////////////////////////////////////////////////// ! // wxPoint2DInt ! ! %include "wx/geometry.h" ! %class %delete %noclassinfo %encapsulate wxPoint2DInt ! //wxPoint2DInt() ! %constructor wxPoint2DInt( wxInt32 x=0, wxInt32 y=0 ) ! //%constructor wxPoint2DInt( const wxPoint2DInt &pt ) ! //%constructor wxPoint2DInt( const wxPoint &pt ) ! //void GetFloor( wxInt32 *x , wxInt32 *y ) const ! //void GetRounded( wxInt32 *x , wxInt32 *y ) const ! wxDouble GetVectorLength() const ! wxDouble GetVectorAngle() const ! void SetVectorLength( wxDouble length ) ! void SetVectorAngle( wxDouble degrees ) ! //void SetPolarCoordinates( wxInt32 angle , wxInt32 length ) ! //void Normalize() ! wxDouble GetDistance( const wxPoint2DInt &pt ) const ! wxDouble GetDistanceSquare( const wxPoint2DInt &pt ) const ! wxInt32 GetDotProduct( const wxPoint2DInt &vec ) const ! wxInt32 GetCrossProduct( const wxPoint2DInt &vec ) const ! //void WriteTo( wxDataOutputStream &stream ) const ! //void ReadFrom( wxDataInputStream &stream ) ! //%member wxInt32 m_x ! //%member wxInt32 m_y ! //wxPoint2DInt operator-() ! //wxPoint2DInt& operator=(const wxPoint2DInt& pt) ! //wxPoint2DInt& operator+=(const wxPoint2DInt& pt) ! //wxPoint2DInt& operator-=(const wxPoint2DInt& pt) ! //wxPoint2DInt& operator*=(const wxPoint2DInt& pt) ! //wxPoint2DInt& operator*=(wxDouble n) ! //wxPoint2DInt& operator*=(wxInt32 n) ! //wxPoint2DInt& operator/=(const wxPoint2DInt& pt) ! //wxPoint2DInt& operator/=(wxDouble n) ! //wxPoint2DInt& operator/=(wxInt32 n) ! //operator wxPoint() const ! //bool operator==(const wxPoint2DInt& pt) const ! //bool operator!=(const wxPoint2DInt& pt) const ! %endclass %endif wxLUA_USE_Geometry --- 240,273 ---- //void ReadFrom( wxDataInputStream &stream ) ! %rename X %member wxInt32 m_x ! %rename Y %member wxInt32 m_y ! %rename Width %member wxInt32 m_width ! %rename Height %member wxInt32 m_height ! ! //wxRect2DInt& operator = (const wxRect2DInt& rect) - use copy constructor ! %operator bool operator == (const wxRect2DInt& rect) const //bool operator != (const wxRect2DInt& rect) const %endclass /////////////////////////////////////////////////////////////////////////////// ! // wxTransform2D - an abstract class ! //%include "wx/geometry.h" ! //%class %noclassinfo wxTransform2D ! // virtual void Transform( wxPoint2DInt* pt )const = 0 ! // virtual void Transform( wxRect2DInt* r ) const ! // virtual wxPoint2DInt Transform( const wxPoint2DInt &pt ) const ! // virtual wxRect2DInt Transform( const wxRect2DInt &r ) const ! // virtual void InverseTransform( wxPoint2DInt* pt ) const = 0 ! // virtual void InverseTransform( wxRect2DInt* r ) const ! // virtual wxPoint2DInt InverseTransform( const wxPoint2DInt &pt ) const ! // virtual wxRect2DInt InverseTransform( const wxRect2DInt &r ) const ! // void wxTransform2D::Transform( wxRect2DInt* r ) const ! // wxPoint2DInt wxTransform2D::Transform( const wxPoint2DInt &pt ) const ! // wxRect2DInt wxTransform2D::Transform( const wxRect2DInt &r ) const ! // void wxTransform2D::InverseTransform( wxRect2DInt* r ) const ! // wxPoint2DInt wxTransform2D::InverseTransform( const wxPoint2DInt &pt ) const ! // wxRect2DInt wxTransform2D::InverseTransform( const wxRect2DInt &r ) const ! //%endclass %endif wxLUA_USE_Geometry |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X