X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53aa7709e08bb3cdaa8ec5c4977f32e817aff7d6..6a168c177c0572f32f98e8a9d8ba9adcd1c2d968:/wxPython/src/mac/_core.py diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 6fa4e99430..6e21d72a20 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -1135,6 +1135,10 @@ class Rect(object): """SetSize(self, Size s)""" return _core_.Rect_SetSize(*args, **kwargs) + def IsEmpty(*args, **kwargs): + """IsEmpty(self) -> bool""" + return _core_.Rect_IsEmpty(*args, **kwargs) + def GetTopLeft(*args, **kwargs): """GetTopLeft(self) -> Point""" return _core_.Rect_GetTopLeft(*args, **kwargs) @@ -1691,7 +1695,7 @@ class FSFile(Object): self.this = newobj.this self.thisown = 1 del newobj.thisown - self.thisown = 0 # It will normally be deleted by the user of the wxFileSystem + self.thisown = 0 # It will normally be deleted by the user of the wx.FileSystem def __del__(self, destroy=_core_.delete_FSFile): """__del__(self)""" @@ -2149,10 +2153,18 @@ class Image(Object): """Rescale(self, int width, int height) -> Image""" return _core_.Image_Rescale(*args, **kwargs) + def Resize(*args, **kwargs): + """Resize(self, Size size, Point pos, int r=-1, int g=-1, int b=-1) -> Image""" + return _core_.Image_Resize(*args, **kwargs) + def SetRGB(*args, **kwargs): """SetRGB(self, int x, int y, unsigned char r, unsigned char g, unsigned char b)""" return _core_.Image_SetRGB(*args, **kwargs) + def SetRGBRect(*args, **kwargs): + """SetRGBRect(self, Rect rect, unsigned char r, unsigned char g, unsigned char b)""" + return _core_.Image_SetRGBRect(*args, **kwargs) + def GetRed(*args, **kwargs): """GetRed(self, int x, int y) -> unsigned char""" return _core_.Image_GetRed(*args, **kwargs) @@ -2177,6 +2189,17 @@ class Image(Object): """HasAlpha(self) -> bool""" return _core_.Image_HasAlpha(*args, **kwargs) + def InitAlpha(*args, **kwargs): + """ + InitAlpha(self) + + Initializes the image alpha channel data. It is an error to call it if + the image already has alpha data. If it doesn't, alpha data will be by + default initialized to all pixels being fully opaque. But if the image + has a a mask colour, all mask pixels will be completely transparent. + """ + return _core_.Image_InitAlpha(*args, **kwargs) + def FindFirstUnusedColour(*args, **kwargs): """ FindFirstUnusedColour(int startR=1, int startG=0, int startB=0) -> (success, r, g, b) @@ -2278,6 +2301,10 @@ class Image(Object): """GetSubImage(self, Rect rect) -> Image""" return _core_.Image_GetSubImage(*args, **kwargs) + def Size(*args, **kwargs): + """Size(self, Size size, Point pos, int r=-1, int g=-1, int b=-1) -> Image""" + return _core_.Image_Size(*args, **kwargs) + def Copy(*args, **kwargs): """Copy(self) -> Image""" return _core_.Image_Copy(*args, **kwargs) @@ -2322,6 +2349,14 @@ class Image(Object): """SetMaskColour(self, unsigned char r, unsigned char g, unsigned char b)""" return _core_.Image_SetMaskColour(*args, **kwargs) + def GetOrFindMaskColour(*args, **kwargs): + """ + GetOrFindMaskColour() -> (r,g,b) + + Get the current mask colour or find a suitable colour. + """ + return _core_.Image_GetOrFindMaskColour(*args, **kwargs) + def GetMaskRed(*args, **kwargs): """GetMaskRed(self) -> unsigned char""" return _core_.Image_GetMaskRed(*args, **kwargs) @@ -2512,6 +2547,9 @@ def InitAllImageHandlers(): IMAGE_RESOLUTION_INCHES = _core_.IMAGE_RESOLUTION_INCHES IMAGE_RESOLUTION_CM = _core_.IMAGE_RESOLUTION_CM +PNG_TYPE_COLOUR = _core_.PNG_TYPE_COLOUR +PNG_TYPE_GREY = _core_.PNG_TYPE_GREY +PNG_TYPE_GREY_RED = _core_.PNG_TYPE_GREY_RED BMP_24BPP = _core_.BMP_24BPP BMP_8BPP = _core_.BMP_8BPP BMP_8BPP_GREY = _core_.BMP_8BPP_GREY @@ -2539,11 +2577,21 @@ class BMPHandlerPtr(BMPHandler): self.__class__ = BMPHandler _core_.BMPHandler_swigregister(BMPHandlerPtr) NullImage = cvar.NullImage +IMAGE_OPTION_FILENAME = cvar.IMAGE_OPTION_FILENAME IMAGE_OPTION_BMP_FORMAT = cvar.IMAGE_OPTION_BMP_FORMAT IMAGE_OPTION_CUR_HOTSPOT_X = cvar.IMAGE_OPTION_CUR_HOTSPOT_X IMAGE_OPTION_CUR_HOTSPOT_Y = cvar.IMAGE_OPTION_CUR_HOTSPOT_Y IMAGE_OPTION_RESOLUTION = cvar.IMAGE_OPTION_RESOLUTION +IMAGE_OPTION_RESOLUTIONX = cvar.IMAGE_OPTION_RESOLUTIONX +IMAGE_OPTION_RESOLUTIONY = cvar.IMAGE_OPTION_RESOLUTIONY IMAGE_OPTION_RESOLUTIONUNIT = cvar.IMAGE_OPTION_RESOLUTIONUNIT +IMAGE_OPTION_QUALITY = cvar.IMAGE_OPTION_QUALITY +IMAGE_OPTION_BITSPERSAMPLE = cvar.IMAGE_OPTION_BITSPERSAMPLE +IMAGE_OPTION_SAMPLESPERPIXEL = cvar.IMAGE_OPTION_SAMPLESPERPIXEL +IMAGE_OPTION_COMPRESSION = cvar.IMAGE_OPTION_COMPRESSION +IMAGE_OPTION_IMAGEDESCRIPTOR = cvar.IMAGE_OPTION_IMAGEDESCRIPTOR +IMAGE_OPTION_PNG_FORMAT = cvar.IMAGE_OPTION_PNG_FORMAT +IMAGE_OPTION_PNG_BITDEPTH = cvar.IMAGE_OPTION_PNG_BITDEPTH class ICOHandler(BMPHandler): """Proxy of C++ ICOHandler class""" @@ -4564,6 +4612,14 @@ class NavigationKeyEvent(Event): """SetWindowChange(self, bool ischange)""" return _core_.NavigationKeyEvent_SetWindowChange(*args, **kwargs) + def IsFromTab(*args, **kwargs): + """IsFromTab(self) -> bool""" + return _core_.NavigationKeyEvent_IsFromTab(*args, **kwargs) + + def SetFromTab(*args, **kwargs): + """SetFromTab(self, bool bIs)""" + return _core_.NavigationKeyEvent_SetFromTab(*args, **kwargs) + def SetFlags(*args, **kwargs): """SetFlags(self, long flags)""" return _core_.NavigationKeyEvent_SetFlags(*args, **kwargs) @@ -4579,6 +4635,7 @@ class NavigationKeyEvent(Event): IsBackward = _core_.NavigationKeyEvent_IsBackward IsForward = _core_.NavigationKeyEvent_IsForward WinChange = _core_.NavigationKeyEvent_WinChange + FromTab = _core_.NavigationKeyEvent_FromTab class NavigationKeyEventPtr(NavigationKeyEvent): def __init__(self, this): @@ -7356,6 +7413,14 @@ class Window(EvtHandler): """ return _core_.Window_GetForegroundColour(*args, **kwargs) + def InheritsBackgroundColour(*args, **kwargs): + """InheritsBackgroundColour(self) -> bool""" + return _core_.Window_InheritsBackgroundColour(*args, **kwargs) + + def UseBgCol(*args, **kwargs): + """UseBgCol(self) -> bool""" + return _core_.Window_UseBgCol(*args, **kwargs) + def SetBackgroundStyle(*args, **kwargs): """ SetBackgroundStyle(self, int style) -> bool @@ -8682,11 +8747,67 @@ class MenuItem(Object): """SetAccel(self, AcceleratorEntry accel)""" return _core_.MenuItem_SetAccel(*args, **kwargs) + def SetFont(*args, **kwargs): + """SetFont(self, Font font)""" + return _core_.MenuItem_SetFont(*args, **kwargs) + + def GetFont(*args, **kwargs): + """GetFont(self) -> Font""" + return _core_.MenuItem_GetFont(*args, **kwargs) + + def SetTextColour(*args, **kwargs): + """SetTextColour(self, Colour colText)""" + return _core_.MenuItem_SetTextColour(*args, **kwargs) + + def GetTextColour(*args, **kwargs): + """GetTextColour(self) -> Colour""" + return _core_.MenuItem_GetTextColour(*args, **kwargs) + + def SetBackgroundColour(*args, **kwargs): + """SetBackgroundColour(self, Colour colBack)""" + return _core_.MenuItem_SetBackgroundColour(*args, **kwargs) + + def GetBackgroundColour(*args, **kwargs): + """GetBackgroundColour(self) -> Colour""" + return _core_.MenuItem_GetBackgroundColour(*args, **kwargs) + + def SetBitmaps(*args, **kwargs): + """SetBitmaps(self, Bitmap bmpChecked, Bitmap bmpUnchecked=wxNullBitmap)""" + return _core_.MenuItem_SetBitmaps(*args, **kwargs) + + def SetDisabledBitmap(*args, **kwargs): + """SetDisabledBitmap(self, Bitmap bmpDisabled)""" + return _core_.MenuItem_SetDisabledBitmap(*args, **kwargs) + + def GetDisabledBitmap(*args, **kwargs): + """GetDisabledBitmap(self) -> Bitmap""" + return _core_.MenuItem_GetDisabledBitmap(*args, **kwargs) + + def SetMarginWidth(*args, **kwargs): + """SetMarginWidth(self, int nWidth)""" + return _core_.MenuItem_SetMarginWidth(*args, **kwargs) + + def GetMarginWidth(*args, **kwargs): + """GetMarginWidth(self) -> int""" + return _core_.MenuItem_GetMarginWidth(*args, **kwargs) + def GetDefaultMarginWidth(*args, **kwargs): """GetDefaultMarginWidth() -> int""" return _core_.MenuItem_GetDefaultMarginWidth(*args, **kwargs) GetDefaultMarginWidth = staticmethod(GetDefaultMarginWidth) + def IsOwnerDrawn(*args, **kwargs): + """IsOwnerDrawn(self) -> bool""" + return _core_.MenuItem_IsOwnerDrawn(*args, **kwargs) + + def SetOwnerDrawn(*args, **kwargs): + """SetOwnerDrawn(self, bool ownerDrawn=True)""" + return _core_.MenuItem_SetOwnerDrawn(*args, **kwargs) + + def ResetOwnerDrawn(*args, **kwargs): + """ResetOwnerDrawn(self)""" + return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs) + def SetBitmap(*args, **kwargs): """SetBitmap(self, Bitmap bitmap)""" return _core_.MenuItem_SetBitmap(*args, **kwargs) @@ -9518,18 +9639,45 @@ class Sizer(Object): self.Add(*item) # for backwards compatibility only, please do not use in new code - AddWindow = wx._deprecated(Add, "AddWindow is deprecated, use `Add` instead.") - AddSizer = wx._deprecated(Add, "AddSizer is deprecated, use `Add` instead.") - AddSpacer = wx._deprecated(Add, "AddSpacer is deprecated, use `Add` instead.") - PrependWindow = wx._deprecated(Prepend, "PrependWindow is deprecated, use `Prepend` instead.") - PrependSizer = wx._deprecated(Prepend, "PrependSizer is deprecated, use `Prepend` instead.") - PrependSpacer = wx._deprecated(Prepend, "PrependSpacer is deprecated, use `Prepend` instead.") - InsertWindow = wx._deprecated(Insert, "InsertWindow is deprecated, use `Insert` instead.") - InsertSizer = wx._deprecated(Insert, "InsertSizer is deprecated, use `Insert` instead.") - InsertSpacer = wx._deprecated(Insert, "InsertSpacer is deprecated, use `Insert` instead.") - RemoveWindow = wx._deprecated(Remove, "RemoveWindow is deprecated, use `Remove` instead.") - RemoveSizer = wx._deprecated(Remove, "RemoveSizer is deprecated, use `Remove` instead.") - RemovePos = wx._deprecated(Remove, "RemovePos is deprecated, use `Remove` instead.") + def AddWindow(self, *args, **kw): + """Compatibility alias for `Add`.""" + return self.Add(*args, **kw) + def AddSizer(self, *args, **kw): + """Compatibility alias for `Add`.""" + return self.Add(*args, **kw) + def AddSpacer(self, *args, **kw): + """Compatibility alias for `Add`.""" + return self.Add(*args, **kw) + + def PrependWindow(self, *args, **kw): + """Compatibility alias for `Prepend`.""" + return self.Prepend(*args, **kw) + def PrependSizer(self, *args, **kw): + """Compatibility alias for `Prepend`.""" + return self.Prepend(*args, **kw) + def PrependSpacer(self, *args, **kw): + """Compatibility alias for `Prepend`.""" + return self.Prepend(*args, **kw) + + def InsertWindow(self, *args, **kw): + """Compatibility alias for `Insert`.""" + return self.Insert(*args, **kw) + def InsertSizer(self, *args, **kw): + """Compatibility alias for `Insert`.""" + return self.Insert(*args, **kw) + def InsertSpacer(self, *args, **kw): + """Compatibility alias for `Insert`.""" + return self.Insert(*args, **kw) + + def RemoveWindow(self, *args, **kw): + """Compatibility alias for `Remove`.""" + return self.Remove(*args, **kw) + def RemoveSizer(self, *args, **kw): + """Compatibility alias for `Remove`.""" + return self.Remove(*args, **kw) + def RemovePos(self, *args, **kw): + """Compatibility alias for `Remove`.""" + return self.Remove(*args, **kw) def SetDimension(*args, **kwargs):