X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48a0c02123fe4f3744856ad4857d1268f1f88377..4fe9ce473e437ce22f11459dff47b58e66765c2a:/wxPython/src/mac/_gdi.py?ds=sidebyside diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index fb70ed338f..a869be86ea 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -2316,12 +2316,12 @@ class FontEnumerator(object): def __init__(self, *args, **kwargs): """__init__(self) -> FontEnumerator""" _gdi_.FontEnumerator_swiginit(self,_gdi_.new_FontEnumerator(*args, **kwargs)) - self._setCallbackInfo(self, FontEnumerator, 0) + FontEnumerator._setCallbackInfo(self, self, FontEnumerator) __swig_destroy__ = _gdi_.delete_FontEnumerator __del__ = lambda self : None; def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(self, PyObject self, PyObject _class, bool incref)""" + """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=0)""" return _gdi_.FontEnumerator__setCallbackInfo(*args, **kwargs) def EnumerateFacenames(*args, **kwargs): @@ -2783,7 +2783,7 @@ class PyLocale(Locale): def __init__(self, *args, **kwargs): """__init__(self, int language=-1, int flags=wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING) -> PyLocale""" _gdi_.PyLocale_swiginit(self,_gdi_.new_PyLocale(*args, **kwargs)) - self._setCallbackInfo(self, PyLocale) + PyLocale._setCallbackInfo(self, self, PyLocale) __swig_destroy__ = _gdi_.delete_PyLocale __del__ = lambda self : None; @@ -4729,7 +4729,11 @@ class BufferedDC(MemoryDC): Constructs a buffered DC. """ _gdi_.BufferedDC_swiginit(self,_gdi_.new_BufferedDC(*args)) - self.__dc = args[0] # save a ref so the other dc will not be deleted before self + # save a ref so the other dc will not be deleted before self + self.__dc = args[0] + # also save a ref to the bitmap + if len(args) > 1: self.__bmp = args[1] + __swig_destroy__ = _gdi_.delete_BufferedDC __del__ = lambda self : None; @@ -4786,6 +4790,8 @@ class BufferedPaintDC(BufferedDC): window is automatically used). """ _gdi_.BufferedPaintDC_swiginit(self,_gdi_.new_BufferedPaintDC(*args, **kwargs)) + if len(args) > 1: self.__bmp = args[1] + _gdi_.BufferedPaintDC_swigregister(BufferedPaintDC) #--------------------------------------------------------------------------- @@ -5122,6 +5128,14 @@ class GraphicsMatrix(GraphicsObject): """ return _gdi_.GraphicsMatrix_Set(*args, **kwargs) + def Get(*args, **kwargs): + """ + Get(self) --> (a, b, c, d, tx, ty) + + Gets the component values of the matrix and returns them as a tuple. + """ + return _gdi_.GraphicsMatrix_Get(*args, **kwargs) + def Invert(*args, **kwargs): """ Invert(self) @@ -5354,7 +5368,7 @@ class GraphicsPath(GraphicsObject): def GetBox(*args, **kwargs): """ - GetBox(self) -> wxRect2DDouble + GetBox(self) -> Rect2D Gets the bounding box enclosing all points (possibly including control points) """ @@ -5363,7 +5377,7 @@ class GraphicsPath(GraphicsObject): def Contains(*args): """ Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool - Contains(self, wxPoint2DDouble c, int fillStyle=ODDEVEN_RULE) -> bool + Contains(self, Point2D c, int fillStyle=ODDEVEN_RULE) -> bool Returns ``True`` if the point is within the path. """ @@ -5539,6 +5553,22 @@ class GraphicsContext(GraphicsObject): """ return _gdi_.GraphicsContext_GetNativeContext(*args, **kwargs) + def GetLogicalFunction(*args, **kwargs): + """ + GetLogicalFunction(self) -> int + + Returns the current logical function. + """ + return _gdi_.GraphicsContext_GetLogicalFunction(*args, **kwargs) + + def SetLogicalFunction(*args, **kwargs): + """ + SetLogicalFunction(self, int function) -> bool + + Sets the current logical function, returns ``True`` if it supported + """ + return _gdi_.GraphicsContext_SetLogicalFunction(*args, **kwargs) + def Translate(*args, **kwargs): """ Translate(self, Double dx, Double dy) @@ -6569,17 +6599,17 @@ class RendererNative(object): def DrawHeaderButton(*args, **kwargs): """ DrawHeaderButton(self, Window win, DC dc, Rect rect, int flags=0, int sortArrow=HDR_SORT_ICON_NONE, - HeaderButtonParams params=None) + HeaderButtonParams params=None) -> int - Draw the header control button (such as what is used by `wx.ListCtrl` - in report mode.) + Draw a header control button (such as what is used by `wx.ListCtrl` in report + mode.) The optimal size of the label (text and icons) is returned. """ return _gdi_.RendererNative_DrawHeaderButton(*args, **kwargs) def DrawHeaderButtonContents(*args, **kwargs): """ DrawHeaderButtonContents(self, Window win, DC dc, Rect rect, int flags=0, int sortArrow=HDR_SORT_ICON_NONE, - HeaderButtonParams params=None) + HeaderButtonParams params=None) -> int Draw the contents of a header control button, (label, sort arrows, etc.) Normally this is only called by `DrawHeaderButton`.