diff --git a/wxPython/include/wx/wxPython/wxPython.h b/wxPython/include/wx/wxPython/wxPython.h index efdb2e0df4..be46badb21 100644 --- a/wxPython/include/wx/wxPython/wxPython.h +++ b/wxPython/include/wx/wxPython/wxPython.h @@ -121,6 +121,7 @@ inline wxPyCoreAPI* wxPyGetCoreAPIPtr() #define wxArrayDouble2PyList_helper(a) (wxPyGetCoreAPIPtr()->p_wxArrayDoublePyList_helper(a)) #define wxPoint2D_LIST_helper(a,b) (wxPyGetCoreAPIPtr()->p_wxPoint2D_LIST_helper(a, b)) +#define wxRect2D_helper(a,b) (wxPyGetCoreAPIPtr()->p_wxRect2D_helper(a,b)) //---------------------------------------------------------------------- diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h index 863f5c0f68..3cfbdbbf74 100644 --- a/wxPython/include/wx/wxPython/wxPython_int.h +++ b/wxPython/include/wx/wxPython/wxPython_int.h @@ -107,6 +107,7 @@ typedef unsigned char byte; typedef unsigned char* buffer; typedef wxPoint2DDouble wxPoint2D; +typedef wxRect2DDouble wxRect2D; #ifndef SWIG_TYPE_TABLE #define SWIG_TYPE_TABLE wxPython_type_table @@ -247,6 +248,7 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj); bool wxRect_helper(PyObject* source, wxRect** obj); bool wxColour_helper(PyObject* source, wxColour** obj); bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj); +bool wxRect2D_helper(PyObject* source, wxRect2D** obj); bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen); @@ -392,7 +394,7 @@ struct wxPyCoreAPI { bool (*p_wxRealPoint_helper)(PyObject* source, wxRealPoint** obj); bool (*p_wxRect_helper)(PyObject* source, wxRect** obj); bool (*p_wxColour_helper)(PyObject* source, wxColour** obj); - bool (*p_wxPoint2D_helper)(PyObject* source, wxPoint2DDouble** obj); + bool (*p_wxPoint2D_helper)(PyObject* source, wxPoint2D** obj); bool (*p_wxPySimple_typecheck)(PyObject* source, const wxChar* classname, int seqLen); @@ -427,6 +429,8 @@ struct wxPyCoreAPI { // Add all new items at the end... PyObject* (*p_wxArrayDoublePyList_helper)(const wxArrayDouble& arr); wxPoint2D* (*p_wxPoint2D_LIST_helper)(PyObject* source, size_t* npoints); + bool (*p_wxRect2D_helper)(PyObject* source, wxRect2D** obj); + }; diff --git a/wxPython/src/_core_api.i b/wxPython/src/_core_api.i index 94050287b9..9fcad55a74 100644 --- a/wxPython/src/_core_api.i +++ b/wxPython/src/_core_api.i @@ -238,7 +238,9 @@ static wxPyCoreAPI API = { wxPyCheckForApp, wxArrayDouble2PyList_helper, - wxPoint2D_LIST_helper + wxPoint2D_LIST_helper, + wxRect2D_helper, + }; #endif diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i index b887d2e0aa..d57c92d225 100644 --- a/wxPython/src/_gdicmn.i +++ b/wxPython/src/_gdicmn.i @@ -17,6 +17,11 @@ %newgroup +// Turn off the aquisition of the Global Interpreter Lock for the classes and +// functions in this file +%threadWrapperOff + + enum wxBitmapType { wxBITMAP_TYPE_INVALID, // should be == 0 for compatibility! @@ -132,7 +137,7 @@ public: %extend { - KeepGIL(__eq__); + //KeepGIL(__eq__); DocStr(__eq__, "Test for equality of wx.Size objects.", ""); bool __eq__(PyObject* other) { wxSize temp, *obj = &temp; @@ -145,7 +150,7 @@ public: } - KeepGIL(__ne__); + //KeepGIL(__ne__); DocStr(__ne__, "Test for inequality of wx.Size objects.", ""); bool __ne__(PyObject* other) { wxSize temp, *obj = &temp; @@ -225,11 +230,11 @@ of this object (i.e. equal to -1) with those of the other.", ""); "Get() -> (width,height)", "Returns the width and height properties as a tuple.", ""); PyObject* Get() { - wxPyBlock_t blocked = wxPyBeginBlockThreads(); + //wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); - wxPyEndBlockThreads(blocked); + //wxPyEndBlockThreads(blocked); return tup; } } @@ -270,7 +275,7 @@ public: ~wxRealPoint(); %extend { - KeepGIL(__eq__); + //KeepGIL(__eq__); DocStr(__eq__, "Test for equality of wx.RealPoint objects.", ""); bool __eq__(PyObject* other) { wxRealPoint temp, *obj = &temp; @@ -283,7 +288,7 @@ public: } - KeepGIL(__ne__); + //KeepGIL(__ne__); DocStr(__ne__, "Test for inequality of wx.RealPoint objects.", ""); bool __ne__(PyObject* other) { wxRealPoint temp, *obj = &temp; @@ -317,11 +322,11 @@ public: "Get() -> (x,y)", "Return the x and y properties as a tuple. ", ""); PyObject* Get() { - wxPyBlock_t blocked = wxPyBeginBlockThreads(); + //wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x)); PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y)); - wxPyEndBlockThreads(blocked); + //PyEndBlockThreads(blocked); return tup; } } @@ -365,7 +370,7 @@ public: %extend { - KeepGIL(__eq__); + //KeepGIL(__eq__); DocStr(__eq__, "Test for equality of wx.Point objects.", ""); bool __eq__(PyObject* other) { wxPoint temp, *obj = &temp; @@ -378,7 +383,7 @@ public: } - KeepGIL(__ne__); + //KeepGIL(__ne__); DocStr(__ne__, "Test for inequality of wx.Point objects.", ""); bool __ne__(PyObject* other) { wxPoint temp, *obj = &temp; @@ -448,11 +453,11 @@ public: "Get() -> (x,y)", "Return the x and y properties as a tuple. ", ""); PyObject* Get() { - wxPyBlock_t blocked = wxPyBeginBlockThreads(); + //wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); - wxPyEndBlockThreads(blocked); + //wxPyEndBlockThreads(blocked); return tup; } } @@ -651,7 +656,7 @@ bottom, otherwise it is moved to the left or top respectively.", "", "Add the properties of rect to this rectangle, updating this rectangle.", ""); %extend { - KeepGIL(__eq__); + //KeepGIL(__eq__); DocStr(__eq__, "Test for equality of wx.Rect objects.", ""); bool __eq__(PyObject* other) { wxRect temp, *obj = &temp; @@ -664,7 +669,7 @@ bottom, otherwise it is moved to the left or top respectively.", "", } - KeepGIL(__ne__); + //KeepGIL(__ne__); DocStr(__ne__, "Test for inequality of wx.Rect objects.", ""); bool __ne__(PyObject* other) { wxRect temp, *obj = &temp; @@ -724,13 +729,13 @@ usually, but not necessarily, the larger one.", ""); "Get() -> (x,y,width,height)", "Return the rectangle properties as a tuple.", ""); PyObject* Get() { - wxPyBlock_t blocked = wxPyBeginBlockThreads(); + //wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(4); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); PyTuple_SET_ITEM(tup, 2, PyInt_FromLong(self->width)); PyTuple_SET_ITEM(tup, 3, PyInt_FromLong(self->height)); - wxPyEndBlockThreads(blocked); + //wxPyEndBlockThreads(blocked); return tup; } } @@ -788,10 +793,10 @@ DocAStr(wxIntersectRect, dest = reg1.GetBox(); if (dest != wxRect(0,0,0,0)) { - wxPyBlock_t blocked = wxPyBeginBlockThreads(); + //wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxRect* newRect = new wxRect(dest); obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), true); - wxPyEndBlockThreads(blocked); + //wxPyEndBlockThreads(blocked); return obj; } Py_INCREF(Py_None); @@ -858,7 +863,7 @@ public: wxPoint2D& operator/=(const wxPoint2D& pt); %extend { - KeepGIL(__eq__); + //KeepGIL(__eq__); DocStr(__eq__, "Test for equality of wx.Point2D objects.", ""); bool __eq__(PyObject* other) { wxPoint2D temp, *obj = &temp; @@ -871,7 +876,7 @@ public: } - KeepGIL(__ne__); + //KeepGIL(__ne__); DocStr(__ne__, "Test for inequality of wx.Point2D objects.", ""); bool __ne__(PyObject* other) { wxPoint2D temp, *obj = &temp; @@ -897,11 +902,11 @@ public: "Get() -> (x,y)", "Return x and y properties as a tuple.", ""); PyObject* Get() { - wxPyBlock_t blocked = wxPyBeginBlockThreads(); + //wxPyBlock_t blocked = 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(blocked); + //wxPyEndBlockThreads(blocked); return tup; } } @@ -929,6 +934,177 @@ public: }; +//--------------------------------------------------------------------------- +%newgroup + + +enum wxOutCode +{ + wxInside = 0x00 , + wxOutLeft = 0x01 , + wxOutRight = 0x02 , + wxOutTop = 0x08 , + wxOutBottom = 0x04 +}; + + +DocStr(wxRect2D, + "wx.Rect2D is a rectangle, with position and size, in a 2D coordinate system +with floating point component values.", ""); + +class wxRect2D +{ +public: + wxRect2D(wxDouble x=0.0, wxDouble y=0.0, wxDouble w=0.0, wxDouble h=0.0); + + ~wxRect2D(); + + wxPoint2D GetPosition(); + wxSize GetSize(); + + // for the edge and corner accessors there are two setters conterparts, + // the Set.. functions keep the other corners at their position whenever + // sensible, the Move.. functions keep the size of the rect and move the + // other corners apropriately + + wxDouble GetLeft() const; + void SetLeft( wxDouble n ); + void MoveLeftTo( wxDouble n ); + wxDouble GetTop() const; + void SetTop( wxDouble n ); + void MoveTopTo( wxDouble n ); + wxDouble GetBottom() const; + void SetBottom( wxDouble n ); + void MoveBottomTo( wxDouble n ); + wxDouble GetRight() const; + void SetRight( wxDouble n ); + void MoveRightTo( wxDouble n ); + + wxPoint2D GetLeftTop() const; + void SetLeftTop( const wxPoint2D &pt ); + void MoveLeftTopTo( const wxPoint2D &pt ); + wxPoint2D GetLeftBottom() const; + void SetLeftBottom( const wxPoint2D &pt ); + void MoveLeftBottomTo( const wxPoint2D &pt ); + wxPoint2D GetRightTop() const; + void SetRightTop( const wxPoint2D &pt ); + void MoveRightTopTo( const wxPoint2D &pt ); + wxPoint2D GetRightBottom() const; + void SetRightBottom( const wxPoint2D &pt ); + void MoveRightBottomTo( const wxPoint2D &pt ); + wxPoint2D GetCentre() const; + void SetCentre( const wxPoint2D &pt ); + void MoveCentreTo( const wxPoint2D &pt ); + wxOutCode GetOutcode(const wxPoint2D &pt) const; + bool Contains( const wxPoint2D &pt ) const; + %Rename(ContainsRect, bool , Contains( const wxRect2D &rect ) const); + bool IsEmpty() const; + bool HaveEqualSize( const wxRect2D &rect ) const; + + %nokwargs Inset; + void Inset( wxDouble x , wxDouble y ); + void Inset( wxDouble left , wxDouble top ,wxDouble right , wxDouble bottom ); + void Offset( const wxPoint2D &pt ); + + void ConstrainTo( const wxRect2D &rect ); + + wxPoint2D Interpolate( wxInt32 widthfactor , wxInt32 heightfactor ); + + //static void Intersect( const wxRect2D &src1 , const wxRect2D &src2 , wxRect2D *dest ); + + void Intersect( const wxRect2D &otherRect ); + wxRect2D CreateIntersection( const wxRect2D &otherRect ) const; + bool Intersects( const wxRect2D &rect ) const; + + // static void Union( const wxRect2D &src1 , const wxRect2D &src2 , wxRect2D *dest ); + + void Union( const wxRect2D &otherRect ); + //void Union( const wxPoint2D &pt ); + + wxRect2D CreateUnion( const wxRect2D &otherRect ) const; + + %nokwargs Scale; + void Scale( wxDouble f ); + void Scale( int num , int denum ); + + //wxRect2D& operator = (const wxRect2D& rect); + //bool operator == (const wxRect2D& rect) const; + //bool operator != (const wxRect2D& rect) const; + + %extend { + //KeepGIL(__eq__); + DocStr(__eq__, "Test for equality of wx.Rect2D objects.", ""); + bool __eq__(PyObject* other) { + wxRect2D temp, *obj = &temp; + if ( other == Py_None ) return false; + if ( ! wxRect2D_helper(other, &obj) ) { + PyErr_Clear(); + return false; + } + return self->operator==(*obj); + } + + + //KeepGIL(__ne__); + DocStr(__ne__, "Test for inequality of wx.Rect2D objects.", ""); + bool __ne__(PyObject* other) { + wxRect2D temp, *obj = &temp; + if ( other == Py_None ) return true; + if ( ! wxRect2D_helper(other, &obj)) { + PyErr_Clear(); + return true; + } + return self->operator!=(*obj); + } + } + + + %Rename(x, wxDouble , m_x); + %Rename(y, wxDouble , m_y); + %Rename(width, wxDouble , m_width); + %Rename(height, wxDouble , m_height); + + %extend { + void Set( wxDouble x=0 , wxDouble y=0, wxDouble width=0, wxDouble height=0 ) { + self->m_x = x; + self->m_y = y; + self->m_width = width; + self->m_height = height; + } + + DocAStr(Get, + "Get() -> (x,y, width, height)", + "Return x, y, width and height y properties as a tuple.", ""); + PyObject* Get() { + //wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyObject* tup = PyTuple_New(4); + PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->m_x)); + PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->m_y)); + PyTuple_SET_ITEM(tup, 2, PyFloat_FromDouble(self->m_width)); + PyTuple_SET_ITEM(tup, 3, PyFloat_FromDouble(self->m_height)); + //wxPyEndBlockThreads(blocked); + return tup; + } + } + + %pythoncode { + def __str__(self): return str(self.Get()) + def __repr__(self): return 'wx.Rect2D'+str(self.Get()) + def __len__(self): return len(self.Get()) + def __getitem__(self, index): return self.Get()[index] + def __setitem__(self, index, val): + if index == 0: self.x = val + elif index == 1: self.y = val + elif index == 2: self.width = val + elif index == 3: self.height = val + else: raise IndexError + def __nonzero__(self): return self.Get() != (0.0, 0.0, 0.0, 0.0) + __safe_for_unpickling__ = True + def __reduce__(self): return (wx.Rect2D, self.Get()) + } + +}; + //--------------------------------------------------------------------------- %immutable; @@ -937,3 +1113,6 @@ const wxSize wxDefaultSize; %mutable; //--------------------------------------------------------------------------- + +// Turn GIL acquisition back on. +%threadWrapperOn diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index 07c2808dc4..5497d2f5b1 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -2729,7 +2729,52 @@ bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) { return true; } error: - PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxPoint2D object."); + PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wx.Point2D object."); + return false; +} + + + +bool wxRect2D_helper(PyObject* source, wxRect2D** obj) { + + if (source == Py_None) { + **obj = wxRect2D(-1,-1,-1,-1); + return true; + } + + // If source is an object instance then it may already be the right type + if (wxPySwigInstance_Check(source)) { + wxRect2D* ptr; + if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRect2D"))) + goto error; + *obj = ptr; + return true; + } + // otherwise a length-4 sequence of floats is expected + if (PySequence_Check(source) && PySequence_Length(source) == 4) { + PyObject* o1 = PySequence_GetItem(source, 0); + PyObject* o2 = PySequence_GetItem(source, 1); + PyObject* o3 = PySequence_GetItem(source, 2); + PyObject* o4 = PySequence_GetItem(source, 3); + // This should really check for floats, not numbers -- but that would break code. + if (!PyNumber_Check(o1) || !PyNumber_Check(o2) || + !PyNumber_Check(o3) || !PyNumber_Check(o4)) { + Py_DECREF(o1); + Py_DECREF(o2); + Py_DECREF(o3); + Py_DECREF(o4); + goto error; + } + **obj = wxRect2D(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2), + PyFloat_AsDouble(o3), PyFloat_AsDouble(o4)); + Py_DECREF(o1); + Py_DECREF(o2); + Py_DECREF(o3); + Py_DECREF(o4); + return true; + } + error: + PyErr_SetString(PyExc_TypeError, "Expected a 4-tuple of floats or a wx.Rect2D object."); return false; }