X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e0de3dfc43ea44d3745996d274520b17ec7f3d1..56a52e909411904736e41258c39f306d218d84d5:/wxPython/src/mac/_core.py diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 3e2357f86e..88a7b4187a 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -1160,7 +1160,7 @@ class Rect(object): Inflate(self, int dx, int dy) -> Rect Increase the rectangle size by dx in x direction and dy in y - direction. Both or one of) parameters may be negative to decrease the + direction. Both (or one of) parameters may be negative to decrease the rectangle size. """ return _core_.Rect_Inflate(*args, **kwargs) @@ -1170,7 +1170,7 @@ class Rect(object): Deflate(self, int dx, int dy) -> Rect Decrease the rectangle size by dx in x direction and dy in y - direction. Both or one of) parameters may be negative to increase the + direction. Both (or one of) parameters may be negative to increase the rectngle size. This method is the opposite of Inflate. """ return _core_.Rect_Deflate(*args, **kwargs) @@ -1197,10 +1197,18 @@ class Rect(object): """ Intersect(self, Rect rect) -> Rect - Return the intersectsion of this rectangle and rect. + Returns the intersectsion of this rectangle and rect. """ return _core_.Rect_Intersect(*args, **kwargs) + def Union(*args, **kwargs): + """ + Union(self, Rect rect) -> Rect + + Returns the union of this rectangle and rect. + """ + return _core_.Rect_Union(*args, **kwargs) + def __add__(*args, **kwargs): """ __add__(self, Rect rect) -> Rect @@ -2399,6 +2407,12 @@ def ImageFromData(*args, **kwargs): val.thisown = 1 return val +def ImageFromDataWithAlpha(*args, **kwargs): + """ImageFromDataWithAlpha(int width, int height, unsigned char data, unsigned char alpha) -> Image""" + val = _core_.new_ImageFromDataWithAlpha(*args, **kwargs) + val.thisown = 1 + return val + def Image_CanRead(*args, **kwargs): """Image_CanRead(String name) -> bool""" return _core_.Image_CanRead(*args, **kwargs) @@ -5160,6 +5174,24 @@ def GetApp(*args, **kwargs): Return a reference to the current wx.App object. """ return _core_.GetApp(*args, **kwargs) + +def SetDefaultPyEncoding(*args, **kwargs): + """ + SetDefaultPyEncoding(string encoding) + + Sets the encoding that wxPython will use when it needs to convert a + Python string or unicode object to or from a wxString. + """ + return _core_.SetDefaultPyEncoding(*args, **kwargs) + +def GetDefaultPyEncoding(*args, **kwargs): + """ + GetDefaultPyEncoding() -> string + + Gets the current encoding that wxPython will use when it needs to + convert a Python string or unicode object to or from a wxString. + """ + return _core_.GetDefaultPyEncoding(*args, **kwargs) #---------------------------------------------------------------------- class PyOnDemandOutputWindow: @@ -10288,6 +10320,8 @@ class GridBagSizer(FlexGridSizer): self.this = newobj.this self.thisown = 1 del newobj.thisown + self._setOORInfo(self) + def Add(*args, **kwargs): """ Add(self, item, GBPosition pos, GBSpan span=DefaultSpan, int flag=0, @@ -10756,6 +10790,16 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION: #---------------------------------------------------------------------------- +# Set the default string conversion encoding from the locale +import locale +default = locale.getdefaultlocale()[1] +if default: + wx.SetDefaultPyEncoding(default) +del default +del locale + +#---------------------------------------------------------------------------- + class PyDeadObjectError(AttributeError): pass