X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd512ba2864a4ddf82ef70caf7a5b107d34906c8..53663be8a5ea8e1c6f178839209b67e8228e4642:/wxPython/src/gdi.i?ds=sidebyside diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i index b5cee56b36..6905b8133e 100644 --- a/wxPython/src/gdi.i +++ b/wxPython/src/gdi.i @@ -34,6 +34,7 @@ %import misc.i %import fonts.i +%pragma(python) code = "import wx" //--------------------------------------------------------------------------- %{ @@ -56,6 +57,10 @@ public: //--------------------------------------------------------------------------- + +// TODO: When the API stabalizes and is available on other platforms, add +// wrappers for the new wxBitmap, wxRawBitmap, wxDIB stuff... + class wxBitmap : public wxGDIObject { public: @@ -67,6 +72,11 @@ public: bool LoadFile(const wxString& name, wxBitmapType type=wxBITMAP_TYPE_ANY); bool SaveFile(const wxString& name, wxBitmapType type, wxPalette* palette = NULL); void SetMask(wxMask* mask); + %pragma(python) addtoclass = " + def SetMaskColour(self, colour): + mask = wxMaskColour(self, colour) + self.SetMask(mask) + " #ifdef __WXMSW__ void SetPalette(wxPalette& palette); #endif @@ -95,14 +105,7 @@ public: void SetQuality(int q); #endif - %pragma(python) addtoclass = " - def __del__(self,gdic=gdic): - try: - if self.thisown == 1 : - gdic.delete_wxBitmap(self) - except: - pass -" + %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()" }; @@ -231,14 +234,7 @@ public: #endif void CopyFromBitmap(const wxBitmap& bmp); - %pragma(python) addtoclass = " - def __del__(self,gdic=gdic): - try: - if self.thisown == 1 : - gdic.delete_wxIcon(self) - except: - pass -" + %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()" }; @@ -308,9 +304,17 @@ public: class wxCursor : public wxGDIObject { public: -#ifdef __WXMSW__ - wxCursor(const wxString& cursorName, long flags, int hotSpotX=0, int hotSpotY=0); + %addmethods { + wxCursor(const wxString* cursorName, long flags, int hotSpotX=0, int hotSpotY=0) { +#ifdef __WXGTK__ + wxCHECK_MSG(FALSE, NULL, + wxT("wxCursor constructor not implemented for wxGTK, use wxStockCursor, wxCursorFromImage, or wxCursorFromBits instead.")); +#else + return new wxCursor(*cursorName, flags, hotSpotX, hotSpotY); #endif + } + } + ~wxCursor(); // wxGDIImage methods @@ -328,13 +332,35 @@ public: void SetDepth(int d); void SetSize(const wxSize& size); #endif + %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()" }; %name(wxStockCursor) %new wxCursor* wxPyStockCursor(int id); -%{ // Alternate 'constructor' +%new wxCursor* wxCursorFromImage(const wxImage& image); +%new wxCursor* wxCursorFromBits(PyObject* bits, int width, int height, + int hotSpotX=-1, int hotSpotY=-1, + PyObject* maskBits=0); + +%{ wxCursor* wxPyStockCursor(int id) { return new wxCursor(id); } + + wxCursor* wxCursorFromImage(const wxImage& image) { + return new wxCursor(image); + } + + wxCursor* wxCursorFromBits(PyObject* bits, int width, int height, + int hotSpotX=-1, int hotSpotY=-1, + PyObject* maskBits=0) { + char* bitsbuf; + char* maskbuf = NULL; + int length; + PyString_AsStringAndSize(bits, &bitsbuf, &length); + if (maskBits) + PyString_AsStringAndSize(maskBits, &maskbuf, &length); + return new wxCursor(bitsbuf, width, height, hotSpotX, hotSpotY, maskbuf); + } %} //---------------------------------------------------------------------- @@ -351,15 +377,45 @@ public: %addmethods { PyObject* Get() { PyObject* rv = PyTuple_New(3); - PyTuple_SetItem(rv, 0, PyInt_FromLong(self->Red())); - PyTuple_SetItem(rv, 1, PyInt_FromLong(self->Green())); - PyTuple_SetItem(rv, 2, PyInt_FromLong(self->Blue())); + int red = -1; + int green = -1; + int blue = -1; + if (self->Ok()) { + red = self->Red(); + green = self->Green(); + blue = self->Blue(); + } + PyTuple_SetItem(rv, 0, PyInt_FromLong(red)); + PyTuple_SetItem(rv, 1, PyInt_FromLong(green)); + PyTuple_SetItem(rv, 2, PyInt_FromLong(blue)); return rv; } + bool __eq__(PyObject* obj) { + wxColour tmp; + wxColour* ptr = &tmp; + if (obj == Py_None) return FALSE; + wxPyBLOCK_THREADS(bool success = wxColour_helper(obj, &ptr); PyErr_Clear()); + if (! success) return FALSE; + return *self == *ptr; + } + bool __ne__(PyObject* obj) { + wxColour tmp; + wxColour* ptr = &tmp; + if (obj == Py_None) return TRUE; + wxPyBLOCK_THREADS(bool success = wxColour_helper(obj, &ptr); PyErr_Clear()); + if (! success) return TRUE; + return *self != *ptr; + } } - %pragma(python) addtoclass = "asTuple = Get" - %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())" - %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())" + + %pragma(python) addtoclass = "asTuple = Get + def __str__(self): return str(self.asTuple()) + def __repr__(self): return 'wxColour:' + str(self.asTuple()) + def __nonzero__(self): return self.Ok() + def __getinitargs__(self): return () + def __getstate__(self): return self.asTuple() + def __setstate__(self, state): self.Set(*state) +" }; @@ -388,15 +444,15 @@ public: if ( !cName2.Replace(wxT("GRAY"), wxT("GREY")) ) cName2.clear(); - wxNode *node = self->First(); + wxNode *node = self->GetFirst(); while ( node ) { const wxChar *key = node->GetKeyString(); if ( cName == key || cName2 == key ) { - wxColour* c = (wxColour *)node->Data(); + wxColour* c = (wxColour *)node->GetData(); c->Set(red, green, blue); return; } - node = node->Next(); + node = node->GetNext(); } // otherwise append the new colour @@ -446,6 +502,8 @@ public: wxBitmap* GetStipple(); void SetStipple(wxBitmap& stipple); #endif + + %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()" }; @@ -519,6 +577,13 @@ public: void SetColour(wxColour &colour); void SetStipple(wxBitmap& bitmap); void SetStyle(int style); + +#ifdef __WXMAC__ + short GetMacTheme(); + void SetMacTheme(short macThemeBrush); +#endif + + %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()" }; @@ -535,34 +600,34 @@ public: //---------------------------------------------------------------------- - class wxDC : public wxObject { public: // wxDC(); **** abstract base class, can't instantiate. ~wxDC(); void BeginDrawing(); + // %name(BlitXY) - bool Blit(long xdest, long ydest, - long width, long height, - wxDC *source, long xsrc, long ysrc, + bool Blit(wxCoord xdest, wxCoord ydest, + wxCoord width, wxCoord height, + wxDC *source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, int useMask = FALSE); // bool Blit(const wxPoint& destPt, const wxSize& sz, // wxDC *source, const wxPoint& srcPt, // int logicalFunc = wxCOPY, int useMask = FALSE); void Clear(); - void CrossHair(long x, long y); + void CrossHair(wxCoord x, wxCoord y); void DestroyClippingRegion(); - long DeviceToLogicalX(long x); - long DeviceToLogicalXRel(long x); - long DeviceToLogicalY(long y); - long DeviceToLogicalYRel(long y); - void DrawArc(long x1, long y1, long x2, long y2, long xc, long yc); - void DrawCircle(long x, long y, long radius); - void DrawEllipse(long x, long y, long width, long height); - void DrawEllipticArc(long x, long y, long width, long height, long start, long end); - void DrawIcon(const wxIcon& icon, long x, long y); + wxCoord DeviceToLogicalX(wxCoord x); + wxCoord DeviceToLogicalXRel(wxCoord x); + wxCoord DeviceToLogicalY(wxCoord y); + wxCoord DeviceToLogicalYRel(wxCoord y); + void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc); + void DrawCircle(wxCoord x, wxCoord y, wxCoord radius); + void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); + void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxCoord start, wxCoord end); + void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); void DrawLabel(const wxString& text, const wxRect& rect, int alignment = wxALIGN_LEFT | wxALIGN_TOP, @@ -580,27 +645,27 @@ public: } } - void DrawLine(long x1, long y1, long x2, long y2); - void DrawLines(int PCOUNT, wxPoint* points, long xoffset=0, long yoffset=0); - void DrawPolygon(int PCOUNT, wxPoint* points, long xoffset=0, long yoffset=0, + void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); + void DrawLines(int PCOUNT, wxPoint* points, wxCoord xoffset=0, wxCoord yoffset=0); + void DrawPolygon(int PCOUNT, wxPoint* points, wxCoord xoffset=0, wxCoord yoffset=0, int fill_style=wxODDEVEN_RULE); - void DrawPoint(long x, long y); - void DrawRectangle(long x, long y, long width, long height); + void DrawPoint(wxCoord x, wxCoord y); + void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); %name(DrawRectangleRect)void DrawRectangle(const wxRect& rect); void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle); - void DrawRoundedRectangle(long x, long y, long width, long height, long radius=20); + void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxCoord radius=20); void DrawSpline(int PCOUNT, wxPoint* points); - void DrawText(const wxString& text, long x, long y); + void DrawText(const wxString& text, wxCoord x, wxCoord y); void EndDoc(); void EndDrawing(); void EndPage(); - bool FloodFill(long x, long y, const wxColour& colour, int style=wxFLOOD_SURFACE); + bool FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE); wxBrush GetBackground(); wxBrush GetBrush(); - long GetCharHeight(); - long GetCharWidth(); - void GetClippingBox(long *OUTPUT, long *OUTPUT, - long *OUTPUT, long *OUTPUT); + wxCoord GetCharHeight(); + wxCoord GetCharWidth(); + void GetClippingBox(wxCoord *OUTPUT, wxCoord *OUTPUT, + wxCoord *OUTPUT, wxCoord *OUTPUT); wxFont GetFont(); int GetLogicalFunction(); void GetLogicalScale(double *OUTPUT, double *OUTPUT); @@ -608,7 +673,7 @@ public: bool GetOptimization(); wxPen GetPen(); %addmethods { - %new wxColour* GetPixel(long x, long y) { + %new wxColour* GetPixel(wxCoord x, wxCoord y) { wxColour* wc = new wxColour(); self->GetPixel(x, y, wc); return wc; @@ -618,25 +683,27 @@ public: wxSize GetSize(); wxSize GetSizeMM(); wxColour GetTextBackground(); - void GetTextExtent(const wxString& string, long *OUTPUT, long *OUTPUT); + void GetTextExtent(const wxString& string, wxCoord *OUTPUT, wxCoord *OUTPUT); %name(GetFullTextExtent)void GetTextExtent(const wxString& string, - long *OUTPUT, long *OUTPUT, long *OUTPUT, long* OUTPUT, + wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord* OUTPUT, const wxFont* font = NULL); + void GetMultiLineTextExtent(const wxString& text, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, + wxFont *font = NULL); wxColour GetTextForeground(); void GetUserScale(double *OUTPUT, double *OUTPUT); - long LogicalToDeviceX(long x); - long LogicalToDeviceXRel(long x); - long LogicalToDeviceY(long y); - long LogicalToDeviceYRel(long y); - long MaxX(); - long MaxY(); - long MinX(); - long MinY(); + wxCoord LogicalToDeviceX(wxCoord x); + wxCoord LogicalToDeviceXRel(wxCoord x); + wxCoord LogicalToDeviceY(wxCoord y); + wxCoord LogicalToDeviceYRel(wxCoord y); + wxCoord MaxX(); + wxCoord MaxY(); + wxCoord MinX(); + wxCoord MinY(); bool Ok(); - void SetDeviceOrigin(long x, long y); + void SetDeviceOrigin(wxCoord x, wxCoord y); void SetBackground(const wxBrush& brush); void SetBackgroundMode(int mode); - void SetClippingRegion(long x, long y, long width, long height); + void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); %name(SetClippingRegionAsRegion) void SetClippingRegion(const wxRegion& region); %name(SetClippingRect) void SetClippingRegion(const wxRect& rect); void SetPalette(const wxPalette& colourMap); @@ -655,7 +722,7 @@ public: - void DrawBitmap(const wxBitmap& bitmap, long x, long y, + void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, int useMask = FALSE); bool CanDrawBitmap(); @@ -676,197 +743,46 @@ public: // See below for implementation } + %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()" + #ifdef __WXMSW__ long GetHDC(); #endif - %addmethods { - // NOTE: These methods are VERY SIMILAR in implentation. It would be - // nice to factor out common code and or turn them into a set of - // template-like macros. - - // Draw a point for every set of coordinants in pyPoints, optionally - // setting a new pen for each - PyObject* _DrawPointList(PyObject* pyPoints, PyObject* pyPens) { - wxPyBeginBlockThreads(); - - bool isFastSeq = PyList_Check(pyPoints) || PyTuple_Check(pyPoints); - bool isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens); - int numObjs = 0; - int numPens = 0; - wxPen* pen; - PyObject* obj; - int x1, y1; - int i = 0; - PyObject* retval; - - if (!PySequence_Check(pyPoints)) { - goto err0; - } - if (!PySequence_Check(pyPens)) { - goto err1; - } - numObjs = PySequence_Length(pyPoints); - numPens = PySequence_Length(pyPens); - - for (i = 0; i < numObjs; i++) { - // Use a new pen? - if (i < numPens) { - if (isFastPens) { - obj = PySequence_Fast_GET_ITEM(pyPens, i); - } - else { - obj = PySequence_GetItem(pyPens, i); - } - if (SWIG_GetPtrObj(obj, (void **) &pen, "_wxPen_p")) { - if (!isFastPens) - Py_DECREF(obj); - goto err1; - } - - self->SetPen(*pen); - if (!isFastPens) - Py_DECREF(obj); - } - - // Get the point coordinants - if (isFastSeq) { - obj = PySequence_Fast_GET_ITEM(pyPoints, i); - } - else { - obj = PySequence_GetItem(pyPoints, i); - } - if (! _2int_seq_helper(obj, &x1, &y1)) { - if (!isFastPens) - Py_DECREF(obj); - goto err0; - } - if (PyErr_Occurred()) { - retval = NULL; - if (!isFastPens) - Py_DECREF(obj); - goto exit; - } - - - // Now draw the point - self->DrawPoint(x1, y1); + %addmethods { // See drawlist.cpp for impplementaion of these... - if (!isFastSeq) - Py_DECREF(obj); - } - - Py_INCREF(Py_None); - retval = Py_None; - goto exit; - - err1: - PyErr_SetString(PyExc_TypeError, "Expected a sequence of wxPens"); - retval = NULL; - goto exit; - err0: - PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x,y) sequences."); - retval = NULL; - goto exit; - - exit: - wxPyEndBlockThreads(); - return retval; + PyObject* _DrawPointList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes) + { + return wxPyDrawXXXList(*self, wxPyDrawXXXPoint, pyCoords, pyPens, pyBrushes); } + PyObject* _DrawLineList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes) + { + return wxPyDrawXXXList(*self, wxPyDrawXXXLine, pyCoords, pyPens, pyBrushes); + } - // Draw a line for every set of coordinants in pyLines, optionally - // setting a new pen for each - PyObject* _DrawLineList(PyObject* pyLines, PyObject* pyPens) { - wxPyBeginBlockThreads(); - - bool isFastSeq = PyList_Check(pyLines) || PyTuple_Check(pyLines); - bool isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens); - int numObjs = 0; - int numPens = 0; - wxPen* pen; - PyObject* obj; - int x1, y1, x2, y2; - int i = 0; - PyObject* retval; - - if (!PySequence_Check(pyLines)) { - goto err0; - } - if (!PySequence_Check(pyPens)) { - goto err1; - } - numObjs = PySequence_Length(pyLines); - numPens = PySequence_Length(pyPens); - - for (i = 0; i < numObjs; i++) { - // Use a new pen? - if (i < numPens) { - if (isFastPens) { - obj = PySequence_Fast_GET_ITEM(pyPens, i); - } - else { - obj = PySequence_GetItem(pyPens, i); - } - if (SWIG_GetPtrObj(obj, (void **) &pen, "_wxPen_p")) { - if (!isFastPens) - Py_DECREF(obj); - goto err1; - } - - self->SetPen(*pen); - if (!isFastPens) - Py_DECREF(obj); - } - - // Get the line coordinants - if (isFastSeq) { - obj = PySequence_Fast_GET_ITEM(pyLines, i); - } - else { - obj = PySequence_GetItem(pyLines, i); - } - if (! _4int_seq_helper(obj, &x1, &y1, &x2, &y2)) { - if (!isFastPens) - Py_DECREF(obj); - goto err0; - } - if (PyErr_Occurred()) { - retval = NULL; - if (!isFastPens) - Py_DECREF(obj); - goto exit; - } - - // Now draw the line - self->DrawLine(x1, y1, x2, y2); - - if (!isFastSeq) - Py_DECREF(obj); - } - - Py_INCREF(Py_None); - retval = Py_None; - goto exit; + PyObject* _DrawRectangleList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes) + { + return wxPyDrawXXXList(*self, wxPyDrawXXXRectangle, pyCoords, pyPens, pyBrushes); + } - err1: - PyErr_SetString(PyExc_TypeError, "Expected a sequence of wxPens"); - retval = NULL; - goto exit; + PyObject* _DrawEllipseList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes) + { + return wxPyDrawXXXList(*self, wxPyDrawXXXEllipse, pyCoords, pyPens, pyBrushes); + } - err0: - PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x1,y1, x2,y2) sequences."); - retval = NULL; - goto exit; + PyObject* _DrawPolygonList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes) + { + return wxPyDrawXXXList(*self, wxPyDrawXXXPolygon, pyCoords, pyPens, pyBrushes); + } - exit: - wxPyEndBlockThreads(); - return retval; + PyObject* _DrawTextList(PyObject* textList, PyObject* pyPoints, + PyObject* foregroundList, PyObject* backgroundList) { + return wxPyDrawTextList(*self, textList, pyPoints, foregroundList, backgroundList); } } - %pragma(python) addtoclass = " def DrawPointList(self, points, pens=None): if pens is None: @@ -875,7 +791,8 @@ public: pens = [pens] elif len(pens) != len(points): raise ValueError('points and pens must have same length') - return self._DrawPointList(points, pens) + return self._DrawPointList(points, pens, []) + def DrawLineList(self, lines, pens=None): if pens is None: @@ -884,7 +801,83 @@ public: pens = [pens] elif len(pens) != len(lines): raise ValueError('lines and pens must have same length') - return self._DrawLineList(lines, pens) + return self._DrawLineList(lines, pens, []) + + + def DrawRectangleList(self, rectangles, pens=None, brushes=None): + if pens is None: + pens = [] + elif isinstance(pens, wxPenPtr): + pens = [pens] + elif len(pens) != len(rectangles): + raise ValueError('rectangles and pens must have same length') + if brushes is None: + brushes = [] + elif isinstance(brushes, wxBrushPtr): + brushes = [brushes] + elif len(brushes) != len(rectangles): + raise ValueError('rectangles and brushes must have same length') + return self._DrawRectangleList(rectangles, pens, brushes) + + + def DrawEllipseList(self, ellipses, pens=None, brushes=None): + if pens is None: + pens = [] + elif isinstance(pens, wxPenPtr): + pens = [pens] + elif len(pens) != len(ellipses): + raise ValueError('ellipses and pens must have same length') + if brushes is None: + brushes = [] + elif isinstance(brushes, wxBrushPtr): + brushes = [brushes] + elif len(brushes) != len(ellipses): + raise ValueError('ellipses and brushes must have same length') + return self._DrawEllipseList(ellipses, pens, brushes) + + + def DrawPolygonList(self, polygons, pens=None, brushes=None): + ## Note: This does not currently support fill style or offset + ## you can always use the non-List version if need be. + ## I really would like to support fill-style, however, + ## but wxODDEVEN_RULE does not appear to be defined at the Python level + ## [It's in wx.py... --Robin] + if pens is None: + pens = [] + elif isinstance(pens, wxPenPtr): + pens = [pens] + elif len(pens) != len(polygons): + raise ValueError('polygons and pens must have same length') + if brushes is None: + brushes = [] + elif isinstance(brushes, wxBrushPtr): + brushes = [brushes] + elif len(brushes) != len(polygons): + raise ValueError('polygons and brushes must have same length') + return self._DrawPolygonList(polygons, pens, brushes) + + + def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None): + ## NOTE: this does not currently support changing the font + ## Make sure you set Background mode to wxSolid (DC.SetBackgroundMode) + ## If you want backgounds to do anything. + if type(textList) == type(''): + textList = [textList] + elif len(textList) != len(coords): + raise ValueError('textlist and coords must have same length') + if foregrounds is None: + foregrounds = [] + elif isinstance(foregrounds, wxColourPtr): + foregrounds = [foregrounds] + elif len(foregrounds) != len(coords): + raise ValueError('foregrounds and coords must have same length') + if backgrounds is None: + backgrounds = [] + elif isinstance(backgrounds, wxColourPtr): + backgrounds = [backgrounds] + elif len(backgrounds) != len(coords): + raise ValueError('backgrounds and coords must have same length') + return self._DrawTextList(textList, coords, foregrounds, backgrounds) " @@ -1006,6 +999,7 @@ public: const wxString& GetFileName() const { return m_filename; } + %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()" }; // bool wxMakeMetaFilePlaceable(const wxString& filename, @@ -1032,6 +1026,8 @@ public: int GetPixel(byte red, byte green, byte blue); bool GetRGB(int pixel, byte* OUTPUT, byte* OUTPUT, byte* OUTPUT); bool Ok(); + + %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()" }; //--------------------------------------------------------------------------- @@ -1082,41 +1078,57 @@ enum wxRegionContain { class wxRegion : public wxGDIObject { public: - wxRegion(long x=0, long y=0, long width=0, long height=0); + wxRegion(wxCoord x=0, wxCoord y=0, wxCoord width=0, wxCoord height=0); #ifndef __WXMAC__ %name(wxRegionFromPoints)wxRegion(int PCOUNT, wxPoint* points, int fillStyle = wxWINDING_RULE); #endif + %name(wxRegionFromBitmap)wxRegion(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); ~wxRegion(); + void Clear(); #ifndef __WXMAC__ bool Offset(wxCoord x, wxCoord y); #endif - wxRegionContain Contains(long x, long y); + wxRegionContain Contains(wxCoord x, wxCoord y); %name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt); %name(ContainsRect)wxRegionContain Contains(const wxRect& rect); - %name(ContainsRectDim)wxRegionContain Contains(long x, long y, long w, long h); + %name(ContainsRectDim)wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h); wxRect GetBox(); - bool Intersect(long x, long y, long width, long height); + bool Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord height); %name(IntersectRect)bool Intersect(const wxRect& rect); %name(IntersectRegion)bool Intersect(const wxRegion& region); bool IsEmpty(); - bool Union(long x, long y, long width, long height); + bool Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height); %name(UnionRect)bool Union(const wxRect& rect); %name(UnionRegion)bool Union(const wxRegion& region); - bool Subtract(long x, long y, long width, long height); + bool Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord height); %name(SubtractRect)bool Subtract(const wxRect& rect); %name(SubtractRegion)bool Subtract(const wxRegion& region); - bool Xor(long x, long y, long width, long height); + bool Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height); %name(XorRect)bool Xor(const wxRect& rect); %name(XorRegion)bool Xor(const wxRegion& region); + + // Convert the region to a B&W bitmap with the white pixels being inside + // the region. + wxBitmap ConvertToBitmap(); + + // Use the non-transparent pixels of a wxBitmap for the region to combine + // with this region. If the bitmap has a mask then it will be used, + // otherwise the colour to be treated as transparent may be specified, + // along with an optional tolerance value. + %name(UnionBitmap)bool Union(const wxBitmap& bmp, + const wxColour& transColour = wxNullColour, + int tolerance = 0); }; @@ -1126,12 +1138,12 @@ public: wxRegionIterator(const wxRegion& region); ~wxRegionIterator(); - long GetX(); - long GetY(); - long GetW(); - long GetWidth(); - long GetH(); - long GetHeight(); + wxCoord GetX(); + wxCoord GetY(); + wxCoord GetW(); + wxCoord GetWidth(); + wxCoord GetH(); + wxCoord GetHeight(); wxRect GetRect(); bool HaveRects(); void Reset(); @@ -1146,6 +1158,7 @@ public: //--------------------------------------------------------------------------- + %readonly %{ #if 0