X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/248802d0100093c48f67a60a6463d7765f14d5f0..402dc2145d17340e1a331acc60f36d5c49a136ca:/wxPython/src/mac/_gdi.py?ds=sidebyside

diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py
index 03130fd329..fca42e561e 100644
--- a/wxPython/src/mac/_gdi.py
+++ b/wxPython/src/mac/_gdi.py
@@ -676,7 +676,7 @@ class Bitmap(GDIObject):
         CopyFromBuffer(self, buffer data)
 
         Copy data from a RGB buffer object to replace the bitmap pixel data.
-        See `wxBitmapFromBuffer` for more .
+        See `wx.BitmapFromBuffer` for more .
         """
         return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
 
@@ -685,7 +685,7 @@ class Bitmap(GDIObject):
         CopyFromBufferRGBA(self, buffer data)
 
         Copy data from a RGBA buffer object to replace the bitmap pixel data.
-        See `wxBitmapFromBufferRGBA` for more .
+        See `wx.BitmapFromBufferRGBA` for more .
         """
         return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
 
@@ -1229,19 +1229,73 @@ class IconBundle(object):
         _gdi_.IconBundle_swiginit(self,_gdi_.new_IconBundle(*args, **kwargs))
     __swig_destroy__ = _gdi_.delete_IconBundle
     __del__ = lambda self : None;
+    def IsOk(*args, **kwargs):
+        """IsOk(self) -> bool"""
+        return _gdi_.IconBundle_IsOk(*args, **kwargs)
+
+    def __nonzero__(self): return self.IsOk() 
     def AddIcon(*args, **kwargs):
-        """AddIcon(self, Icon icon)"""
+        """
+        AddIcon(self, Icon icon)
+
+        Adds the icon to the collection, if the collection already contains an
+        icon with the same width and height, it is replaced
+        """
         return _gdi_.IconBundle_AddIcon(*args, **kwargs)
 
     def AddIconFromFile(*args, **kwargs):
-        """AddIconFromFile(self, String file, long type)"""
+        """
+        AddIconFromFile(self, String file, long type)
+
+        Adds all the icons contained in the file to the collection, if the
+        collection already contains icons with the same width and height, they
+        are replaced
+        """
         return _gdi_.IconBundle_AddIconFromFile(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):
-        """GetIcon(self, Size size) -> Icon"""
+        """
+        GetIcon(self, Size size) -> Icon
+
+        Returns the icon with the given size; if no such icon exists, returns
+        the icon with size wxSYS_ICON_[XY]; if no such icon exists, returns
+        the first icon in the bundle
+        """
         return _gdi_.IconBundle_GetIcon(*args, **kwargs)
 
-    Icon = property(GetIcon,doc="See `GetIcon`") 
+    def GetIconOfExactSize(*args, **kwargs):
+        """
+        GetIconOfExactSize(self, Size size) -> Icon
+
+        Returns the icon exactly of the specified size or wxNullIcon if no
+        icon of exactly given size are available.
+        """
+        return _gdi_.IconBundle_GetIconOfExactSize(*args, **kwargs)
+
+    def GetIconCount(*args, **kwargs):
+        """
+        GetIconCount(self) -> size_t
+
+        return the number of available icons
+        """
+        return _gdi_.IconBundle_GetIconCount(*args, **kwargs)
+
+    def GetIconByIndex(*args, **kwargs):
+        """
+        GetIconByIndex(self, size_t n) -> Icon
+
+        Return the icon at index (must be < GetIconCount())
+        """
+        return _gdi_.IconBundle_GetIconByIndex(*args, **kwargs)
+
+    def IsEmpty(*args, **kwargs):
+        """
+        IsEmpty(self) -> bool
+
+        Check if we have any icons at all
+        """
+        return _gdi_.IconBundle_IsEmpty(*args, **kwargs)
+
 _gdi_.IconBundle_swigregister(IconBundle)
 
 def IconBundleFromFile(*args, **kwargs):
@@ -2633,9 +2687,8 @@ class Locale(object):
     __del__ = lambda self : None;
     def Init1(*args, **kwargs):
         """
-        Init1(self, String szName, String szShort=EmptyString, String szLocale=EmptyString, 
-            bool bLoadDefault=True, 
-            bool bConvertEncoding=False) -> bool
+        Init1(self, String name, String shortName=EmptyString, String locale=EmptyString, 
+            bool bLoadDefault=True, bool bConvertEncoding=False) -> bool
         """
         return _gdi_.Locale_Init1(*args, **kwargs)
 
@@ -2692,7 +2745,7 @@ class Locale(object):
 
     AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix)
     def AddCatalog(*args, **kwargs):
-        """AddCatalog(self, String szDomain) -> bool"""
+        """AddCatalog(self, String domain) -> bool"""
         return _gdi_.Locale_AddCatalog(*args, **kwargs)
 
     def IsAvailable(*args, **kwargs):
@@ -2701,7 +2754,7 @@ class Locale(object):
 
     IsAvailable = staticmethod(IsAvailable)
     def IsLoaded(*args, **kwargs):
-        """IsLoaded(self, String szDomain) -> bool"""
+        """IsLoaded(self, String domain) -> bool"""
         return _gdi_.Locale_IsLoaded(*args, **kwargs)
 
     def GetLanguageInfo(*args, **kwargs):
@@ -2725,7 +2778,7 @@ class Locale(object):
 
     AddLanguage = staticmethod(AddLanguage)
     def GetString(*args, **kwargs):
-        """GetString(self, String szOrigString, String szDomain=EmptyString) -> String"""
+        """GetString(self, String origString, String domain=EmptyString) -> String"""
         return _gdi_.Locale_GetString(*args, **kwargs)
 
     def GetName(*args, **kwargs):
@@ -2792,14 +2845,11 @@ class PyLocale(Locale):
         return _gdi_.PyLocale__setCallbackInfo(*args, **kwargs)
 
     def GetSingularString(*args, **kwargs):
-        """GetSingularString(self, wxChar szOrigString, wxChar szDomain=None) -> wxChar"""
+        """GetSingularString(self, String origString, String domain=EmptyString) -> String"""
         return _gdi_.PyLocale_GetSingularString(*args, **kwargs)
 
     def GetPluralString(*args, **kwargs):
-        """
-        GetPluralString(self, wxChar szOrigString, wxChar szOrigString2, size_t n, 
-            wxChar szDomain=None) -> wxChar
-        """
+        """GetPluralString(self, String origString, String origString2, size_t n, String domain=EmptyString) -> String"""
         return _gdi_.PyLocale_GetPluralString(*args, **kwargs)
 
 _gdi_.PyLocale_swigregister(PyLocale)
@@ -3384,6 +3434,35 @@ class DC(_core.Object):
         """
         return _gdi_.DC_BlitPointSize(*args, **kwargs)
 
+    def StretchBlit(*args, **kwargs):
+        """
+        StretchBlit(self, int dstX, int dstY, int dstWidth, int dstHeight, DC source, 
+            int srcX, int srcY, int srcWidth, int srcHeight, 
+            int rop=COPY, bool useMask=False, 
+            int srcMaskX=wxDefaultCoord, int srcMaskY=wxDefaultCoord) -> bool
+
+        Copy from a source DC to this DC, specifying the destination
+        coordinates, destination size, source DC, source coordinates, size of
+        source area to copy, logical function, whether to use a bitmap mask,
+        and mask source position.
+        """
+        return _gdi_.DC_StretchBlit(*args, **kwargs)
+
+    def StretchBlitPointSize(*args, **kwargs):
+        """
+        StretchBlitPointSize(self, Point dstPt, Size dstSize, DC source, Point srcPt, 
+            Size srcSize, int rop=COPY, bool useMask=False, 
+            Point srcMaskPt=DefaultPosition) -> bool
+
+        Copy from a source DC to this DC, specifying the destination
+        coordinates, destination size, source DC, source coordinates, size of
+        source area to copy, logical function, whether to use a bitmap mask,
+        and mask source position.  This version is the same as `StretchBlit`
+        except `wx.Point` and `wx.Size` objects are used instead of individual
+        position and size components.
+        """
+        return _gdi_.DC_StretchBlitPointSize(*args, **kwargs)
+
     def GetAsBitmap(*args, **kwargs):
         """GetAsBitmap(self, Rect subrect=None) -> Bitmap"""
         return _gdi_.DC_GetAsBitmap(*args, **kwargs)
@@ -4692,6 +4771,7 @@ def MemoryDCFromDC(*args, **kwargs):
 
 BUFFER_VIRTUAL_AREA = _gdi_.BUFFER_VIRTUAL_AREA
 BUFFER_CLIENT_AREA = _gdi_.BUFFER_CLIENT_AREA
+BUFFER_USES_SHARED_BUFFER = _gdi_.BUFFER_USES_SHARED_BUFFER
 class BufferedDC(MemoryDC):
     """
     This simple class provides a simple way to avoid flicker: when drawing
@@ -4976,6 +5056,13 @@ class PrinterDC(DC):
         _gdi_.PrinterDC_swiginit(self,_gdi_.new_PrinterDC(*args, **kwargs))
 _gdi_.PrinterDC_swigregister(PrinterDC)
 
+class SVGFileDC(DC):
+    """Proxy of C++ SVGFileDC class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+_gdi_.SVGFileDC_swigregister(SVGFileDC)
+
 #---------------------------------------------------------------------------
 
 class GraphicsObject(_core.Object):
@@ -5092,22 +5179,13 @@ _gdi_.GraphicsFont_swigregister(GraphicsFont)
 class GraphicsMatrix(GraphicsObject):
     """
     A wx.GraphicsMatrix is a native representation of an affine
-    matrix. The contents are specific an private to the respective
+    matrix. The contents are specific and private to the respective
     renderer. The only way to get a valid instance is via a CreateMatrix
     call on the graphics context or the renderer instance.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """
-        __init__(self) -> GraphicsMatrix
-
-        A wx.GraphicsMatrix is a native representation of an affine
-        matrix. The contents are specific an private to the respective
-        renderer. The only way to get a valid instance is via a CreateMatrix
-        call on the graphics context or the renderer instance.
-        """
-        _gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs))
     __swig_destroy__ = _gdi_.delete_GraphicsMatrix
     __del__ = lambda self : None;
     def Concat(*args, **kwargs):
@@ -5148,7 +5226,8 @@ class GraphicsMatrix(GraphicsObject):
         """
         IsEqual(self, GraphicsMatrix t) -> bool
 
-        Returns ``True`` if the elements of the transformation matrix are equal
+        Returns ``True`` if the elements of the transformation matrix are
+        equal
         """
         return _gdi_.GraphicsMatrix_IsEqual(*args, **kwargs)
 
@@ -5217,10 +5296,8 @@ _gdi_.GraphicsMatrix_swigregister(GraphicsMatrix)
 class GraphicsPath(GraphicsObject):
     """Proxy of C++ GraphicsPath class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """__init__(self) -> GraphicsPath"""
-        _gdi_.GraphicsPath_swiginit(self,_gdi_.new_GraphicsPath(*args, **kwargs))
     __swig_destroy__ = _gdi_.delete_GraphicsPath
     __del__ = lambda self : None;
     def MoveToPoint(*args):
@@ -5279,9 +5356,9 @@ class GraphicsPath(GraphicsObject):
     def AddArc(*args):
         """
         AddArc(self, Double x, Double y, Double r, Double startAngle, Double endAngle, 
-            bool clockwise)
+            bool clockwise=True)
         AddArc(self, Point2D c, Double r, Double startAngle, Double endAngle, 
-            bool clockwise)
+            bool clockwise=True)
 
         Adds an arc of a circle centering at (x,y) with radius (r) from
         startAngle to endAngle
@@ -5317,8 +5394,8 @@ class GraphicsPath(GraphicsObject):
         """
         AddArcToPoint(self, Double x1, Double y1, Double x2, Double y2, Double r)
 
-        Appends an arc to two tangents connecting (current) to (x1,y1) and (x1,y1)
-        to (x2,y2), also a straight line from (current) to (x1,y1)
+        Appends an arc to two tangents connecting (current) to (x1,y1) and
+        (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
         """
         return _gdi_.GraphicsPath_AddArcToPoint(*args, **kwargs)
 
@@ -5368,16 +5445,17 @@ class GraphicsPath(GraphicsObject):
 
     def GetBox(*args, **kwargs):
         """
-        GetBox(self) -> wxRect2DDouble
+        GetBox(self) -> Rect2D
 
-        Gets the bounding box enclosing all points (possibly including control points)
+        Gets the bounding box enclosing all points (possibly including control
+        points)
         """
         return _gdi_.GraphicsPath_GetBox(*args, **kwargs)
 
     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.
         """
@@ -5425,9 +5503,10 @@ class GraphicsContext(GraphicsObject):
         """
         CreateFromNative(void context) -> GraphicsContext
 
-        Creates a wx.GraphicsContext from a native context. This native context
-        must be eg a CGContextRef for Core Graphics, a Graphics pointer for
-        GDIPlus or a cairo_t pointer for Cairo.
+        Creates a wx.GraphicsContext from a native context. This native
+        context must be eg a CGContextRef for Core Graphics, a Graphics
+        pointer for GDIPlus or a cairo_t pointer for Cairo.  NOTE: For
+        wxPython we still need a way to make this value usable.
         """
         return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
 
@@ -5436,7 +5515,8 @@ class GraphicsContext(GraphicsObject):
         """
         CreateFromNativeWindow(void window) -> GraphicsContext
 
-        Creates a wx.GraphicsContext from a native window.
+        Creates a wx.GraphicsContext from a native window.  NOTE: For wxPython
+        we still need a way to make this value usable.
         """
         return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
 
@@ -5480,8 +5560,8 @@ class GraphicsContext(GraphicsObject):
         CreateRadialGradientBrush(self, Double xo, Double yo, Double xc, Double yc, Double radius, 
             Colour oColor, Colour cColor) -> GraphicsBrush
 
-        Creates a native brush, having a radial gradient originating at 
-        point (xo,yc) with color oColour and ends on a circle around (xc,yc) with
+        Creates a native brush, having a radial gradient originating at point
+        (xo,yc) with color oColour and ends on a circle around (xc,yc) with
         radius r and color cColour.
         """
         return _gdi_.GraphicsContext_CreateRadialGradientBrush(*args, **kwargs)
@@ -5508,7 +5588,8 @@ class GraphicsContext(GraphicsObject):
         """
         PushState(self)
 
-        push the current state of the context, ie the transformation matrix on a stack
+        Push the current state of the context, (ie the transformation matrix)
+        on a stack
         """
         return _gdi_.GraphicsContext_PushState(*args, **kwargs)
 
@@ -5516,7 +5597,7 @@ class GraphicsContext(GraphicsObject):
         """
         PopState(self)
 
-        pops a stored state from the stack
+        Pops a stored state from the stack
         """
         return _gdi_.GraphicsContext_PopState(*args, **kwargs)
 
@@ -5754,7 +5835,7 @@ class GraphicsContext(GraphicsObject):
 
     def StrokeLineSegements(*args, **kwargs):
         """
-        StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints)
+        StrokeLineSegments(self, List beginPoints, List endPoints)
 
         Stroke disconnected lines from begin to end points
         """
@@ -5833,9 +5914,10 @@ def GraphicsContext_CreateFromNative(*args, **kwargs):
   """
     GraphicsContext_CreateFromNative(void context) -> GraphicsContext
 
-    Creates a wx.GraphicsContext from a native context. This native context
-    must be eg a CGContextRef for Core Graphics, a Graphics pointer for
-    GDIPlus or a cairo_t pointer for Cairo.
+    Creates a wx.GraphicsContext from a native context. This native
+    context must be eg a CGContextRef for Core Graphics, a Graphics
+    pointer for GDIPlus or a cairo_t pointer for Cairo.  NOTE: For
+    wxPython we still need a way to make this value usable.
     """
   return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
 
@@ -5843,7 +5925,8 @@ def GraphicsContext_CreateFromNativeWindow(*args, **kwargs):
   """
     GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext
 
-    Creates a wx.GraphicsContext from a native window.
+    Creates a wx.GraphicsContext from a native window.  NOTE: For wxPython
+    we still need a way to make this value usable.
     """
   return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
 
@@ -6263,6 +6346,7 @@ NullBrush = cvar.NullBrush
 NullPalette = cvar.NullPalette
 NullFont = cvar.NullFont
 NullColour = cvar.NullColour
+NullIconBundle = cvar.NullIconBundle
 
 class PenList(GDIObjListBase):
     """Proxy of C++ PenList class"""
@@ -6273,17 +6357,6 @@ class PenList(GDIObjListBase):
         """FindOrCreatePen(self, Colour colour, int width, int style) -> Pen"""
         return _gdi_.PenList_FindOrCreatePen(*args, **kwargs)
 
-    def AddPen(*args, **kwargs):
-        """AddPen(self, Pen pen)"""
-        return _gdi_.PenList_AddPen(*args, **kwargs)
-
-    def RemovePen(*args, **kwargs):
-        """RemovePen(self, Pen pen)"""
-        return _gdi_.PenList_RemovePen(*args, **kwargs)
-
-    AddPen = wx._deprecated(AddPen)
-    RemovePen = wx._deprecated(RemovePen)
-
 _gdi_.PenList_swigregister(PenList)
 
 class BrushList(GDIObjListBase):
@@ -6295,17 +6368,6 @@ class BrushList(GDIObjListBase):
         """FindOrCreateBrush(self, Colour colour, int style=SOLID) -> Brush"""
         return _gdi_.BrushList_FindOrCreateBrush(*args, **kwargs)
 
-    def AddBrush(*args, **kwargs):
-        """AddBrush(self, Brush brush)"""
-        return _gdi_.BrushList_AddBrush(*args, **kwargs)
-
-    def RemoveBrush(*args, **kwargs):
-        """RemoveBrush(self, Brush brush)"""
-        return _gdi_.BrushList_RemoveBrush(*args, **kwargs)
-
-    AddBrush = wx._deprecated(AddBrush)
-    RemoveBrush = wx._deprecated(RemoveBrush)
-
 _gdi_.BrushList_swigregister(BrushList)
 
 class FontList(GDIObjListBase):
@@ -6321,17 +6383,6 @@ class FontList(GDIObjListBase):
         """
         return _gdi_.FontList_FindOrCreateFont(*args, **kwargs)
 
-    def AddFont(*args, **kwargs):
-        """AddFont(self, Font font)"""
-        return _gdi_.FontList_AddFont(*args, **kwargs)
-
-    def RemoveFont(*args, **kwargs):
-        """RemoveFont(self, Font font)"""
-        return _gdi_.FontList_RemoveFont(*args, **kwargs)
-
-    AddFont = wx._deprecated(AddFont)
-    RemoveFont = wx._deprecated(RemoveFont)
-
 _gdi_.FontList_swigregister(FontList)
 
 class ColourDatabase(object):
@@ -6469,6 +6520,7 @@ CONTROL_ISDEFAULT = _gdi_.CONTROL_ISDEFAULT
 CONTROL_ISSUBMENU = _gdi_.CONTROL_ISSUBMENU
 CONTROL_EXPANDED = _gdi_.CONTROL_EXPANDED
 CONTROL_SIZEGRIP = _gdi_.CONTROL_SIZEGRIP
+CONTROL_FLAT = _gdi_.CONTROL_FLAT
 CONTROL_CURRENT = _gdi_.CONTROL_CURRENT
 CONTROL_SELECTED = _gdi_.CONTROL_SELECTED
 CONTROL_CHECKED = _gdi_.CONTROL_CHECKED
@@ -6928,7 +6980,7 @@ class PseudoDC(_core.Object):
 
     def FindObjects(*args, **kwargs):
         """
-        FindObjects(self, int x, int y, int radius=1, wxColor bg=*wxWHITE) -> PyObject
+        FindObjects(self, int x, int y, int radius=1, Colour bg=*wxWHITE) -> PyObject
 
         Returns a list of all the id's that draw a pixel with color
         not equal to bg within radius of (x,y).