From 3e87f7c0850fbd9cfc3a1a83e8205fad344576f1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 12 Dec 2002 03:56:58 +0000 Subject: [PATCH] SWIGged updates for wxMSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/msw/filesys.py | 4 +- wxPython/src/msw/gdi.py | 4 +- wxPython/src/msw/misc.cpp | 1082 +++++++++++++++++++++++++++++------ wxPython/src/msw/misc.py | 137 ++++- wxPython/src/msw/wx.cpp | 1 + wxPython/src/msw/wx.py | 15 +- 6 files changed, 1046 insertions(+), 197 deletions(-) diff --git a/wxPython/src/msw/filesys.py b/wxPython/src/msw/filesys.py index d1d52ee1fe..98a3c2cc1a 100644 --- a/wxPython/src/msw/filesys.py +++ b/wxPython/src/msw/filesys.py @@ -17,9 +17,9 @@ import string import types def wxMemoryFSHandler_AddFile(filename, a, b=''): - if isinstance(a, wxImage): + if wx.wxPy_isinstance(a, (wxImage, wxImagePtr)): __wxMemoryFSHandler_AddFile_wxImage(filename, a, b) - elif isinstance(a, wxBitmap): + elif wx.wxPy_isinstance(a, (wxBitmap, wxBitmapPtr)): __wxMemoryFSHandler_AddFile_wxBitmap(filename, a, b) elif type(a) == types.StringType: #__wxMemoryFSHandler_AddFile_wxString(filename, a) diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py index d9c525f8ac..ebdf406f65 100644 --- a/wxPython/src/msw/gdi.py +++ b/wxPython/src/msw/gdi.py @@ -831,7 +831,7 @@ class wxDCPtr(wxObjectPtr): def DrawPointList(self, points, pens=None): if pens is None: pens = [] - elif isinstance(pens, wxPenPtr): + elif wx.wxPy_isinstance(pens, (wxPen, wxPenPtr)): pens = [pens] elif len(pens) != len(points): raise ValueError('points and pens must have same length') @@ -840,7 +840,7 @@ class wxDCPtr(wxObjectPtr): def DrawLineList(self, lines, pens=None): if pens is None: pens = [] - elif isinstance(pens, wxPenPtr): + elif wx.wxPy_isinstance(pens, (wxPen, wxPenPtr)): pens = [pens] elif len(pens) != len(lines): raise ValueError('lines and pens must have same length') diff --git a/wxPython/src/msw/misc.cpp b/wxPython/src/msw/misc.cpp index d7596250bc..ae64ff8e58 100644 --- a/wxPython/src/msw/misc.cpp +++ b/wxPython/src/msw/misc.cpp @@ -59,6 +59,7 @@ extern PyObject *SWIG_newvarlink(void); #include #include #include +#include static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -1405,45 +1406,6 @@ static PyObject *_wrap_wxSize_asTuple(PyObject *self, PyObject *args, PyObject * return _resultobj; } -static int wxSize___cmp__(wxSize *self,const wxSize * sz) { - if (! sz) return 1; - if (*self == *sz) return 0; - return -1; - } -static PyObject *_wrap_wxSize___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - int _result; - wxSize * _arg0; - wxSize * _arg1; - wxSize temp; - PyObject * _obj0 = 0; - wxSize temp0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","sz", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSize___cmp__",_kwnames,&_obj0,&_obj1)) - return NULL; -{ - _arg0 = &temp; - if (! wxSize_helper(_obj0, &_arg0)) - return NULL; -} -{ - _arg1 = &temp0; - if (! wxSize_helper(_obj1, &_arg1)) - return NULL; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxSize___cmp__(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - static bool wxSize___eq__(wxSize *self,const wxSize & o) { return *self == o; } static PyObject *_wrap_wxSize___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1747,9 +1709,8 @@ static PyObject *_wrap_wxRealPoint_asTuple(PyObject *self, PyObject *args, PyObj return _resultobj; } -static wxRealPoint wxRealPoint___add__(wxRealPoint *self,const wxRealPoint * p) { - if (! p) return *self; - return *self + *p; +static wxRealPoint wxRealPoint___add__(wxRealPoint *self,const wxRealPoint & p) { + return *self + p; } static PyObject *_wrap_wxRealPoint___add__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1778,7 +1739,7 @@ static PyObject *_wrap_wxRealPoint___add__(PyObject *self, PyObject *args, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxRealPoint (wxRealPoint___add__(_arg0,_arg1)); + _result = new wxRealPoint (wxRealPoint___add__(_arg0,*_arg1)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1787,9 +1748,8 @@ static PyObject *_wrap_wxRealPoint___add__(PyObject *self, PyObject *args, PyObj return _resultobj; } -static wxRealPoint wxRealPoint___sub__(wxRealPoint *self,const wxRealPoint * p) { - if (! p) return *self; - return *self - *p; +static wxRealPoint wxRealPoint___sub__(wxRealPoint *self,const wxRealPoint & p) { + return *self - p; } static PyObject *_wrap_wxRealPoint___sub__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1818,7 +1778,7 @@ static PyObject *_wrap_wxRealPoint___sub__(PyObject *self, PyObject *args, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxRealPoint (wxRealPoint___sub__(_arg0,_arg1)); + _result = new wxRealPoint (wxRealPoint___sub__(_arg0,*_arg1)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1827,45 +1787,6 @@ static PyObject *_wrap_wxRealPoint___sub__(PyObject *self, PyObject *args, PyObj return _resultobj; } -static int wxRealPoint___cmp__(wxRealPoint *self,const wxRealPoint * p) { - if (! p) return 1; - if (*self == *p) return 0; - return -1; - } -static PyObject *_wrap_wxRealPoint___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - int _result; - wxRealPoint * _arg0; - wxRealPoint * _arg1; - wxRealPoint temp; - PyObject * _obj0 = 0; - wxRealPoint temp0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","p", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRealPoint___cmp__",_kwnames,&_obj0,&_obj1)) - return NULL; -{ - _arg0 = &temp; - if (! wxRealPoint_helper(_obj0, &_arg0)) - return NULL; -} -{ - _arg1 = &temp0; - if (! wxRealPoint_helper(_obj1, &_arg1)) - return NULL; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxRealPoint___cmp__(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - static bool wxRealPoint___eq__(wxRealPoint *self,const wxRealPoint & o) { return *self == o; } static PyObject *_wrap_wxRealPoint___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2169,9 +2090,8 @@ static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args, PyObject return _resultobj; } -static wxPoint wxPoint___add__(wxPoint *self,const wxPoint * p) { - if (! p) return *self; - return *self + *p; +static wxPoint wxPoint___add__(wxPoint *self,const wxPoint & p) { + return *self + p; } static PyObject *_wrap_wxPoint___add__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2200,7 +2120,7 @@ static PyObject *_wrap_wxPoint___add__(PyObject *self, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxPoint (wxPoint___add__(_arg0,_arg1)); + _result = new wxPoint (wxPoint___add__(_arg0,*_arg1)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2209,9 +2129,8 @@ static PyObject *_wrap_wxPoint___add__(PyObject *self, PyObject *args, PyObject return _resultobj; } -static wxPoint wxPoint___sub__(wxPoint *self,const wxPoint * p) { - if (! p) return *self; - return *self - *p; +static wxPoint wxPoint___sub__(wxPoint *self,const wxPoint & p) { + return *self - p; } static PyObject *_wrap_wxPoint___sub__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2240,7 +2159,7 @@ static PyObject *_wrap_wxPoint___sub__(PyObject *self, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxPoint (wxPoint___sub__(_arg0,_arg1)); + _result = new wxPoint (wxPoint___sub__(_arg0,*_arg1)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2249,45 +2168,6 @@ static PyObject *_wrap_wxPoint___sub__(PyObject *self, PyObject *args, PyObject return _resultobj; } -static int wxPoint___cmp__(wxPoint *self,const wxPoint * p) { - if (! p) return 1; - if (*self == *p) return 0; - return -1; - } -static PyObject *_wrap_wxPoint___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - int _result; - wxPoint * _arg0; - wxPoint * _arg1; - wxPoint temp; - PyObject * _obj0 = 0; - wxPoint temp0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","p", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint___cmp__",_kwnames,&_obj0,&_obj1)) - return NULL; -{ - _arg0 = &temp; - if (! wxPoint_helper(_obj0, &_arg0)) - return NULL; -} -{ - _arg1 = &temp0; - if (! wxPoint_helper(_obj1, &_arg1)) - return NULL; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxPoint___cmp__(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - static bool wxPoint___eq__(wxPoint *self,const wxPoint & o) { return *self == o; } static PyObject *_wrap_wxPoint___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3299,9 +3179,8 @@ static PyObject *_wrap_wxRect_asTuple(PyObject *self, PyObject *args, PyObject * return _resultobj; } -static wxRect wxRect___add__(wxRect *self,const wxRect * rect) { - if (! rect) return *self; - return *self + *rect; +static wxRect wxRect___add__(wxRect *self,const wxRect & rect) { + return *self + rect; } static PyObject *_wrap_wxRect___add__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3330,7 +3209,7 @@ static PyObject *_wrap_wxRect___add__(PyObject *self, PyObject *args, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxRect (wxRect___add__(_arg0,_arg1)); + _result = new wxRect (wxRect___add__(_arg0,*_arg1)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3339,45 +3218,6 @@ static PyObject *_wrap_wxRect___add__(PyObject *self, PyObject *args, PyObject * return _resultobj; } -static int wxRect___cmp__(wxRect *self,const wxRect * rect) { - if (! rect) return 1; - if (*self == *rect) return 0; - return -1; - } -static PyObject *_wrap_wxRect___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - int _result; - wxRect * _arg0; - wxRect * _arg1; - wxRect temp; - PyObject * _obj0 = 0; - wxRect temp0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","rect", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRect___cmp__",_kwnames,&_obj0,&_obj1)) - return NULL; -{ - _arg0 = &temp; - if (! wxRect_helper(_obj0, &_arg0)) - return NULL; -} -{ - _arg1 = &temp0; - if (! wxRect_helper(_obj1, &_arg1)) - return NULL; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxRect___cmp__(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - static bool wxRect___eq__(wxRect *self,const wxRect & o) { return *self == o; } static PyObject *_wrap_wxRect___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3448,6 +3288,863 @@ static PyObject *_wrap_wxRect___ne__(PyObject *self, PyObject *args, PyObject *k return _resultobj; } +#define wxPoint2DDouble_m_x_set(_swigobj,_swigval) (_swigobj->m_x = _swigval,_swigval) +static PyObject *_wrap_wxPoint2DDouble_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + double _result; + wxPoint2DDouble * _arg0; + double _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self","m_x", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxPoint2DDouble_m_x_set",_kwnames,&_obj0,&_arg1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (double )wxPoint2DDouble_m_x_set(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("d",_result); + return _resultobj; +} + +#define wxPoint2DDouble_m_x_get(_swigobj) ((double ) _swigobj->m_x) +static PyObject *_wrap_wxPoint2DDouble_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + double _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint2DDouble_m_x_get",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (double )wxPoint2DDouble_m_x_get(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("d",_result); + return _resultobj; +} + +#define wxPoint2DDouble_m_y_set(_swigobj,_swigval) (_swigobj->m_y = _swigval,_swigval) +static PyObject *_wrap_wxPoint2DDouble_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + double _result; + wxPoint2DDouble * _arg0; + double _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self","m_y", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxPoint2DDouble_m_y_set",_kwnames,&_obj0,&_arg1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (double )wxPoint2DDouble_m_y_set(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("d",_result); + return _resultobj; +} + +#define wxPoint2DDouble_m_y_get(_swigobj) ((double ) _swigobj->m_y) +static PyObject *_wrap_wxPoint2DDouble_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + double _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint2DDouble_m_y_get",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (double )wxPoint2DDouble_m_y_get(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("d",_result); + return _resultobj; +} + +#define new_wxPoint2DDouble(_swigarg0,_swigarg1) (new wxPoint2DDouble(_swigarg0,_swigarg1)) +static PyObject *_wrap_new_wxPoint2DDouble(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _result; + double _arg0 = (double ) 0; + double _arg1 = (double ) 0; + char *_kwnames[] = { "x","y", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|dd:new_wxPoint2DDouble",_kwnames,&_arg0,&_arg1)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPoint2DDouble *)new_wxPoint2DDouble(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint2DDouble_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define new_wxPoint2DDoubleCopy(_swigarg0) (new wxPoint2DDouble(_swigarg0)) +static PyObject *_wrap_new_wxPoint2DDoubleCopy(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "pt", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxPoint2DDoubleCopy",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPoint2DDouble *)new_wxPoint2DDoubleCopy(*_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint2DDouble_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define new_wxPoint2DDoubleFromPoint(_swigarg0) (new wxPoint2DDouble(_swigarg0)) +static PyObject *_wrap_new_wxPoint2DDoubleFromPoint(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _result; + wxPoint * _arg0; + wxPoint temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "pt", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxPoint2DDoubleFromPoint",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxPoint2DDouble *)new_wxPoint2DDoubleFromPoint(*_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint2DDouble_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxPoint2DDouble_GetFloor(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetFloor(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPoint2DDouble_GetFloor(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _arg0; + int * _arg1; + int temp; + int * _arg2; + int temp0; + wxPoint2DDouble temp1; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint2DDouble_GetFloor",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = &temp1; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPoint2DDouble_GetFloor(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + +#define wxPoint2DDouble_GetRounded(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetRounded(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPoint2DDouble_GetRounded(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _arg0; + int * _arg1; + int temp; + int * _arg2; + int temp0; + wxPoint2DDouble temp1; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint2DDouble_GetRounded",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = &temp1; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPoint2DDouble_GetRounded(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + +#define wxPoint2DDouble_GetVectorLength(_swigobj) (_swigobj->GetVectorLength()) +static PyObject *_wrap_wxPoint2DDouble_GetVectorLength(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + double _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint2DDouble_GetVectorLength",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (double )wxPoint2DDouble_GetVectorLength(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("d",_result); + return _resultobj; +} + +#define wxPoint2DDouble_GetVectorAngle(_swigobj) (_swigobj->GetVectorAngle()) +static PyObject *_wrap_wxPoint2DDouble_GetVectorAngle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + double _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint2DDouble_GetVectorAngle",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (double )wxPoint2DDouble_GetVectorAngle(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("d",_result); + return _resultobj; +} + +#define wxPoint2DDouble_SetVectorLength(_swigobj,_swigarg0) (_swigobj->SetVectorLength(_swigarg0)) +static PyObject *_wrap_wxPoint2DDouble_SetVectorLength(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _arg0; + double _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self","length", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxPoint2DDouble_SetVectorLength",_kwnames,&_obj0,&_arg1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPoint2DDouble_SetVectorLength(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPoint2DDouble_SetVectorAngle(_swigobj,_swigarg0) (_swigobj->SetVectorAngle(_swigarg0)) +static PyObject *_wrap_wxPoint2DDouble_SetVectorAngle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _arg0; + double _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self","degrees", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxPoint2DDouble_SetVectorAngle",_kwnames,&_obj0,&_arg1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPoint2DDouble_SetVectorAngle(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPoint2DDouble_GetDistance(_swigobj,_swigarg0) (_swigobj->GetDistance(_swigarg0)) +static PyObject *_wrap_wxPoint2DDouble_GetDistance(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + double _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble * _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + wxPoint2DDouble temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pt", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint2DDouble_GetDistance",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxPoint2DDouble_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (double )wxPoint2DDouble_GetDistance(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("d",_result); + return _resultobj; +} + +#define wxPoint2DDouble_GetDistanceSquare(_swigobj,_swigarg0) (_swigobj->GetDistanceSquare(_swigarg0)) +static PyObject *_wrap_wxPoint2DDouble_GetDistanceSquare(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + double _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble * _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + wxPoint2DDouble temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pt", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint2DDouble_GetDistanceSquare",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxPoint2DDouble_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (double )wxPoint2DDouble_GetDistanceSquare(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("d",_result); + return _resultobj; +} + +#define wxPoint2DDouble_GetDotProduct(_swigobj,_swigarg0) (_swigobj->GetDotProduct(_swigarg0)) +static PyObject *_wrap_wxPoint2DDouble_GetDotProduct(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + double _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble * _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + wxPoint2DDouble temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","vec", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint2DDouble_GetDotProduct",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxPoint2DDouble_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (double )wxPoint2DDouble_GetDotProduct(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("d",_result); + return _resultobj; +} + +#define wxPoint2DDouble_GetCrossProduct(_swigobj,_swigarg0) (_swigobj->GetCrossProduct(_swigarg0)) +static PyObject *_wrap_wxPoint2DDouble_GetCrossProduct(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + double _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble * _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + wxPoint2DDouble temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","vec", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint2DDouble_GetCrossProduct",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxPoint2DDouble_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (double )wxPoint2DDouble_GetCrossProduct(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("d",_result); + return _resultobj; +} + +static wxPoint2DDouble wxPoint2DDouble___neg__(wxPoint2DDouble *self) { return -(*self); } +static PyObject *_wrap_wxPoint2DDouble___neg__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint2DDouble___neg__",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxPoint2DDouble (wxPoint2DDouble___neg__(_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint2DDouble_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +static wxPoint2DDouble & wxPoint2DDouble___iadd__(wxPoint2DDouble *self,const wxPoint2DDouble & pt) { return (*self) += pt; } +static PyObject *_wrap_wxPoint2DDouble___iadd__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble * _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + wxPoint2DDouble temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pt", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint2DDouble___iadd__",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxPoint2DDouble_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPoint2DDouble & _result_ref = wxPoint2DDouble___iadd__(_arg0,*_arg1); + _result = (wxPoint2DDouble *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint2DDouble_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static wxPoint2DDouble & wxPoint2DDouble___isub__(wxPoint2DDouble *self,const wxPoint2DDouble & pt) { return (*self) -= pt; } +static PyObject *_wrap_wxPoint2DDouble___isub__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble * _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + wxPoint2DDouble temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pt", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint2DDouble___isub__",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxPoint2DDouble_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPoint2DDouble & _result_ref = wxPoint2DDouble___isub__(_arg0,*_arg1); + _result = (wxPoint2DDouble *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint2DDouble_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static wxPoint2DDouble & wxPoint2DDouble___imul__(wxPoint2DDouble *self,const wxPoint2DDouble & pt) { return (*self) *= pt; } +static PyObject *_wrap_wxPoint2DDouble___imul__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble * _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + wxPoint2DDouble temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pt", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint2DDouble___imul__",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxPoint2DDouble_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPoint2DDouble & _result_ref = wxPoint2DDouble___imul__(_arg0,*_arg1); + _result = (wxPoint2DDouble *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint2DDouble_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static wxPoint2DDouble & wxPoint2DDouble___idiv__(wxPoint2DDouble *self,const wxPoint2DDouble & pt) { return (*self) /= pt; } +static PyObject *_wrap_wxPoint2DDouble___idiv__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint2DDouble * _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble * _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + wxPoint2DDouble temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pt", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint2DDouble___idiv__",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxPoint2DDouble_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPoint2DDouble & _result_ref = wxPoint2DDouble___idiv__(_arg0,*_arg1); + _result = (wxPoint2DDouble *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint2DDouble_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static bool wxPoint2DDouble___eq__(wxPoint2DDouble *self,const wxPoint2DDouble & pt) { return (*self) == pt; } +static PyObject *_wrap_wxPoint2DDouble___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble * _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + wxPoint2DDouble temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pt", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint2DDouble___eq__",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxPoint2DDouble_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPoint2DDouble___eq__(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static bool wxPoint2DDouble___ne__(wxPoint2DDouble *self,const wxPoint2DDouble & pt) { return (*self) != pt; } +static PyObject *_wrap_wxPoint2DDouble___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble * _arg1; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + wxPoint2DDouble temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pt", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPoint2DDouble___ne__",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxPoint2DDouble_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxPoint2DDouble___ne__(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject * wxPoint2DDouble_asTuple(wxPoint2DDouble *self) { + wxPyBeginBlockThreads(); + PyObject* tup = PyTuple_New(2); + PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->m_x)); + PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->m_y)); + wxPyEndBlockThreads(); + return tup; + } +static PyObject *_wrap_wxPoint2DDouble_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + PyObject * _result; + wxPoint2DDouble * _arg0; + wxPoint2DDouble temp; + PyObject * _obj0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint2DDouble_asTuple",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = &temp; + if (! wxPoint2DDouble_helper(_obj0, &_arg0)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (PyObject *)wxPoint2DDouble_asTuple(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ + _resultobj = _result; +} + return _resultobj; +} + static void *SwigwxIndividualLayoutConstraintTowxObject(void *ptr) { wxIndividualLayoutConstraint *src; wxObject *dest; @@ -4484,9 +5181,37 @@ static PyMethodDef misccMethods[] = { { "wxIndividualLayoutConstraint_AsIs", (PyCFunction) _wrap_wxIndividualLayoutConstraint_AsIs, METH_VARARGS | METH_KEYWORDS }, { "wxIndividualLayoutConstraint_Absolute", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Absolute, METH_VARARGS | METH_KEYWORDS }, { "wxIndividualLayoutConstraint_Above", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Above, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_asTuple", (PyCFunction) _wrap_wxPoint2DDouble_asTuple, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble___ne__", (PyCFunction) _wrap_wxPoint2DDouble___ne__, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble___eq__", (PyCFunction) _wrap_wxPoint2DDouble___eq__, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble___idiv__", (PyCFunction) _wrap_wxPoint2DDouble___idiv__, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble___imul__", (PyCFunction) _wrap_wxPoint2DDouble___imul__, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble___isub__", (PyCFunction) _wrap_wxPoint2DDouble___isub__, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble___iadd__", (PyCFunction) _wrap_wxPoint2DDouble___iadd__, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble___neg__", (PyCFunction) _wrap_wxPoint2DDouble___neg__, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_GetCrossProduct", (PyCFunction) _wrap_wxPoint2DDouble_GetCrossProduct, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_GetDotProduct", (PyCFunction) _wrap_wxPoint2DDouble_GetDotProduct, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_GetDistanceSquare", (PyCFunction) _wrap_wxPoint2DDouble_GetDistanceSquare, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_GetDistance", (PyCFunction) _wrap_wxPoint2DDouble_GetDistance, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_SetVectorAngle", (PyCFunction) _wrap_wxPoint2DDouble_SetVectorAngle, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_SetVectorLength", (PyCFunction) _wrap_wxPoint2DDouble_SetVectorLength, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_GetVectorAngle", (PyCFunction) _wrap_wxPoint2DDouble_GetVectorAngle, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_GetVectorLength", (PyCFunction) _wrap_wxPoint2DDouble_GetVectorLength, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_GetRounded", (PyCFunction) _wrap_wxPoint2DDouble_GetRounded, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_GetFloor", (PyCFunction) _wrap_wxPoint2DDouble_GetFloor, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPoint2DDoubleFromPoint", (PyCFunction) _wrap_new_wxPoint2DDoubleFromPoint, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPoint2DDoubleCopy", (PyCFunction) _wrap_new_wxPoint2DDoubleCopy, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPoint2DDouble", (PyCFunction) _wrap_new_wxPoint2DDouble, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_y_get", (PyCFunction) _wrap_wxPoint2DDouble_m_y_get, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_y_set", (PyCFunction) _wrap_wxPoint2DDouble_m_y_set, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_x_get", (PyCFunction) _wrap_wxPoint2DDouble_m_x_get, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_x_set", (PyCFunction) _wrap_wxPoint2DDouble_m_x_set, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_m_y_get", (PyCFunction) _wrap_wxPoint2DDouble_m_y_get, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_m_y_set", (PyCFunction) _wrap_wxPoint2DDouble_m_y_set, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_m_x_get", (PyCFunction) _wrap_wxPoint2DDouble_m_x_get, METH_VARARGS | METH_KEYWORDS }, + { "wxPoint2DDouble_m_x_set", (PyCFunction) _wrap_wxPoint2DDouble_m_x_set, METH_VARARGS | METH_KEYWORDS }, { "wxRect___ne__", (PyCFunction) _wrap_wxRect___ne__, METH_VARARGS | METH_KEYWORDS }, { "wxRect___eq__", (PyCFunction) _wrap_wxRect___eq__, METH_VARARGS | METH_KEYWORDS }, - { "wxRect___cmp__", (PyCFunction) _wrap_wxRect___cmp__, METH_VARARGS | METH_KEYWORDS }, { "wxRect___add__", (PyCFunction) _wrap_wxRect___add__, METH_VARARGS | METH_KEYWORDS }, { "wxRect_asTuple", (PyCFunction) _wrap_wxRect_asTuple, METH_VARARGS | METH_KEYWORDS }, { "wxRect_height_get", (PyCFunction) _wrap_wxRect_height_get, METH_VARARGS | METH_KEYWORDS }, @@ -4523,7 +5248,6 @@ static PyMethodDef misccMethods[] = { { "new_wxRect", (PyCFunction) _wrap_new_wxRect, METH_VARARGS | METH_KEYWORDS }, { "wxPoint___ne__", (PyCFunction) _wrap_wxPoint___ne__, METH_VARARGS | METH_KEYWORDS }, { "wxPoint___eq__", (PyCFunction) _wrap_wxPoint___eq__, METH_VARARGS | METH_KEYWORDS }, - { "wxPoint___cmp__", (PyCFunction) _wrap_wxPoint___cmp__, METH_VARARGS | METH_KEYWORDS }, { "wxPoint___sub__", (PyCFunction) _wrap_wxPoint___sub__, METH_VARARGS | METH_KEYWORDS }, { "wxPoint___add__", (PyCFunction) _wrap_wxPoint___add__, METH_VARARGS | METH_KEYWORDS }, { "wxPoint_asTuple", (PyCFunction) _wrap_wxPoint_asTuple, METH_VARARGS | METH_KEYWORDS }, @@ -4536,7 +5260,6 @@ static PyMethodDef misccMethods[] = { { "wxPoint_x_set", (PyCFunction) _wrap_wxPoint_x_set, METH_VARARGS | METH_KEYWORDS }, { "wxRealPoint___ne__", (PyCFunction) _wrap_wxRealPoint___ne__, METH_VARARGS | METH_KEYWORDS }, { "wxRealPoint___eq__", (PyCFunction) _wrap_wxRealPoint___eq__, METH_VARARGS | METH_KEYWORDS }, - { "wxRealPoint___cmp__", (PyCFunction) _wrap_wxRealPoint___cmp__, METH_VARARGS | METH_KEYWORDS }, { "wxRealPoint___sub__", (PyCFunction) _wrap_wxRealPoint___sub__, METH_VARARGS | METH_KEYWORDS }, { "wxRealPoint___add__", (PyCFunction) _wrap_wxRealPoint___add__, METH_VARARGS | METH_KEYWORDS }, { "wxRealPoint_asTuple", (PyCFunction) _wrap_wxRealPoint_asTuple, METH_VARARGS | METH_KEYWORDS }, @@ -4549,7 +5272,6 @@ static PyMethodDef misccMethods[] = { { "wxRealPoint_x_set", (PyCFunction) _wrap_wxRealPoint_x_set, METH_VARARGS | METH_KEYWORDS }, { "wxSize___ne__", (PyCFunction) _wrap_wxSize___ne__, METH_VARARGS | METH_KEYWORDS }, { "wxSize___eq__", (PyCFunction) _wrap_wxSize___eq__, METH_VARARGS | METH_KEYWORDS }, - { "wxSize___cmp__", (PyCFunction) _wrap_wxSize___cmp__, METH_VARARGS | METH_KEYWORDS }, { "wxSize_asTuple", (PyCFunction) _wrap_wxSize_asTuple, METH_VARARGS | METH_KEYWORDS }, { "wxSize_SetHeight", (PyCFunction) _wrap_wxSize_SetHeight, METH_VARARGS | METH_KEYWORDS }, { "wxSize_SetWidth", (PyCFunction) _wrap_wxSize_SetWidth, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/misc.py b/wxPython/src/msw/misc.py index b845d54e96..d57f81f52a 100644 --- a/wxPython/src/msw/misc.py +++ b/wxPython/src/msw/misc.py @@ -50,9 +50,6 @@ class wxSizePtr : def asTuple(self, *_args, **_kwargs): val = apply(miscc.wxSize_asTuple,(self,) + _args, _kwargs) return val - def __cmp__(self, *_args, **_kwargs): - val = apply(miscc.wxSize___cmp__,(self,) + _args, _kwargs) - return val def __eq__(self, *_args, **_kwargs): val = apply(miscc.wxSize___eq__,(self,) + _args, _kwargs) return val @@ -125,9 +122,6 @@ class wxRealPointPtr : val = apply(miscc.wxRealPoint___sub__,(self,) + _args, _kwargs) if val: val = wxRealPointPtr(val) ; val.thisown = 1 return val - def __cmp__(self, *_args, **_kwargs): - val = apply(miscc.wxRealPoint___cmp__,(self,) + _args, _kwargs) - return val def __eq__(self, *_args, **_kwargs): val = apply(miscc.wxRealPoint___eq__,(self,) + _args, _kwargs) return val @@ -190,9 +184,6 @@ class wxPointPtr : val = apply(miscc.wxPoint___sub__,(self,) + _args, _kwargs) if val: val = wxPointPtr(val) ; val.thisown = 1 return val - def __cmp__(self, *_args, **_kwargs): - val = apply(miscc.wxPoint___cmp__,(self,) + _args, _kwargs) - return val def __eq__(self, *_args, **_kwargs): val = apply(miscc.wxPoint___eq__,(self,) + _args, _kwargs) return val @@ -316,9 +307,6 @@ class wxRectPtr : val = apply(miscc.wxRect___add__,(self,) + _args, _kwargs) if val: val = wxRectPtr(val) ; val.thisown = 1 return val - def __cmp__(self, *_args, **_kwargs): - val = apply(miscc.wxRect___cmp__,(self,) + _args, _kwargs) - return val def __eq__(self, *_args, **_kwargs): val = apply(miscc.wxRect___eq__,(self,) + _args, _kwargs) return val @@ -409,6 +397,131 @@ class wxRect(wxRectPtr): +class wxPoint2DDoublePtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetFloor(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble_GetFloor,(self,) + _args, _kwargs) + return val + def GetRounded(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble_GetRounded,(self,) + _args, _kwargs) + return val + def GetVectorLength(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble_GetVectorLength,(self,) + _args, _kwargs) + return val + def GetVectorAngle(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble_GetVectorAngle,(self,) + _args, _kwargs) + return val + def SetVectorLength(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble_SetVectorLength,(self,) + _args, _kwargs) + return val + def SetVectorAngle(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble_SetVectorAngle,(self,) + _args, _kwargs) + return val + def GetDistance(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble_GetDistance,(self,) + _args, _kwargs) + return val + def GetDistanceSquare(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble_GetDistanceSquare,(self,) + _args, _kwargs) + return val + def GetDotProduct(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble_GetDotProduct,(self,) + _args, _kwargs) + return val + def GetCrossProduct(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble_GetCrossProduct,(self,) + _args, _kwargs) + return val + def __neg__(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble___neg__,(self,) + _args, _kwargs) + if val: val = wxPoint2DDoublePtr(val) ; val.thisown = 1 + return val + def __iadd__(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble___iadd__,(self,) + _args, _kwargs) + if val: val = wxPoint2DDoublePtr(val) + return val + def __isub__(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble___isub__,(self,) + _args, _kwargs) + if val: val = wxPoint2DDoublePtr(val) + return val + def __imul__(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble___imul__,(self,) + _args, _kwargs) + if val: val = wxPoint2DDoublePtr(val) + return val + def __idiv__(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble___idiv__,(self,) + _args, _kwargs) + if val: val = wxPoint2DDoublePtr(val) + return val + def __eq__(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble___eq__,(self,) + _args, _kwargs) + return val + def __ne__(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble___ne__,(self,) + _args, _kwargs) + return val + def asTuple(self, *_args, **_kwargs): + val = apply(miscc.wxPoint2DDouble_asTuple,(self,) + _args, _kwargs) + return val + def __setattr__(self,name,value): + if name == "m_x" : + miscc.wxPoint2DDouble_m_x_set(self,value) + return + if name == "m_y" : + miscc.wxPoint2DDouble_m_y_set(self,value) + return + if name == "x" : + miscc.wxPoint2DDouble_x_set(self,value) + return + if name == "y" : + miscc.wxPoint2DDouble_y_set(self,value) + return + self.__dict__[name] = value + def __getattr__(self,name): + if name == "m_x" : + return miscc.wxPoint2DDouble_m_x_get(self) + if name == "m_y" : + return miscc.wxPoint2DDouble_m_y_get(self) + if name == "x" : + return miscc.wxPoint2DDouble_x_get(self) + if name == "y" : + return miscc.wxPoint2DDouble_y_get(self) + raise AttributeError,name + def __repr__(self): + return "" % (self.this,) + + def SetPolarCoordinates(self, angle, length): + self.SetVectorLength(length) + self.SetVectorAngle(angle) + def Normalize(self): + self.SetVectorLength(1.0) + + + def __str__(self): return str(self.asTuple()) + def __repr__(self): return str(self.asTuple()) + def __len__(self): return len(self.asTuple()) + def __getitem__(self, index): return self.asTuple()[index] + def __setitem__(self, index, val): + if index == 0: self.m_x = val + elif index == 1: self.m_yt = val + else: raise IndexError + def __nonzero__(self): return self.asTuple() != (0.0, 0.0) + +class wxPoint2DDouble(wxPoint2DDoublePtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(miscc.new_wxPoint2DDouble,_args,_kwargs) + self.thisown = 1 + + + +def wxPoint2DDoubleCopy(*_args,**_kwargs): + val = wxPoint2DDoublePtr(apply(miscc.new_wxPoint2DDoubleCopy,_args,_kwargs)) + val.thisown = 1 + return val + +def wxPoint2DDoubleFromPoint(*_args,**_kwargs): + val = wxPoint2DDoublePtr(apply(miscc.new_wxPoint2DDoubleFromPoint,_args,_kwargs)) + val.thisown = 1 + return val + + class wxIndividualLayoutConstraintPtr(wxObjectPtr): def __init__(self,this): self.this = this diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp index 0683a479ff..0184094026 100644 --- a/wxPython/src/msw/wx.cpp +++ b/wxPython/src/msw/wx.cpp @@ -666,6 +666,7 @@ static wxPyCoreAPI API = { wxRealPoint_helper, wxRect_helper, wxColour_helper, + wxPoint2DDouble_helper, wxPyCBH_setCallbackInfo, wxPyCBH_findCallback, diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py index 634510e06e..9d90b890f5 100644 --- a/wxPython/src/msw/wx.py +++ b/wxPython/src/msw/wx.py @@ -1534,7 +1534,7 @@ wxColor = wxColour wxNamedColor = wxNamedColour wxPen = wxPyPen wxScrollbar = wxScrollBar - +wxPoint2D = wxPoint2DDouble # backwards compatibility wxNoRefBitmap = wxBitmap @@ -1548,6 +1548,7 @@ wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric wxPyAssertionError = wxc.wxPyAssertionError + #---------------------------------------------------------------------- # wxGTK sets the locale when initialized. Doing this at the Python # level should set it up to match what GTK is doing at the C level. @@ -1608,6 +1609,18 @@ def wxPyTypeCast(obj, typeStr): theObj.thisown = obj.thisown return theObj +#---------------------------------------------------------------------------- +# An isinstance for Pythons < 2.2 that can check a sequence of class objects +# like the one in 2.2 can. + +def wxPy_isinstance(obj, klasses): + import types + if sys.version[:3] < "2.2" and type(klasses) in [types.TupleType, types.ListType]: + for klass in klasses: + if isinstance(obj, klass): return true + return false + else: + return isinstance(obj, klasses) #---------------------------------------------------------------------------- _wxCallAfterId = None