From 22faec7d06d45b940424515c9113d9601820d7d3 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 19 Feb 2004 02:33:28 +0000 Subject: [PATCH] Allow comparrisons with None git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_colour.i | 2 +- wxPython/src/_datetime.i | 39 ++++----- wxPython/src/_font.i | 6 +- wxPython/src/_gbsizer.i | 12 ++- wxPython/src/_gdicmn.i | 5 ++ wxPython/src/_pen.i | 5 +- wxPython/src/_treectrl.i | 11 +-- wxPython/src/grid.i | 82 ++++++++++--------- wxPython/src/gtk/controls_wrap.cpp | 14 +--- wxPython/src/gtk/core.py | 8 +- wxPython/src/gtk/core_wrap.cpp | 52 +++++------- wxPython/src/gtk/gdi.py | 10 ++- wxPython/src/gtk/gdi_wrap.cpp | 58 +++++++++---- wxPython/src/gtk/grid_wrap.cpp | 31 ++++--- wxPython/src/gtk/misc_wrap.cpp | 126 ++++++++++------------------- wxPython/src/helpers.cpp | 29 +++++++ 16 files changed, 257 insertions(+), 233 deletions(-) diff --git a/wxPython/src/_colour.i b/wxPython/src/_colour.i index a7db6a67ad..01ff2d80a0 100644 --- a/wxPython/src/_colour.i +++ b/wxPython/src/_colour.i @@ -33,7 +33,7 @@ public: %name(SetRGB) void Set(unsigned long colRGB); bool operator==(const wxColour& colour) const; - bool operator != (const wxColour& colour) const; + bool operator!=(const wxColour& colour) const; void InitFromName(const wxString& colourName); diff --git a/wxPython/src/_datetime.i b/wxPython/src/_datetime.i index 34d2114a90..da3bd3099e 100644 --- a/wxPython/src/_datetime.i +++ b/wxPython/src/_datetime.i @@ -713,12 +713,12 @@ public: wxDateTime __sub__(const wxTimeSpan& other) { return *self - other; } wxDateTime __sub__(const wxDateSpan& other) { return *self - other; } - bool __lt__(const wxDateTime& other) { return *self < other; } - bool __le__(const wxDateTime& other) { return *self <= other; } - bool __gt__(const wxDateTime& other) { return *self > other; } - bool __ge__(const wxDateTime& other) { return *self >= other; } - bool __eq__(const wxDateTime& other) { return *self == other; } - bool __ne__(const wxDateTime& other) { return *self != other; } + bool __lt__(const wxDateTime* other) { return other ? (*self < *other) : False; } + bool __le__(const wxDateTime* other) { return other ? (*self <= *other) : False; } + bool __gt__(const wxDateTime* other) { return other ? (*self > *other) : True; } + bool __ge__(const wxDateTime* other) { return other ? (*self >= *other) : True; } + bool __eq__(const wxDateTime* other) { return other ? (*self == *other) : False; } + bool __ne__(const wxDateTime* other) { return other ? (*self != *other) : True; } } @@ -889,12 +889,13 @@ public: wxTimeSpan __sub__(const wxTimeSpan& other) { return *self - other; } wxTimeSpan __mul__(int n) { return *self * n; } wxTimeSpan __rmul__(int n) { return n * *self; } - bool __lt__(const wxTimeSpan& other) { return *self < other; } - bool __le__(const wxTimeSpan& other) { return *self <= other; } - bool __gt__(const wxTimeSpan& other) { return *self > other; } - bool __ge__(const wxTimeSpan& other) { return *self >= other; } - bool __eq__(const wxTimeSpan& other) { return *self == other; } - bool __ne__(const wxTimeSpan& other) { return *self != other; } + + bool __lt__(const wxTimeSpan* other) { return other ? (*self < *other) : False; } + bool __le__(const wxTimeSpan* other) { return other ? (*self <= *other) : False; } + bool __gt__(const wxTimeSpan* other) { return other ? (*self > *other) : True; } + bool __ge__(const wxTimeSpan* other) { return other ? (*self >= *other) : True; } + bool __eq__(const wxTimeSpan* other) { return other ? (*self == *other) : False; } + bool __ne__(const wxTimeSpan* other) { return other ? (*self != *other) : True; } } @@ -1074,12 +1075,14 @@ public: wxDateSpan __sub__(const wxDateSpan& other) { return *self - other; } wxDateSpan __mul__(int n) { return *self * n; } wxDateSpan __rmul__(int n) { return n * *self; } -// bool __lt__(const wxDateSpan& other) { return *self < other; } -// bool __le__(const wxDateSpan& other) { return *self <= other; } -// bool __gt__(const wxDateSpan& other) { return *self > other; } -// bool __ge__(const wxDateSpan& other) { return *self >= other; } - bool __eq__(const wxDateSpan& other) { return *self == other; } - bool __ne__(const wxDateSpan& other) { return *self != other; } + +// bool __lt__(const wxDateSpan* other) { return other ? (*self < *other) : False; } +// bool __le__(const wxDateSpan* other) { return other ? (*self <= *other) : False; } +// bool __gt__(const wxDateSpan* other) { return other ? (*self > *other) : True; } +// bool __ge__(const wxDateSpan* other) { return other ? (*self >= *other) : True; } + + bool __eq__(const wxDateSpan* other) { return other ? (*self == *other) : False; } + bool __ne__(const wxDateSpan* other) { return other ? (*self != *other) : True; } } }; diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i index 833c37b9b4..c342e425e4 100644 --- a/wxPython/src/_font.i +++ b/wxPython/src/_font.i @@ -452,8 +452,10 @@ public: %pythoncode { def __nonzero__(self): return self.Ok() } // comparison - bool operator == (const wxFont& font) const; - bool operator != (const wxFont& font) const; + %extend { + bool __eq__(const wxFont* other) { return other ? (*self == *other) : False; } + bool __ne__(const wxFont* other) { return other ? (*self != *other) : True; } + } // accessors: get the font characteristics virtual int GetPointSize() const; diff --git a/wxPython/src/_gbsizer.i b/wxPython/src/_gbsizer.i index a28621347e..a87e92eef4 100644 --- a/wxPython/src/_gbsizer.i +++ b/wxPython/src/_gbsizer.i @@ -65,8 +65,10 @@ public: void SetRow(int row); void SetCol(int col); - bool operator==(const wxGBPosition& p) const; - bool operator!=(const wxGBPosition& p) const; + %extend { + bool __eq__(const wxGBPosition* other) { return other ? (*self == *other) : False; } + bool __ne__(const wxGBPosition* other) { return other ? (*self != *other) : True; } + } %extend { void Set(int row=0, int col=0) { @@ -117,8 +119,10 @@ public: void SetRowspan(int rowspan); void SetColspan(int colspan); - bool operator==(const wxGBSpan& o) const; - bool operator!=(const wxGBSpan& o) const; + %extend { + bool __eq__(const wxGBSpan* other) { return other ? (*self == *other) : False; } + bool __ne__(const wxGBSpan* other) { return other ? (*self != *other) : True; } + } %extend { void Set(int rowspan=1, int colspan=1) { diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i index f925aa8da3..4bbbe4a686 100644 --- a/wxPython/src/_gdicmn.i +++ b/wxPython/src/_gdicmn.i @@ -130,6 +130,11 @@ public: ~wxSize(); +// %extend { +// bool __eq__(const wxSize* other) { return other ? (*self == *other) : False; } +// bool __ne__(const wxSize* other) { return other ? (*self != *other) : True; } +// } + DocDeclStr( bool, operator==(const wxSize& sz), "Test for equality of wx.Size objects."); diff --git a/wxPython/src/_pen.i b/wxPython/src/_pen.i index 150417ea1e..757872a251 100644 --- a/wxPython/src/_pen.i +++ b/wxPython/src/_pen.i @@ -63,7 +63,10 @@ public: } } - bool operator==(const wxPen& pen) /*const*/; + %extend { + bool __eq__(const wxPen* other) { return other ? (*self == *other) : False; } + bool __ne__(const wxPen* other) { return other ? (*self != *other) : True; } + } #ifndef __WXMAC__ // wxDash* GetDash() const; diff --git a/wxPython/src/_treectrl.i b/wxPython/src/_treectrl.i index 0dfc6bfd00..253b6303ff 100644 --- a/wxPython/src/_treectrl.i +++ b/wxPython/src/_treectrl.i @@ -96,15 +96,8 @@ public: bool IsOk() const; %extend { - bool operator==(const wxTreeItemId* other) { - if (!other) return False; - return *self == *other; - } - - bool operator!=(const wxTreeItemId* other) { - if (!other) return True; - return *self != *other; - } + bool __eq__(const wxTreeItemId* other) { return other ? (*self == *other) : False; } + bool __ne__(const wxTreeItemId* other) { return other ? (*self != *other) : True; } } void* m_pItem; diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i index c4adcb1b93..1127faf0d8 100644 --- a/wxPython/src/grid.i +++ b/wxPython/src/grid.i @@ -1392,42 +1392,6 @@ public: //--------------------------------------------------------------------------- -class wxGridCellCoords -{ -public: - wxGridCellCoords( int r=-1, int c=-1 ); - ~wxGridCellCoords(); - - int GetRow() const; - void SetRow( int n ); - int GetCol() const; - void SetCol( int n ); - void Set( int row, int col ); - - bool operator==( const wxGridCellCoords& other ) const; - bool operator!=( const wxGridCellCoords& other ) const; - - %extend { - PyObject* asTuple() { - PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow())); - PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol())); - return tup; - } - } - %pythoncode { - def __str__(self): return str(self.asTuple()) - def __repr__(self): return 'wxGridCellCoords'+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.SetRow(val) - elif index == 1: self.SetCol(val) - else: raise IndexError - } - -}; - // Typemap to allow conversion of sequence objects to wxGridCellCoords... %typemap(in) wxGridCellCoords& (wxGridCellCoords temp) { $1 = &temp; @@ -1442,6 +1406,11 @@ public: %{ bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) { + if (source == Py_None) { + **obj = wxGridCellCoords(-1,-1); + return True; + } + // If source is an object instance then it may already be the right type if (wxPySwigInstance_Check(source)) { wxGridCellCoords* ptr; @@ -1515,6 +1484,47 @@ PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray& source) } %} + + + + +class wxGridCellCoords +{ +public: + wxGridCellCoords( int r=-1, int c=-1 ); + ~wxGridCellCoords(); + + int GetRow() const; + void SetRow( int n ); + int GetCol() const; + void SetCol( int n ); + void Set( int row, int col ); + + bool operator==( const wxGridCellCoords& other ) const; + bool operator!=( const wxGridCellCoords& other ) const; + + %extend { + PyObject* asTuple() { + PyObject* tup = PyTuple_New(2); + PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow())); + PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol())); + return tup; + } + } + %pythoncode { + def __str__(self): return str(self.asTuple()) + def __repr__(self): return 'wxGridCellCoords'+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.SetRow(val) + elif index == 1: self.SetCol(val) + else: raise IndexError + } + +}; + + //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- // The grid itself diff --git a/wxPython/src/gtk/controls_wrap.cpp b/wxPython/src/gtk/controls_wrap.cpp index 3c5c6dbe5c..e80b2c958e 100644 --- a/wxPython/src/gtk/controls_wrap.cpp +++ b/wxPython/src/gtk/controls_wrap.cpp @@ -668,14 +668,8 @@ wxWindow *wxPyListCtrl_GetMainWindow(wxPyListCtrl *self){ #include "wx/wxPython/pytree.h" static const wxString wxPyTreeCtrlNameStr(_T("wxTreeCtrl")); -bool wxTreeItemId_operator_ee___(wxTreeItemId *self,wxTreeItemId const *other){ - if (!other) return False; - return *self == *other; - } -bool wxTreeItemId_operator_Ne___(wxTreeItemId *self,wxTreeItemId const *other){ - if (!other) return True; - return *self != *other; - } +bool wxTreeItemId___eq__(wxTreeItemId *self,wxTreeItemId const *other){ return other ? (*self == *other) : False; } +bool wxTreeItemId___ne__(wxTreeItemId *self,wxTreeItemId const *other){ return other ? (*self != *other) : True; } void wxPyTreeItemData_Destroy(wxPyTreeItemData *self){ delete self; } // C++ version of Python aware wxTreeCtrl class wxPyTreeCtrl : public wxTreeCtrl { @@ -22822,7 +22816,7 @@ static PyObject *_wrap_TreeItemId___eq__(PyObject *self, PyObject *args, PyObjec if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxTreeItemId_operator_ee___(arg1,(wxTreeItemId const *)arg2); + result = (bool)wxTreeItemId___eq__(arg1,(wxTreeItemId const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -22850,7 +22844,7 @@ static PyObject *_wrap_TreeItemId___ne__(PyObject *self, PyObject *args, PyObjec if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxTreeItemId_operator_Ne___(arg1,(wxTreeItemId const *)arg2); + result = (bool)wxTreeItemId___ne__(arg1,(wxTreeItemId const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; diff --git a/wxPython/src/gtk/core.py b/wxPython/src/gtk/core.py index 550e12ca34..137791096f 100644 --- a/wxPython/src/gtk/core.py +++ b/wxPython/src/gtk/core.py @@ -7454,11 +7454,11 @@ class GBPosition(object): return _core.GBPosition_SetCol(*args, **kwargs) def __eq__(*args, **kwargs): - """__eq__(GBPosition p) -> bool""" + """__eq__(GBPosition other) -> bool""" return _core.GBPosition___eq__(*args, **kwargs) def __ne__(*args, **kwargs): - """__ne__(GBPosition p) -> bool""" + """__ne__(GBPosition other) -> bool""" return _core.GBPosition___ne__(*args, **kwargs) def Set(*args, **kwargs): @@ -7519,11 +7519,11 @@ class GBSpan(object): return _core.GBSpan_SetColspan(*args, **kwargs) def __eq__(*args, **kwargs): - """__eq__(GBSpan o) -> bool""" + """__eq__(GBSpan other) -> bool""" return _core.GBSpan___eq__(*args, **kwargs) def __ne__(*args, **kwargs): - """__ne__(GBSpan o) -> bool""" + """__ne__(GBSpan other) -> bool""" return _core.GBSpan___ne__(*args, **kwargs) def Set(*args, **kwargs): diff --git a/wxPython/src/gtk/core_wrap.cpp b/wxPython/src/gtk/core_wrap.cpp index 031daf8a33..0138de2d83 100644 --- a/wxPython/src/gtk/core_wrap.cpp +++ b/wxPython/src/gtk/core_wrap.cpp @@ -1431,6 +1431,8 @@ bool wxGBSpan_helper(PyObject* source, wxGBSpan** obj) } +bool wxGBPosition___eq__(wxGBPosition *self,wxGBPosition const *other){ return other ? (*self == *other) : False; } +bool wxGBPosition___ne__(wxGBPosition *self,wxGBPosition const *other){ return other ? (*self != *other) : True; } void wxGBPosition_Set(wxGBPosition *self,int row,int col){ self->SetRow(row); self->SetCol(col); @@ -1443,6 +1445,8 @@ PyObject *wxGBPosition_Get(wxGBPosition *self){ wxPyEndBlockThreads(); return tup; } +bool wxGBSpan___eq__(wxGBSpan *self,wxGBSpan const *other){ return other ? (*self == *other) : False; } +bool wxGBSpan___ne__(wxGBSpan *self,wxGBSpan const *other){ return other ? (*self != *other) : True; } void wxGBSpan_Set(wxGBSpan *self,int rowspan,int colspan){ self->SetRowspan(rowspan); self->SetColspan(colspan); @@ -34973,24 +34977,20 @@ static PyObject *_wrap_GBPosition_SetCol(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_GBPosition___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGBPosition *arg1 = (wxGBPosition *) 0 ; - wxGBPosition *arg2 = 0 ; + wxGBPosition *arg2 = (wxGBPosition *) 0 ; bool result; - wxGBPosition temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition___eq__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGBPosition const *)arg1)->operator ==((wxGBPosition const &)*arg2); + result = (bool)wxGBPosition___eq__(arg1,(wxGBPosition const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -35005,24 +35005,20 @@ static PyObject *_wrap_GBPosition___eq__(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_GBPosition___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGBPosition *arg1 = (wxGBPosition *) 0 ; - wxGBPosition *arg2 = 0 ; + wxGBPosition *arg2 = (wxGBPosition *) 0 ; bool result; - wxGBPosition temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "p", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition___ne__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGBPosition const *)arg1)->operator !=((wxGBPosition const &)*arg2); + result = (bool)wxGBPosition___ne__(arg1,(wxGBPosition const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -35257,24 +35253,20 @@ static PyObject *_wrap_GBSpan_SetColspan(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_GBSpan___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGBSpan *arg1 = (wxGBSpan *) 0 ; - wxGBSpan *arg2 = 0 ; + wxGBSpan *arg2 = (wxGBSpan *) 0 ; bool result; - wxGBSpan temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "o", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan___eq__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxGBSpan_helper(obj1, &arg2)) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGBSpan const *)arg1)->operator ==((wxGBSpan const &)*arg2); + result = (bool)wxGBSpan___eq__(arg1,(wxGBSpan const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -35289,24 +35281,20 @@ static PyObject *_wrap_GBSpan___eq__(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_GBSpan___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGBSpan *arg1 = (wxGBSpan *) 0 ; - wxGBSpan *arg2 = 0 ; + wxGBSpan *arg2 = (wxGBSpan *) 0 ; bool result; - wxGBSpan temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "o", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan___ne__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxGBSpan_helper(obj1, &arg2)) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGBSpan const *)arg1)->operator !=((wxGBSpan const &)*arg2); + result = (bool)wxGBSpan___ne__(arg1,(wxGBSpan const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py index 47fa49fde8..baafe6a297 100644 --- a/wxPython/src/gtk/gdi.py +++ b/wxPython/src/gtk/gdi.py @@ -236,9 +236,13 @@ class Pen(GDIObject): return _gdi.Pen_GetDashes(*args, **kwargs) def __eq__(*args, **kwargs): - """__eq__(Pen pen) -> bool""" + """__eq__(Pen other) -> bool""" return _gdi.Pen___eq__(*args, **kwargs) + def __ne__(*args, **kwargs): + """__ne__(Pen other) -> bool""" + return _gdi.Pen___ne__(*args, **kwargs) + def GetDashCount(*args, **kwargs): """GetDashCount() -> int""" return _gdi.Pen_GetDashCount(*args, **kwargs) @@ -1411,11 +1415,11 @@ class Font(GDIObject): def __nonzero__(self): return self.Ok() def __eq__(*args, **kwargs): - """__eq__(Font font) -> bool""" + """__eq__(Font other) -> bool""" return _gdi.Font___eq__(*args, **kwargs) def __ne__(*args, **kwargs): - """__ne__(Font font) -> bool""" + """__ne__(Font other) -> bool""" return _gdi.Font___ne__(*args, **kwargs) def GetPointSize(*args, **kwargs): diff --git a/wxPython/src/gtk/gdi_wrap.cpp b/wxPython/src/gtk/gdi_wrap.cpp index df4551d6ae..304aa102bb 100644 --- a/wxPython/src/gtk/gdi_wrap.cpp +++ b/wxPython/src/gtk/gdi_wrap.cpp @@ -416,6 +416,8 @@ PyObject *wxPen_GetDashes(wxPen *self){ wxPyEndBlockThreads(); return retval; } +bool wxPen___eq__(wxPen *self,wxPen const *other){ return other ? (*self == *other) : False; } +bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*self != *other) : True; } wxPyPen::~wxPyPen() { @@ -597,6 +599,8 @@ wxFont *new_wxFont(wxString const &info){ wxFont *new_wxFont(int pointSize,wxFontFamily family,int flags,wxString const &face,wxFontEncoding encoding){ return wxFont::New(pointSize, family, flags, face, encoding); } +bool wxFont___eq__(wxFont *self,wxFont const *other){ return other ? (*self == *other) : False; } +bool wxFont___ne__(wxFont *self,wxFont const *other){ return other ? (*self != *other) : True; } class wxPyFontEnumerator : public wxFontEnumerator { public: @@ -1936,23 +1940,48 @@ static PyObject *_wrap_Pen_GetDashes(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_Pen___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPen *arg1 = (wxPen *) 0 ; - wxPen *arg2 = 0 ; + wxPen *arg2 = (wxPen *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pen", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___eq__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxPen___eq__(arg1,(wxPen const *)arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; } + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Pen___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPen *arg1 = (wxPen *) 0 ; + wxPen *arg2 = (wxPen *) 0 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "other", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___ne__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->operator ==((wxPen const &)*arg2); + result = (bool)wxPen___ne__(arg1,(wxPen const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -7367,23 +7396,20 @@ static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs) static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; - wxFont *arg2 = 0 ; + wxFont *arg2 = (wxFont *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "font", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___eq__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxFont const *)arg1)->operator ==((wxFont const &)*arg2); + result = (bool)wxFont___eq__(arg1,(wxFont const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -7398,23 +7424,20 @@ static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwa static PyObject *_wrap_Font___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; - wxFont *arg2 = 0 ; + wxFont *arg2 = (wxFont *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "font", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___ne__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxFont const *)arg1)->operator !=((wxFont const &)*arg2); + result = (bool)wxFont___ne__(arg1,(wxFont const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -17745,6 +17768,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Pen_SetDashes", (PyCFunction) _wrap_Pen_SetDashes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_GetDashes", (PyCFunction) _wrap_Pen_GetDashes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen___eq__", (PyCFunction) _wrap_Pen___eq__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Pen___ne__", (PyCFunction) _wrap_Pen___ne__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_GetDashCount", (PyCFunction) _wrap_Pen_GetDashCount, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_swigregister", Pen_swigregister, METH_VARARGS }, { (char *)"new_PyPen", (PyCFunction) _wrap_new_PyPen, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp index cdf43caa28..64acd7f162 100644 --- a/wxPython/src/gtk/grid_wrap.cpp +++ b/wxPython/src/gtk/grid_wrap.cpp @@ -1223,15 +1223,14 @@ public: }; void wxPyGridTableBase_Destroy(wxPyGridTableBase *self){ delete self; } -PyObject *wxGridCellCoords_asTuple(wxGridCellCoords *self){ - PyObject* tup = PyTuple_New(2); - PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow())); - PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol())); - return tup; - } bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) { + if (source == Py_None) { + **obj = wxGridCellCoords(-1,-1); + return True; + } + // If source is an object instance then it may already be the right type if (wxPySwigInstance_Check(source)) { wxGridCellCoords* ptr; @@ -1291,6 +1290,12 @@ PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray& source) return list; } +PyObject *wxGridCellCoords_asTuple(wxGridCellCoords *self){ + PyObject* tup = PyTuple_New(2); + PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow())); + PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol())); + return tup; + } typedef wxGrid::wxGridSelectionModes WXGRIDSELECTIONMODES; @@ -7746,6 +7751,7 @@ static PyObject *_wrap_GridCellCoords___eq__(PyObject *self, PyObject *args, PyO wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ; wxGridCellCoords *arg2 = 0 ; bool result; + wxGridCellCoords temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7754,9 +7760,9 @@ static PyObject *_wrap_GridCellCoords___eq__(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___eq__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + { + arg2 = &temp2; + if (! wxGridCellCoords_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7777,6 +7783,7 @@ static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyO wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ; wxGridCellCoords *arg2 = 0 ; bool result; + wxGridCellCoords temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7785,9 +7792,9 @@ static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___ne__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + { + arg2 = &temp2; + if (! wxGridCellCoords_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); diff --git a/wxPython/src/gtk/misc_wrap.cpp b/wxPython/src/gtk/misc_wrap.cpp index f207099f10..c5fbad19cd 100644 --- a/wxPython/src/gtk/misc_wrap.cpp +++ b/wxPython/src/gtk/misc_wrap.cpp @@ -985,12 +985,12 @@ wxDateTime wxDateTime___add____SWIG_1(wxDateTime *self,wxDateSpan const &other){ wxTimeSpan wxDateTime___sub____SWIG_0(wxDateTime *self,wxDateTime const &other){ return *self - other; } wxDateTime wxDateTime___sub____SWIG_1(wxDateTime *self,wxTimeSpan const &other){ return *self - other; } wxDateTime wxDateTime___sub____SWIG_2(wxDateTime *self,wxDateSpan const &other){ return *self - other; } -bool wxDateTime___lt__(wxDateTime *self,wxDateTime const &other){ return *self < other; } -bool wxDateTime___le__(wxDateTime *self,wxDateTime const &other){ return *self <= other; } -bool wxDateTime___gt__(wxDateTime *self,wxDateTime const &other){ return *self > other; } -bool wxDateTime___ge__(wxDateTime *self,wxDateTime const &other){ return *self >= other; } -bool wxDateTime___eq__(wxDateTime *self,wxDateTime const &other){ return *self == other; } -bool wxDateTime___ne__(wxDateTime *self,wxDateTime const &other){ return *self != other; } +bool wxDateTime___lt__(wxDateTime *self,wxDateTime const *other){ return other ? (*self < *other) : False; } +bool wxDateTime___le__(wxDateTime *self,wxDateTime const *other){ return other ? (*self <= *other) : False; } +bool wxDateTime___gt__(wxDateTime *self,wxDateTime const *other){ return other ? (*self > *other) : True; } +bool wxDateTime___ge__(wxDateTime *self,wxDateTime const *other){ return other ? (*self >= *other) : True; } +bool wxDateTime___eq__(wxDateTime *self,wxDateTime const *other){ return other ? (*self == *other) : False; } +bool wxDateTime___ne__(wxDateTime *self,wxDateTime const *other){ return other ? (*self != *other) : True; } int wxDateTime_ParseRfc822Date(wxDateTime *self,wxString const &date){ const wxChar* rv; const wxChar* _date = date; @@ -1030,18 +1030,18 @@ wxTimeSpan wxTimeSpan___add__(wxTimeSpan *self,wxTimeSpan const &other){ return wxTimeSpan wxTimeSpan___sub__(wxTimeSpan *self,wxTimeSpan const &other){ return *self - other; } wxTimeSpan wxTimeSpan___mul__(wxTimeSpan *self,int n){ return *self * n; } wxTimeSpan wxTimeSpan___rmul__(wxTimeSpan *self,int n){ return n * *self; } -bool wxTimeSpan___lt__(wxTimeSpan *self,wxTimeSpan const &other){ return *self < other; } -bool wxTimeSpan___le__(wxTimeSpan *self,wxTimeSpan const &other){ return *self <= other; } -bool wxTimeSpan___gt__(wxTimeSpan *self,wxTimeSpan const &other){ return *self > other; } -bool wxTimeSpan___ge__(wxTimeSpan *self,wxTimeSpan const &other){ return *self >= other; } -bool wxTimeSpan___eq__(wxTimeSpan *self,wxTimeSpan const &other){ return *self == other; } -bool wxTimeSpan___ne__(wxTimeSpan *self,wxTimeSpan const &other){ return *self != other; } +bool wxTimeSpan___lt__(wxTimeSpan *self,wxTimeSpan const *other){ return other ? (*self < *other) : False; } +bool wxTimeSpan___le__(wxTimeSpan *self,wxTimeSpan const *other){ return other ? (*self <= *other) : False; } +bool wxTimeSpan___gt__(wxTimeSpan *self,wxTimeSpan const *other){ return other ? (*self > *other) : True; } +bool wxTimeSpan___ge__(wxTimeSpan *self,wxTimeSpan const *other){ return other ? (*self >= *other) : True; } +bool wxTimeSpan___eq__(wxTimeSpan *self,wxTimeSpan const *other){ return other ? (*self == *other) : False; } +bool wxTimeSpan___ne__(wxTimeSpan *self,wxTimeSpan const *other){ return other ? (*self != *other) : True; } wxDateSpan wxDateSpan___add__(wxDateSpan *self,wxDateSpan const &other){ return *self + other; } wxDateSpan wxDateSpan___sub__(wxDateSpan *self,wxDateSpan const &other){ return *self - other; } wxDateSpan wxDateSpan___mul__(wxDateSpan *self,int n){ return *self * n; } wxDateSpan wxDateSpan___rmul__(wxDateSpan *self,int n){ return n * *self; } -bool wxDateSpan___eq__(wxDateSpan *self,wxDateSpan const &other){ return *self == other; } -bool wxDateSpan___ne__(wxDateSpan *self,wxDateSpan const &other){ return *self != other; } +bool wxDateSpan___eq__(wxDateSpan *self,wxDateSpan const *other){ return other ? (*self == *other) : False; } +bool wxDateSpan___ne__(wxDateSpan *self,wxDateSpan const *other){ return other ? (*self != *other) : True; } #include @@ -20254,7 +20254,7 @@ static PyObject *_wrap_DateTime___sub__(PyObject *self, PyObject *args) { static PyObject *_wrap_DateTime___lt__(PyObject *self, PyObject *args) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime *arg2 = 0 ; + wxDateTime *arg2 = (wxDateTime *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20262,12 +20262,9 @@ static PyObject *_wrap_DateTime___lt__(PyObject *self, PyObject *args) { if(!PyArg_ParseTuple(args,(char *)"OO:DateTime___lt__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxDateTime___lt__(arg1,(wxDateTime const &)*arg2); + result = (bool)wxDateTime___lt__(arg1,(wxDateTime const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20282,7 +20279,7 @@ static PyObject *_wrap_DateTime___lt__(PyObject *self, PyObject *args) { static PyObject *_wrap_DateTime___le__(PyObject *self, PyObject *args) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime *arg2 = 0 ; + wxDateTime *arg2 = (wxDateTime *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20290,12 +20287,9 @@ static PyObject *_wrap_DateTime___le__(PyObject *self, PyObject *args) { if(!PyArg_ParseTuple(args,(char *)"OO:DateTime___le__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxDateTime___le__(arg1,(wxDateTime const &)*arg2); + result = (bool)wxDateTime___le__(arg1,(wxDateTime const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20310,7 +20304,7 @@ static PyObject *_wrap_DateTime___le__(PyObject *self, PyObject *args) { static PyObject *_wrap_DateTime___gt__(PyObject *self, PyObject *args) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime *arg2 = 0 ; + wxDateTime *arg2 = (wxDateTime *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20318,12 +20312,9 @@ static PyObject *_wrap_DateTime___gt__(PyObject *self, PyObject *args) { if(!PyArg_ParseTuple(args,(char *)"OO:DateTime___gt__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxDateTime___gt__(arg1,(wxDateTime const &)*arg2); + result = (bool)wxDateTime___gt__(arg1,(wxDateTime const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20338,7 +20329,7 @@ static PyObject *_wrap_DateTime___gt__(PyObject *self, PyObject *args) { static PyObject *_wrap_DateTime___ge__(PyObject *self, PyObject *args) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime *arg2 = 0 ; + wxDateTime *arg2 = (wxDateTime *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20346,12 +20337,9 @@ static PyObject *_wrap_DateTime___ge__(PyObject *self, PyObject *args) { if(!PyArg_ParseTuple(args,(char *)"OO:DateTime___ge__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxDateTime___ge__(arg1,(wxDateTime const &)*arg2); + result = (bool)wxDateTime___ge__(arg1,(wxDateTime const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20366,7 +20354,7 @@ static PyObject *_wrap_DateTime___ge__(PyObject *self, PyObject *args) { static PyObject *_wrap_DateTime___eq__(PyObject *self, PyObject *args) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime *arg2 = 0 ; + wxDateTime *arg2 = (wxDateTime *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20374,12 +20362,9 @@ static PyObject *_wrap_DateTime___eq__(PyObject *self, PyObject *args) { if(!PyArg_ParseTuple(args,(char *)"OO:DateTime___eq__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxDateTime___eq__(arg1,(wxDateTime const &)*arg2); + result = (bool)wxDateTime___eq__(arg1,(wxDateTime const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20394,7 +20379,7 @@ static PyObject *_wrap_DateTime___eq__(PyObject *self, PyObject *args) { static PyObject *_wrap_DateTime___ne__(PyObject *self, PyObject *args) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime *arg2 = 0 ; + wxDateTime *arg2 = (wxDateTime *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20402,12 +20387,9 @@ static PyObject *_wrap_DateTime___ne__(PyObject *self, PyObject *args) { if(!PyArg_ParseTuple(args,(char *)"OO:DateTime___ne__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxDateTime___ne__(arg1,(wxDateTime const &)*arg2); + result = (bool)wxDateTime___ne__(arg1,(wxDateTime const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -21649,7 +21631,7 @@ static PyObject *_wrap_TimeSpan___rmul__(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_TimeSpan___lt__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTimeSpan *arg1 = (wxTimeSpan *) 0 ; - wxTimeSpan *arg2 = 0 ; + wxTimeSpan *arg2 = (wxTimeSpan *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -21660,12 +21642,9 @@ static PyObject *_wrap_TimeSpan___lt__(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___lt__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxTimeSpan___lt__(arg1,(wxTimeSpan const &)*arg2); + result = (bool)wxTimeSpan___lt__(arg1,(wxTimeSpan const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -21680,7 +21659,7 @@ static PyObject *_wrap_TimeSpan___lt__(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_TimeSpan___le__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTimeSpan *arg1 = (wxTimeSpan *) 0 ; - wxTimeSpan *arg2 = 0 ; + wxTimeSpan *arg2 = (wxTimeSpan *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -21691,12 +21670,9 @@ static PyObject *_wrap_TimeSpan___le__(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___le__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxTimeSpan___le__(arg1,(wxTimeSpan const &)*arg2); + result = (bool)wxTimeSpan___le__(arg1,(wxTimeSpan const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -21711,7 +21687,7 @@ static PyObject *_wrap_TimeSpan___le__(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_TimeSpan___gt__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTimeSpan *arg1 = (wxTimeSpan *) 0 ; - wxTimeSpan *arg2 = 0 ; + wxTimeSpan *arg2 = (wxTimeSpan *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -21722,12 +21698,9 @@ static PyObject *_wrap_TimeSpan___gt__(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___gt__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxTimeSpan___gt__(arg1,(wxTimeSpan const &)*arg2); + result = (bool)wxTimeSpan___gt__(arg1,(wxTimeSpan const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -21742,7 +21715,7 @@ static PyObject *_wrap_TimeSpan___gt__(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_TimeSpan___ge__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTimeSpan *arg1 = (wxTimeSpan *) 0 ; - wxTimeSpan *arg2 = 0 ; + wxTimeSpan *arg2 = (wxTimeSpan *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -21753,12 +21726,9 @@ static PyObject *_wrap_TimeSpan___ge__(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___ge__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxTimeSpan___ge__(arg1,(wxTimeSpan const &)*arg2); + result = (bool)wxTimeSpan___ge__(arg1,(wxTimeSpan const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -21773,7 +21743,7 @@ static PyObject *_wrap_TimeSpan___ge__(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_TimeSpan___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTimeSpan *arg1 = (wxTimeSpan *) 0 ; - wxTimeSpan *arg2 = 0 ; + wxTimeSpan *arg2 = (wxTimeSpan *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -21784,12 +21754,9 @@ static PyObject *_wrap_TimeSpan___eq__(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___eq__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxTimeSpan___eq__(arg1,(wxTimeSpan const &)*arg2); + result = (bool)wxTimeSpan___eq__(arg1,(wxTimeSpan const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -21804,7 +21771,7 @@ static PyObject *_wrap_TimeSpan___eq__(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_TimeSpan___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTimeSpan *arg1 = (wxTimeSpan *) 0 ; - wxTimeSpan *arg2 = 0 ; + wxTimeSpan *arg2 = (wxTimeSpan *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -21815,12 +21782,9 @@ static PyObject *_wrap_TimeSpan___ne__(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___ne__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTimeSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxTimeSpan___ne__(arg1,(wxTimeSpan const &)*arg2); + result = (bool)wxTimeSpan___ne__(arg1,(wxTimeSpan const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -23203,7 +23167,7 @@ static PyObject *_wrap_DateSpan___rmul__(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_DateSpan___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateSpan *arg1 = (wxDateSpan *) 0 ; - wxDateSpan *arg2 = 0 ; + wxDateSpan *arg2 = (wxDateSpan *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -23214,12 +23178,9 @@ static PyObject *_wrap_DateSpan___eq__(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___eq__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxDateSpan___eq__(arg1,(wxDateSpan const &)*arg2); + result = (bool)wxDateSpan___eq__(arg1,(wxDateSpan const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -23234,7 +23195,7 @@ static PyObject *_wrap_DateSpan___eq__(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_DateSpan___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateSpan *arg1 = (wxDateSpan *) 0 ; - wxDateSpan *arg2 = 0 ; + wxDateSpan *arg2 = (wxDateSpan *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -23245,12 +23206,9 @@ static PyObject *_wrap_DateSpan___ne__(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___ne__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDateSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxDateSpan___ne__(arg1,(wxDateSpan const &)*arg2); + result = (bool)wxDateSpan___ne__(arg1,(wxDateSpan const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index b6cb242d2a..99fdb3ce27 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -2228,12 +2228,20 @@ bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen) bool wxSize_helper(PyObject* source, wxSize** obj) { + if (source == Py_None) { + **obj = wxSize(-1,-1); + return True; + } return wxPyTwoIntItem_helper(source, obj, wxT("wxSize")); } bool wxPoint_helper(PyObject* source, wxPoint** obj) { + if (source == Py_None) { + **obj = wxPoint(-1,-1); + return True; + } return wxPyTwoIntItem_helper(source, obj, wxT("wxPoint")); } @@ -2241,6 +2249,11 @@ bool wxPoint_helper(PyObject* source, wxPoint** obj) bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) { + if (source == Py_None) { + **obj = wxRealPoint(-1,-1); + return True; + } + // If source is an object instance then it may already be the right type if (wxPySwigInstance_Check(source)) { wxRealPoint* ptr; @@ -2273,6 +2286,11 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) { bool wxRect_helper(PyObject* source, wxRect** obj) { + if (source == Py_None) { + **obj = wxRect(-1,-1,-1,-1); + return True; + } + // If source is an object instance then it may already be the right type if (wxPySwigInstance_Check(source)) { wxRect* ptr; @@ -2313,6 +2331,11 @@ bool wxRect_helper(PyObject* source, wxRect** obj) { bool wxColour_helper(PyObject* source, wxColour** obj) { + if (source == Py_None) { + **obj = wxNullColour; + return True; + } + // If source is an object instance then it may already be the right type if (wxPySwigInstance_Check(source)) { wxColour* ptr; @@ -2378,6 +2401,12 @@ bool wxColour_typecheck(PyObject* source) { bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) { + + if (source == Py_None) { + **obj = wxPoint2D(-1,-1); + return True; + } + // If source is an object instance then it may already be the right type if (wxPySwigInstance_Check(source)) { wxPoint2D* ptr; -- 2.49.0