Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the equality and inequality operators for some of the basic

Browse Source 
data types (wx.Point, wx.Size, wx.Colour, etc.) to no longer raise a
TypeError if the compared object is not compatible, but to just return
a boolean as expected.  For example::

	  wx.Colour(64,0,64) == 123      ==> False


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-03-31 23:29:39 +00:00
parent 8948306f78
commit 1fce4e9668
5 changed files with 245 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
wxPython/src/_gbsizer.i
View File

@@ -80,14 +80,35 @@ public:
void SetRow(int row);
void SetCol(int col);
// %extend {
// bool __eq__(const wxGBPosition* other) { return other ? (*self == *other) : false; }
// bool __ne__(const wxGBPosition* other) { return other ? (*self != *other) : true; }
// }
bool operator==(const wxGBPosition& other);
bool operator!=(const wxGBPosition& other);
%extend {
KeepGIL(__eq__);
DocStr(__eq__, "Compare GBPosition for equality.", "");
bool __eq__(PyObject* other) {
wxGBPosition temp, *obj = &temp;
if ( other == Py_None ) return false;
if ( ! wxGBPosition_helper(other, &obj) ) {
PyErr_Clear();
return false;
}
return self->operator==(*obj);
}
KeepGIL(__ne__);
DocStr(__ne__, "Compare GBPosition for inequality.", "");
bool __ne__(PyObject* other) {
wxGBPosition temp, *obj = &temp;
if ( other == Py_None ) return true;
if ( ! wxGBPosition_helper(other, &obj)) {
PyErr_Clear();
return true;
}
return self->operator!=(*obj);
}
}
%extend {
void Set(int row=0, int col=0) {
self->SetRow(row);
@@ -150,14 +171,35 @@ cell in each direction.", "");
int GetColspan() const;
void SetRowspan(int rowspan);
void SetColspan(int colspan);
// %extend {
// bool __eq__(const wxGBSpan* other) { return other ? (*self == *other) : false; }
// bool __ne__(const wxGBSpan* other) { return other ? (*self != *other) : true; }
// }
bool operator==(const wxGBSpan& other);
bool operator!=(const wxGBSpan& other);
%extend {
KeepGIL(__eq__);
DocStr(__eq__, "Compare wxGBSpan for equality.", "");
bool __eq__(PyObject* other) {
wxGBSpan temp, *obj = &temp;
if ( other == Py_None ) return false;
if ( ! wxGBSpan_helper(other, &obj) ) {
PyErr_Clear();
return false;
}
return self->operator==(*obj);
}
KeepGIL(__ne__);
DocStr(__ne__, "Compare GBSpan for inequality.", "");
bool __ne__(PyObject* other) {
wxGBSpan temp, *obj = &temp;
if ( other == Py_None ) return true;
if ( ! wxGBSpan_helper(other, &obj)) {
PyErr_Clear();
return true;
}
return self->operator!=(*obj);
}
}
%extend {
void Set(int rowspan=1, int colspan=1) {