X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d49bdf343240004c78843ce05c593435ddb22eb5..cc8ce392c535b7a614337e3bdba04b670e2e34d0:/wxPython/src/msw/_core.py diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 81b2f232bd..9b70b934b5 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -116,8 +116,6 @@ LB_MULTIPLE = _core_.LB_MULTIPLE LB_EXTENDED = _core_.LB_EXTENDED LB_OWNERDRAW = _core_.LB_OWNERDRAW LB_HSCROLL = _core_.LB_HSCROLL -PROCESS_ENTER = _core_.PROCESS_ENTER -PASSWORD = _core_.PASSWORD CB_SIMPLE = _core_.CB_SIMPLE CB_DROPDOWN = _core_.CB_DROPDOWN CB_SORT = _core_.CB_SORT @@ -133,9 +131,6 @@ SB_HORIZONTAL = _core_.SB_HORIZONTAL SB_VERTICAL = _core_.SB_VERTICAL RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX ST_SIZEGRIP = _core_.ST_SIZEGRIP -ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE -ST_DOTS_MIDDLE = _core_.ST_DOTS_MIDDLE -ST_DOTS_END = _core_.ST_DOTS_END FLOOD_SURFACE = _core_.FLOOD_SURFACE FLOOD_BORDER = _core_.FLOOD_BORDER ODDEVEN_RULE = _core_.ODDEVEN_RULE @@ -334,7 +329,7 @@ EXPAND = _core_.EXPAND SHAPED = _core_.SHAPED FIXED_MINSIZE = _core_.FIXED_MINSIZE TILE = _core_.TILE -ADJUST_MINSIZE = _core_.ADJUST_MINSIZE +ADJUST_MINSIZE = 0 BORDER_DEFAULT = _core_.BORDER_DEFAULT BORDER_NONE = _core_.BORDER_NONE BORDER_STATIC = _core_.BORDER_STATIC @@ -416,8 +411,6 @@ WXK_CONTROL = _core_.WXK_CONTROL WXK_MENU = _core_.WXK_MENU WXK_PAUSE = _core_.WXK_PAUSE WXK_CAPITAL = _core_.WXK_CAPITAL -WXK_PRIOR = _core_.WXK_PRIOR -WXK_NEXT = _core_.WXK_NEXT WXK_END = _core_.WXK_END WXK_HOME = _core_.WXK_HOME WXK_LEFT = _core_.WXK_LEFT @@ -486,9 +479,7 @@ WXK_NUMPAD_LEFT = _core_.WXK_NUMPAD_LEFT WXK_NUMPAD_UP = _core_.WXK_NUMPAD_UP WXK_NUMPAD_RIGHT = _core_.WXK_NUMPAD_RIGHT WXK_NUMPAD_DOWN = _core_.WXK_NUMPAD_DOWN -WXK_NUMPAD_PRIOR = _core_.WXK_NUMPAD_PRIOR WXK_NUMPAD_PAGEUP = _core_.WXK_NUMPAD_PAGEUP -WXK_NUMPAD_NEXT = _core_.WXK_NUMPAD_NEXT WXK_NUMPAD_PAGEDOWN = _core_.WXK_NUMPAD_PAGEDOWN WXK_NUMPAD_END = _core_.WXK_NUMPAD_END WXK_NUMPAD_BEGIN = _core_.WXK_NUMPAD_BEGIN @@ -525,6 +516,11 @@ WXK_SPECIAL17 = _core_.WXK_SPECIAL17 WXK_SPECIAL18 = _core_.WXK_SPECIAL18 WXK_SPECIAL19 = _core_.WXK_SPECIAL19 WXK_SPECIAL20 = _core_.WXK_SPECIAL20 +WXK_PRIOR = WXK_PAGEUP +WXK_NEXT = WXK_PAGEDOWN +WXK_NUMPAD_PRIOR = WXK_NUMPAD_PAGEUP +WXK_NUMPAD_NEXT = WXK_NUMPAD_PAGEDOWN + PAPER_NONE = _core_.PAPER_NONE PAPER_LETTER = _core_.PAPER_LETTER PAPER_LEGAL = _core_.PAPER_LEGAL @@ -705,9 +701,18 @@ class Object(object): Deletes the C++ object this Python object is a proxy for. """ - val = _core_.Object_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _core_.Object_Destroy(*args, **kwargs) + + def IsSameAs(*args, **kwargs): + """ + IsSameAs(self, Object p) -> bool + + For wx.Objects that use C++ reference counting internally, this method + can be used to determine if two objects are referencing the same data + object. + """ + return _core_.Object_IsSameAs(*args, **kwargs) ClassName = property(GetClassName,doc="See `GetClassName`") _core_.Object_swigregister(Object) @@ -735,6 +740,7 @@ BITMAP_TYPE_PICT = _core_.BITMAP_TYPE_PICT BITMAP_TYPE_ICON = _core_.BITMAP_TYPE_ICON BITMAP_TYPE_ANI = _core_.BITMAP_TYPE_ANI BITMAP_TYPE_IFF = _core_.BITMAP_TYPE_IFF +BITMAP_TYPE_TGA = _core_.BITMAP_TYPE_TGA BITMAP_TYPE_MACCURSOR = _core_.BITMAP_TYPE_MACCURSOR BITMAP_TYPE_ANY = _core_.BITMAP_TYPE_ANY CURSOR_NONE = _core_.CURSOR_NONE @@ -841,6 +847,14 @@ class Size(object): """ return _core_.Size_DecTo(*args, **kwargs) + def IncBy(*args, **kwargs): + """IncBy(self, int dx, int dy)""" + return _core_.Size_IncBy(*args, **kwargs) + + def DecBy(*args, **kwargs): + """DecBy(self, int dx, int dy)""" + return _core_.Size_DecBy(*args, **kwargs) + def Scale(*args, **kwargs): """ Scale(self, float xscale, float yscale) @@ -1184,6 +1198,22 @@ class Rect(object): """SetBottomRight(self, Point p)""" return _core_.Rect_SetBottomRight(*args, **kwargs) + def GetTopRight(*args, **kwargs): + """GetTopRight(self) -> Point""" + return _core_.Rect_GetTopRight(*args, **kwargs) + + def SetTopRight(*args, **kwargs): + """SetTopRight(self, Point p)""" + return _core_.Rect_SetTopRight(*args, **kwargs) + + def GetBottomLeft(*args, **kwargs): + """GetBottomLeft(self) -> Point""" + return _core_.Rect_GetBottomLeft(*args, **kwargs) + + def SetBottomLeft(*args, **kwargs): + """SetBottomLeft(self, Point p)""" + return _core_.Rect_SetBottomLeft(*args, **kwargs) + def GetLeft(*args, **kwargs): """GetLeft(self) -> int""" return _core_.Rect_GetLeft(*args, **kwargs) @@ -1349,9 +1379,12 @@ class Rect(object): """ return _core_.Rect_ContainsRect(*args, **kwargs) - Inside = wx._deprecated(Contains, "Use `Contains` instead.") - InsideXY = wx._deprecated(ContainsXY, "Use `ContainsXY` instead.") - InsideRect = wx._deprecated(ContainsRect, "Use `ContainsRect` instead.") + #Inside = wx._deprecated(Contains, "Use `Contains` instead.") + #InsideXY = wx._deprecated(ContainsXY, "Use `ContainsXY` instead.") + #InsideRect = wx._deprecated(ContainsRect, "Use `ContainsRect` instead.") + Inside = Contains + InsideXY = ContainsXY + InsideRect = ContainsRect def Intersects(*args, **kwargs): """ @@ -1408,6 +1441,7 @@ class Rect(object): Bottom = property(GetBottom,SetBottom,doc="See `GetBottom` and `SetBottom`") BottomRight = property(GetBottomRight,SetBottomRight,doc="See `GetBottomRight` and `SetBottomRight`") + BottomLeft = property(GetBottomLeft,SetBottomLeft,doc="See `GetBottomLeft` and `SetBottomLeft`") Height = property(GetHeight,SetHeight,doc="See `GetHeight` and `SetHeight`") Left = property(GetLeft,SetLeft,doc="See `GetLeft` and `SetLeft`") Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") @@ -1415,6 +1449,7 @@ class Rect(object): Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") Top = property(GetTop,SetTop,doc="See `GetTop` and `SetTop`") TopLeft = property(GetTopLeft,SetTopLeft,doc="See `GetTopLeft` and `SetTopLeft`") + TopRight = property(GetTopRight,SetTopRight,doc="See `GetTopRight` and `SetTopRight`") Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") X = property(GetX,SetX,doc="See `GetX` and `SetX`") Y = property(GetY,SetY,doc="See `GetY` and `SetY`") @@ -1472,6 +1507,8 @@ class Point2D(object): Create a w.Point2D object. """ _core_.Point2D_swiginit(self,_core_.new_Point2D(*args, **kwargs)) + __swig_destroy__ = _core_.delete_Point2D + __del__ = lambda self : None; def GetFloor(*args, **kwargs): """ GetFloor() -> (x,y) @@ -1619,6 +1656,260 @@ def Point2DFromPoint(*args, **kwargs): #--------------------------------------------------------------------------- +Inside = _core_.Inside +OutLeft = _core_.OutLeft +OutRight = _core_.OutRight +OutTop = _core_.OutTop +OutBottom = _core_.OutBottom +class Rect2D(object): + """ + wx.Rect2D is a rectangle, with position and size, in a 2D coordinate system + with floating point component values. + """ + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self, wxDouble x=0.0, wxDouble y=0.0, wxDouble w=0.0, wxDouble h=0.0) -> Rect2D + + wx.Rect2D is a rectangle, with position and size, in a 2D coordinate system + with floating point component values. + """ + _core_.Rect2D_swiginit(self,_core_.new_Rect2D(*args, **kwargs)) + __swig_destroy__ = _core_.delete_Rect2D + __del__ = lambda self : None; + def GetPosition(*args, **kwargs): + """GetPosition(self) -> Point2D""" + return _core_.Rect2D_GetPosition(*args, **kwargs) + + def GetSize(*args, **kwargs): + """GetSize(self) -> Size""" + return _core_.Rect2D_GetSize(*args, **kwargs) + + def GetLeft(*args, **kwargs): + """GetLeft(self) -> wxDouble""" + return _core_.Rect2D_GetLeft(*args, **kwargs) + + def SetLeft(*args, **kwargs): + """SetLeft(self, wxDouble n)""" + return _core_.Rect2D_SetLeft(*args, **kwargs) + + def MoveLeftTo(*args, **kwargs): + """MoveLeftTo(self, wxDouble n)""" + return _core_.Rect2D_MoveLeftTo(*args, **kwargs) + + def GetTop(*args, **kwargs): + """GetTop(self) -> wxDouble""" + return _core_.Rect2D_GetTop(*args, **kwargs) + + def SetTop(*args, **kwargs): + """SetTop(self, wxDouble n)""" + return _core_.Rect2D_SetTop(*args, **kwargs) + + def MoveTopTo(*args, **kwargs): + """MoveTopTo(self, wxDouble n)""" + return _core_.Rect2D_MoveTopTo(*args, **kwargs) + + def GetBottom(*args, **kwargs): + """GetBottom(self) -> wxDouble""" + return _core_.Rect2D_GetBottom(*args, **kwargs) + + def SetBottom(*args, **kwargs): + """SetBottom(self, wxDouble n)""" + return _core_.Rect2D_SetBottom(*args, **kwargs) + + def MoveBottomTo(*args, **kwargs): + """MoveBottomTo(self, wxDouble n)""" + return _core_.Rect2D_MoveBottomTo(*args, **kwargs) + + def GetRight(*args, **kwargs): + """GetRight(self) -> wxDouble""" + return _core_.Rect2D_GetRight(*args, **kwargs) + + def SetRight(*args, **kwargs): + """SetRight(self, wxDouble n)""" + return _core_.Rect2D_SetRight(*args, **kwargs) + + def MoveRightTo(*args, **kwargs): + """MoveRightTo(self, wxDouble n)""" + return _core_.Rect2D_MoveRightTo(*args, **kwargs) + + def GetLeftTop(*args, **kwargs): + """GetLeftTop(self) -> Point2D""" + return _core_.Rect2D_GetLeftTop(*args, **kwargs) + + def SetLeftTop(*args, **kwargs): + """SetLeftTop(self, Point2D pt)""" + return _core_.Rect2D_SetLeftTop(*args, **kwargs) + + def MoveLeftTopTo(*args, **kwargs): + """MoveLeftTopTo(self, Point2D pt)""" + return _core_.Rect2D_MoveLeftTopTo(*args, **kwargs) + + def GetLeftBottom(*args, **kwargs): + """GetLeftBottom(self) -> Point2D""" + return _core_.Rect2D_GetLeftBottom(*args, **kwargs) + + def SetLeftBottom(*args, **kwargs): + """SetLeftBottom(self, Point2D pt)""" + return _core_.Rect2D_SetLeftBottom(*args, **kwargs) + + def MoveLeftBottomTo(*args, **kwargs): + """MoveLeftBottomTo(self, Point2D pt)""" + return _core_.Rect2D_MoveLeftBottomTo(*args, **kwargs) + + def GetRightTop(*args, **kwargs): + """GetRightTop(self) -> Point2D""" + return _core_.Rect2D_GetRightTop(*args, **kwargs) + + def SetRightTop(*args, **kwargs): + """SetRightTop(self, Point2D pt)""" + return _core_.Rect2D_SetRightTop(*args, **kwargs) + + def MoveRightTopTo(*args, **kwargs): + """MoveRightTopTo(self, Point2D pt)""" + return _core_.Rect2D_MoveRightTopTo(*args, **kwargs) + + def GetRightBottom(*args, **kwargs): + """GetRightBottom(self) -> Point2D""" + return _core_.Rect2D_GetRightBottom(*args, **kwargs) + + def SetRightBottom(*args, **kwargs): + """SetRightBottom(self, Point2D pt)""" + return _core_.Rect2D_SetRightBottom(*args, **kwargs) + + def MoveRightBottomTo(*args, **kwargs): + """MoveRightBottomTo(self, Point2D pt)""" + return _core_.Rect2D_MoveRightBottomTo(*args, **kwargs) + + def GetCentre(*args, **kwargs): + """GetCentre(self) -> Point2D""" + return _core_.Rect2D_GetCentre(*args, **kwargs) + + def SetCentre(*args, **kwargs): + """SetCentre(self, Point2D pt)""" + return _core_.Rect2D_SetCentre(*args, **kwargs) + + def MoveCentreTo(*args, **kwargs): + """MoveCentreTo(self, Point2D pt)""" + return _core_.Rect2D_MoveCentreTo(*args, **kwargs) + + def GetOutcode(*args, **kwargs): + """GetOutcode(self, Point2D pt) -> int""" + return _core_.Rect2D_GetOutcode(*args, **kwargs) + + def Contains(*args, **kwargs): + """Contains(self, Point2D pt) -> bool""" + return _core_.Rect2D_Contains(*args, **kwargs) + + def ContainsRect(*args, **kwargs): + """ContainsRect(self, Rect2D rect) -> bool""" + return _core_.Rect2D_ContainsRect(*args, **kwargs) + + def IsEmpty(*args, **kwargs): + """IsEmpty(self) -> bool""" + return _core_.Rect2D_IsEmpty(*args, **kwargs) + + def HaveEqualSize(*args, **kwargs): + """HaveEqualSize(self, Rect2D rect) -> bool""" + return _core_.Rect2D_HaveEqualSize(*args, **kwargs) + + def Inset(*args): + """ + Inset(self, wxDouble x, wxDouble y) + Inset(self, wxDouble left, wxDouble top, wxDouble right, wxDouble bottom) + """ + return _core_.Rect2D_Inset(*args) + + def Offset(*args, **kwargs): + """Offset(self, Point2D pt)""" + return _core_.Rect2D_Offset(*args, **kwargs) + + def ConstrainTo(*args, **kwargs): + """ConstrainTo(self, Rect2D rect)""" + return _core_.Rect2D_ConstrainTo(*args, **kwargs) + + def Interpolate(*args, **kwargs): + """Interpolate(self, int widthfactor, int heightfactor) -> Point2D""" + return _core_.Rect2D_Interpolate(*args, **kwargs) + + def Intersect(*args, **kwargs): + """Intersect(self, Rect2D otherRect)""" + return _core_.Rect2D_Intersect(*args, **kwargs) + + def CreateIntersection(*args, **kwargs): + """CreateIntersection(self, Rect2D otherRect) -> Rect2D""" + return _core_.Rect2D_CreateIntersection(*args, **kwargs) + + def Intersects(*args, **kwargs): + """Intersects(self, Rect2D rect) -> bool""" + return _core_.Rect2D_Intersects(*args, **kwargs) + + def Union(*args, **kwargs): + """Union(self, Rect2D otherRect)""" + return _core_.Rect2D_Union(*args, **kwargs) + + def CreateUnion(*args, **kwargs): + """CreateUnion(self, Rect2D otherRect) -> Rect2D""" + return _core_.Rect2D_CreateUnion(*args, **kwargs) + + def Scale(*args): + """ + Scale(self, wxDouble f) + Scale(self, int num, int denum) + """ + return _core_.Rect2D_Scale(*args) + + def __eq__(*args, **kwargs): + """ + __eq__(self, PyObject other) -> bool + + Test for equality of wx.Rect2D objects. + """ + return _core_.Rect2D___eq__(*args, **kwargs) + + def __ne__(*args, **kwargs): + """ + __ne__(self, PyObject other) -> bool + + Test for inequality of wx.Rect2D objects. + """ + return _core_.Rect2D___ne__(*args, **kwargs) + + x = property(_core_.Rect2D_x_get, _core_.Rect2D_x_set) + y = property(_core_.Rect2D_y_get, _core_.Rect2D_y_set) + width = property(_core_.Rect2D_width_get, _core_.Rect2D_width_set) + height = property(_core_.Rect2D_height_get, _core_.Rect2D_height_set) + def Set(*args, **kwargs): + """Set(self, wxDouble x=0, wxDouble y=0, wxDouble width=0, wxDouble height=0)""" + return _core_.Rect2D_Set(*args, **kwargs) + + def Get(*args, **kwargs): + """ + Get() -> (x,y, width, height) + + Return x, y, width and height y properties as a tuple. + """ + return _core_.Rect2D_Get(*args, **kwargs) + + def __str__(self): return str(self.Get()) + def __repr__(self): return 'wx.Rect2D'+str(self.Get()) + def __len__(self): return len(self.Get()) + def __getitem__(self, index): return self.Get()[index] + def __setitem__(self, index, val): + if index == 0: self.x = val + elif index == 1: self.y = val + elif index == 2: self.width = val + elif index == 3: self.height = val + else: raise IndexError + def __nonzero__(self): return self.Get() != (0.0, 0.0, 0.0, 0.0) + __safe_for_unpickling__ = True + def __reduce__(self): return (wx.Rect2D, self.Get()) + +_core_.Rect2D_swigregister(Rect2D) + +#--------------------------------------------------------------------------- + FromStart = _core_.FromStart FromCurrent = _core_.FromCurrent FromEnd = _core_.FromEnd @@ -1775,7 +2066,7 @@ class FileSystemHandler(CPPFileSystemHandler): def __init__(self, *args, **kwargs): """__init__(self) -> FileSystemHandler""" _core_.FileSystemHandler_swiginit(self,_core_.new_FileSystemHandler(*args, **kwargs)) - self._setCallbackInfo(self, FileSystemHandler) + FileSystemHandler._setCallbackInfo(self, self, FileSystemHandler) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" @@ -2010,6 +2301,8 @@ def MemoryFSHandler_RemoveFile(*args, **kwargs): IMAGE_ALPHA_TRANSPARENT = _core_.IMAGE_ALPHA_TRANSPARENT IMAGE_ALPHA_THRESHOLD = _core_.IMAGE_ALPHA_THRESHOLD IMAGE_ALPHA_OPAQUE = _core_.IMAGE_ALPHA_OPAQUE +IMAGE_QUALITY_NORMAL = _core_.IMAGE_QUALITY_NORMAL +IMAGE_QUALITY_HIGH = _core_.IMAGE_QUALITY_HIGH #--------------------------------------------------------------------------- class ImageHandler(Object): @@ -2288,20 +2581,61 @@ class Image(Object): Destroys the image data. """ - val = _core_.Image_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _core_.Image_Destroy(*args, **kwargs) def Scale(*args, **kwargs): """ - Scale(self, int width, int height) -> Image + Scale(self, int width, int height, int quality=IMAGE_QUALITY_NORMAL) -> Image Returns a scaled version of the image. This is also useful for scaling bitmaps in general as the only other way to scale bitmaps is to blit a - `wx.MemoryDC` into another `wx.MemoryDC`. + `wx.MemoryDC` into another `wx.MemoryDC`. The ``quality`` parameter + specifies what method to use for resampling the image. It can be + either wx.IMAGE_QUALITY_NORMAL, which uses the normal default scaling + method of pixel replication, or wx.IMAGE_QUALITY_HIGH which uses + bicubic and box averaging resampling methods for upsampling and + downsampling respectively. """ return _core_.Image_Scale(*args, **kwargs) + def ResampleBox(*args, **kwargs): + """ResampleBox(self, int width, int height) -> Image""" + return _core_.Image_ResampleBox(*args, **kwargs) + + def ResampleBicubic(*args, **kwargs): + """ResampleBicubic(self, int width, int height) -> Image""" + return _core_.Image_ResampleBicubic(*args, **kwargs) + + def Blur(*args, **kwargs): + """ + Blur(self, int radius) -> Image + + Blurs the image in both horizontal and vertical directions by the + specified pixel ``radius``. This should not be used when using a + single mask colour for transparency. + """ + return _core_.Image_Blur(*args, **kwargs) + + def BlurHorizontal(*args, **kwargs): + """ + BlurHorizontal(self, int radius) -> Image + + Blurs the image in the horizontal direction only. This should not be + used when using a single mask colour for transparency. + + """ + return _core_.Image_BlurHorizontal(*args, **kwargs) + + def BlurVertical(*args, **kwargs): + """ + BlurVertical(self, int radius) -> Image + + Blurs the image in the vertical direction only. This should not be + used when using a single mask colour for transparency. + """ + return _core_.Image_BlurVertical(*args, **kwargs) + def ShrinkBy(*args, **kwargs): """ ShrinkBy(self, int xFactor, int yFactor) -> Image @@ -2312,7 +2646,7 @@ class Image(Object): def Rescale(*args, **kwargs): """ - Rescale(self, int width, int height) -> Image + Rescale(self, int width, int height, int quality=IMAGE_QUALITY_NORMAL) -> Image Changes the size of the image in-place by scaling it: after a call to this function, the image will have the given width and height. @@ -2576,14 +2910,15 @@ class Image(Object): """ return _core_.Image_LoadMimeStream(*args, **kwargs) - def Ok(*args, **kwargs): + def IsOk(*args, **kwargs): """ - Ok(self) -> bool + IsOk(self) -> bool Returns true if image data is present. """ - return _core_.Image_Ok(*args, **kwargs) + return _core_.Image_IsOk(*args, **kwargs) + Ok = IsOk def GetWidth(*args, **kwargs): """ GetWidth(self) -> int @@ -2961,7 +3296,7 @@ class Image(Object): return _core_.Image_HSVtoRGB(*args, **kwargs) HSVtoRGB = staticmethod(HSVtoRGB) - def __nonzero__(self): return self.Ok() + def __nonzero__(self): return self.IsOk() AlphaBuffer = property(GetAlphaBuffer,SetAlphaBuffer,doc="See `GetAlphaBuffer` and `SetAlphaBuffer`") AlphaData = property(GetAlphaData,SetAlphaData,doc="See `GetAlphaData` and `SetAlphaData`") Data = property(GetData,SetData,doc="See `GetData` and `SetData`") @@ -2970,7 +3305,6 @@ class Image(Object): MaskBlue = property(GetMaskBlue,doc="See `GetMaskBlue`") MaskGreen = property(GetMaskGreen,doc="See `GetMaskGreen`") MaskRed = property(GetMaskRed,doc="See `GetMaskRed`") - Size = property(GetSize,doc="See `GetSize`") Width = property(GetWidth,doc="See `GetWidth`") _core_.Image_swigregister(Image) @@ -3330,6 +3664,19 @@ class TIFFHandler(ImageHandler): _core_.TIFFHandler_swiginit(self,_core_.new_TIFFHandler(*args, **kwargs)) _core_.TIFFHandler_swigregister(TIFFHandler) +class TGAHandler(ImageHandler): + """A `wx.ImageHandler` for TGA image files.""" + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self) -> TGAHandler + + A `wx.ImageHandler` for TGA image files. + """ + _core_.TGAHandler_swiginit(self,_core_.new_TGAHandler(*args, **kwargs)) +_core_.TGAHandler_swigregister(TGAHandler) + QUANTIZE_INCLUDE_WINDOWS_COLOURS = _core_.QUANTIZE_INCLUDE_WINDOWS_COLOURS QUANTIZE_FILL_DESTINATION_IMAGE = _core_.QUANTIZE_FILL_DESTINATION_IMAGE class Quantize(object): @@ -3418,7 +3765,7 @@ class EvtHandler(Object): def _setOORInfo(*args, **kwargs): """_setOORInfo(self, PyObject _self, bool incref=True)""" val = _core_.EvtHandler__setOORInfo(*args, **kwargs) - args[0].thisown = 0 + args[0].this.own(False) return val def Bind(self, event, handler, source=None, id=wx.ID_ANY, id2=wx.ID_ANY): @@ -3496,6 +3843,15 @@ class PyEventBinder(object): success += target.Disconnect(id1, id2, et) return success != 0 + def _getEvtType(self): + """ + Make it easy to get to the default wxEventType typeID for this + event binder. + """ + return self.evtType[0] + + typeId = property(_getEvtType) + def __call__(self, *args): """ @@ -3540,6 +3896,7 @@ EVENT_PROPAGATE_MAX = _core_.EVENT_PROPAGATE_MAX def NewEventType(*args): """NewEventType() -> EventType""" return _core_.NewEventType(*args) +wxEVT_ANY = _core_.wxEVT_ANY wxEVT_NULL = _core_.wxEVT_NULL wxEVT_FIRST = _core_.wxEVT_FIRST wxEVT_USER_FIRST = _core_.wxEVT_USER_FIRST @@ -3930,14 +4287,13 @@ class Event(Object): """ Skip(self, bool skip=True) - Called by an event handler, it controls whether additional event - handlers bound to this event will be called after the current event - handler returns. Skip(false) (the default setting) will prevent - additional event handlers from being called and control will be - returned to the sender of the event immediately after the current - handler has finished. Skip(True) will cause the event processing - system to continue searching for a handler function for this event. - + This method can be used inside an event handler to control whether + further event handlers bound to this event will be called after the + current one returns. Without Skip() (or equivalently if Skip(False) is + used), the event will not be processed any more. If Skip(True) is + called, the event processing system continues searching for a further + handler function for this event, even though it has been processed + already in the current handler. """ return _core_.Event_Skip(*args, **kwargs) @@ -4221,7 +4577,7 @@ class ScrollEvent(CommandEvent): """ A scroll event holds information about events sent from stand-alone scrollbars and sliders. Note that scrolled windows do not send - instnaces of this event class, but send the `wx.ScrollWinEvent` + instances of this event class, but send the `wx.ScrollWinEvent` instead. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -4692,6 +5048,16 @@ class MouseEvent(Event): """ return _core_.MouseEvent_GetWheelDelta(*args, **kwargs) + def GetWheelAxis(*args, **kwargs): + """ + GetWheelAxis(self) -> int + + Gets the axis the wheel operation concerns, 0 being the y axis as on + most mouse wheels, 1 is the x axis for things like MightyMouse scrolls + or horizontal trackpad scrolling. + """ + return _core_.MouseEvent_GetWheelAxis(*args, **kwargs) + def GetLinesPerAction(*args, **kwargs): """ GetLinesPerAction(self) -> int @@ -5876,6 +6242,10 @@ class UpdateUIEvent(CommandEvent): return _core_.UpdateUIEvent_GetMode(*args, **kwargs) GetMode = staticmethod(GetMode) + Checked = property(GetChecked,Check,doc="See `GetChecked`") + Enabled = property(GetEnabled,Enable,doc="See `GetEnabled`") + Shown = property(GetShown,Show,doc="See `GetShown`") + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") _core_.UpdateUIEvent_swigregister(UpdateUIEvent) def UpdateUIEvent_SetUpdateInterval(*args, **kwargs): @@ -6280,6 +6650,7 @@ class WindowCreateEvent(CommandEvent): """ return _core_.WindowCreateEvent_GetWindow(*args, **kwargs) + Window = property(GetWindow,doc="See `GetWindow`") _core_.WindowCreateEvent_swigregister(WindowCreateEvent) class WindowDestroyEvent(CommandEvent): @@ -6319,6 +6690,7 @@ class WindowDestroyEvent(CommandEvent): """ return _core_.WindowDestroyEvent_GetWindow(*args, **kwargs) + Window = property(GetWindow,doc="See `GetWindow`") _core_.WindowDestroyEvent_swigregister(WindowDestroyEvent) #--------------------------------------------------------------------------- @@ -6629,6 +7001,25 @@ _core_.DateEvent_swigregister(DateEvent) wxEVT_DATE_CHANGED = _core_.wxEVT_DATE_CHANGED EVT_DATE_CHANGED = wx.PyEventBinder( wxEVT_DATE_CHANGED, 1 ) +class EventBlocker(EvtHandler): + """Helper class to temporarily disable event handling for a window.""" + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self, Window win, EventType type=wxEVT_ANY) -> EventBlocker + + Helper class to temporarily disable event handling for a window. + """ + _core_.EventBlocker_swiginit(self,_core_.new_EventBlocker(*args, **kwargs)) + __swig_destroy__ = _core_.delete_EventBlocker + __del__ = lambda self : None; + def Block(*args, **kwargs): + """Block(self, EventType type)""" + return _core_.EventBlocker_Block(*args, **kwargs) + +_core_.EventBlocker_swigregister(EventBlocker) + #--------------------------------------------------------------------------- PYAPP_ASSERT_SUPPRESS = _core_.PYAPP_ASSERT_SUPPRESS @@ -6651,13 +7042,12 @@ class PyApp(EvtHandler): Create a new application object, starting the bootstrap process. """ _core_.PyApp_swiginit(self,_core_.new_PyApp(*args, **kwargs)) - self._setCallbackInfo(self, PyApp, False) - self._setOORInfo(self, False) + self._setOORInfo(self, False);PyApp._setCallbackInfo(self, self, PyApp) __swig_destroy__ = _core_.delete_PyApp __del__ = lambda self : None; def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(self, PyObject self, PyObject _class, bool incref)""" + """_setCallbackInfo(self, PyObject self, PyObject _class, bool incref=False)""" return _core_.PyApp__setCallbackInfo(*args, **kwargs) def GetAppName(*args, **kwargs): @@ -6892,7 +7282,7 @@ class PyApp(EvtHandler): def SetUseBestVisual(*args, **kwargs): """ - SetUseBestVisual(self, bool flag) + SetUseBestVisual(self, bool flag, bool forceTrueColour=False) Set whether the app should try to use the best available visual on systems where more than one is available, (Sun, SGI, XFree86 4, etc.) @@ -7385,6 +7775,9 @@ in on the main display of your Mac.""" # Use Python's install prefix as the default wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix) + # Until the new native control for wxMac is up to par, still use the generic one. + wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1) + # This finishes the initialization of wxWindows and then calls # the OnInit that should be present in the derived class self._BootstrapApp() @@ -7404,8 +7797,8 @@ in on the main display of your Mac.""" destroy(self) def Destroy(self): + self.this.own(False) wx.PyApp.Destroy(self) - self.thisown = 0 def SetTopWindow(self, frame): """Set the \"main\" top level window""" @@ -7720,16 +8113,18 @@ class AcceleratorTable(Object): _core_.AcceleratorTable_swiginit(self,_core_.new_AcceleratorTable(*args, **kwargs)) __swig_destroy__ = _core_.delete_AcceleratorTable __del__ = lambda self : None; - def Ok(*args, **kwargs): - """Ok(self) -> bool""" - return _core_.AcceleratorTable_Ok(*args, **kwargs) + def IsOk(*args, **kwargs): + """IsOk(self) -> bool""" + return _core_.AcceleratorTable_IsOk(*args, **kwargs) + Ok = IsOk _core_.AcceleratorTable_swigregister(AcceleratorTable) +def GetAccelFromString(label): + entry = AcceleratorEntry() + entry.FromString(label) + return entry -def GetAccelFromString(*args, **kwargs): - """GetAccelFromString(String label) -> AcceleratorEntry""" - return _core_.GetAccelFromString(*args, **kwargs) #--------------------------------------------------------------------------- class VisualAttributes(object): @@ -7810,9 +8205,8 @@ class Window(EvtHandler): Returns True if the window has either been successfully deleted, or it has been added to the list of windows pending real deletion. """ - val = _core_.Window_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _core_.Window_Destroy(*args, **kwargs) def DestroyChildren(*args, **kwargs): """ @@ -8023,21 +8417,22 @@ class Window(EvtHandler): """ return _core_.Window_MoveXY(*args, **kwargs) - def SetBestFittingSize(*args, **kwargs): + def SetInitialSize(*args, **kwargs): """ - SetBestFittingSize(self, Size size=DefaultSize) + SetInitialSize(self, Size size=DefaultSize) A 'Smart' SetSize that will fill in default size components with the window's *best size* values. Also set's the minsize for use with sizers. """ - return _core_.Window_SetBestFittingSize(*args, **kwargs) + return _core_.Window_SetInitialSize(*args, **kwargs) + SetBestFittingSize = wx._deprecated(SetInitialSize, 'Use `SetInitialSize`') def Raise(*args, **kwargs): """ Raise(self) Raises the window to the top of the window hierarchy. In current - version of wxWidgets this works both for manage and child windows. + version of wxWidgets this works both for managed and child windows. """ return _core_.Window_Raise(*args, **kwargs) @@ -8046,7 +8441,7 @@ class Window(EvtHandler): Lower(self) Lowers the window to the bottom of the window hierarchy. In current - version of wxWidgets this works both for manage and child windows. + version of wxWidgets this works both for managed and child windows. """ return _core_.Window_Lower(*args, **kwargs) @@ -8239,29 +8634,23 @@ class Window(EvtHandler): """ return _core_.Window_CacheBestSize(*args, **kwargs) - def GetBestFittingSize(*args, **kwargs): + def GetEffectiveMinSize(*args, **kwargs): """ - GetBestFittingSize(self) -> Size + GetEffectiveMinSize(self) -> Size This function will merge the window's best size into the window's minimum size, giving priority to the min size components, and returns the results. """ - return _core_.Window_GetBestFittingSize(*args, **kwargs) + return _core_.Window_GetEffectiveMinSize(*args, **kwargs) - def GetAdjustedBestSize(*args, **kwargs): - """ - GetAdjustedBestSize(self) -> Size - - This method is similar to GetBestSize, except in one - thing. GetBestSize should return the minimum untruncated size of the - window, while this method will return the largest of BestSize and any - user specified minimum size. ie. it is the minimum size the window - should currently be drawn at, not the minimal size it can possibly - tolerate. - """ - return _core_.Window_GetAdjustedBestSize(*args, **kwargs) + GetBestFittingSize = wx._deprecated(GetEffectiveMinSize, 'Use `GetEffectiveMinSize` instead.') + def GetAdjustedBestSize(self): + s = self.GetBestSize() + return wx.Size(max(s.width, self.GetMinWidth()), + max(s.height, self.GetMinHeight())) + GetAdjustedBestSize = wx._deprecated(GetAdjustedBestSize, 'Use `GetEffectiveMinSize` instead.') def Center(*args, **kwargs): """ @@ -8447,6 +8836,14 @@ class Window(EvtHandler): """ return _core_.Window_GetVirtualSizeTuple(*args, **kwargs) + def GetWindowBorderSize(*args, **kwargs): + """ + GetWindowBorderSize(self) -> Size + + Return the size of the left/right and top/bottom borders. + """ + return _core_.Window_GetWindowBorderSize(*args, **kwargs) + def GetBestVirtualSize(*args, **kwargs): """ GetBestVirtualSize(self) -> Size @@ -8509,9 +8906,21 @@ class Window(EvtHandler): IsEnabled(self) -> bool Returns true if the window is enabled for input, false otherwise. + This method takes into account the enabled state of parent windows up + to the top-level window. """ return _core_.Window_IsEnabled(*args, **kwargs) + def IsThisEnabled(*args, **kwargs): + """ + IsThisEnabled(self) -> bool + + Returns the internal enabled state independent of the parent(s) state, + i.e. the state in which the window would be if all of its parents are + enabled. Use `IsEnabled` to get the effective window state. + """ + return _core_.Window_IsThisEnabled(*args, **kwargs) + def IsShownOnScreen(*args, **kwargs): """ IsShownOnScreen(self) -> bool @@ -8560,6 +8969,15 @@ class Window(EvtHandler): """ return _core_.Window_IsRetained(*args, **kwargs) + def ToggleWindowStyle(*args, **kwargs): + """ + ToggleWindowStyle(self, int flag) -> bool + + Turn the flag on if it had been turned off before and vice versa, + returns True if the flag is turned on by this function call. + """ + return _core_.Window_ToggleWindowStyle(*args, **kwargs) + def SetExtraStyle(*args, **kwargs): """ SetExtraStyle(self, long exStyle) @@ -8647,6 +9065,14 @@ class Window(EvtHandler): """ return _core_.Window_AcceptsFocus(*args, **kwargs) + def CanAcceptFocus(*args, **kwargs): + """ + CanAcceptFocus(self) -> bool + + Can this window have focus right now? + """ + return _core_.Window_CanAcceptFocus(*args, **kwargs) + def AcceptsFocusFromKeyboard(*args, **kwargs): """ AcceptsFocusFromKeyboard(self) -> bool @@ -8657,12 +9083,28 @@ class Window(EvtHandler): """ return _core_.Window_AcceptsFocusFromKeyboard(*args, **kwargs) + def CanAcceptFocusFromKeyboard(*args, **kwargs): + """ + CanAcceptFocusFromKeyboard(self) -> bool + + Can this window be assigned focus from keyboard right now? + """ + return _core_.Window_CanAcceptFocusFromKeyboard(*args, **kwargs) + + def NavigateIn(*args, **kwargs): + """ + NavigateIn(self, int flags=NavigationKeyEvent.IsForward) -> bool + + Navigates inside this window. + """ + return _core_.Window_NavigateIn(*args, **kwargs) + def Navigate(*args, **kwargs): """ Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool - Does keyboard navigation from this window to another, by sending a - `wx.NavigationKeyEvent`. + Does keyboard navigation starting from this window to another. This is + equivalient to self.GetParent().NavigateIn(). """ return _core_.Window_Navigate(*args, **kwargs) @@ -8718,6 +9160,14 @@ class Window(EvtHandler): """ return _core_.Window_GetGrandParent(*args, **kwargs) + def GetTopLevelParent(*args, **kwargs): + """ + GetTopLevelParent(self) -> Window + + Returns the first frame or dialog in this window's parental hierarchy. + """ + return _core_.Window_GetTopLevelParent(*args, **kwargs) + def IsTopLevel(*args, **kwargs): """ IsTopLevel(self) -> bool @@ -9097,7 +9547,7 @@ class Window(EvtHandler): window instead of waiting for the EVT_PAINT event to happen, (normally this would usually only happen when the flow of control returns to the event loop.) Notice that this function doesn't refresh the window and - does nothing if the window has been already repainted. Use Refresh + does nothing if the window has been already repainted. Use `Refresh` first if you want to immediately redraw the window (or some portion of it) unconditionally. """ @@ -9160,6 +9610,17 @@ class Window(EvtHandler): """ return _core_.Window_PrepareDC(*args, **kwargs) + def IsDoubleBuffered(*args, **kwargs): + """ + IsDoubleBuffered(self) -> bool + + Returns ``True`` if the window contents is double-buffered by the + system, i.e. if any drawing done on the window is really done on a + temporary backing surface and transferred to the screen all at once + later. + """ + return _core_.Window_IsDoubleBuffered(*args, **kwargs) + def GetUpdateRegion(*args, **kwargs): """ GetUpdateRegion(self) -> Region @@ -9969,19 +10430,24 @@ class Window(EvtHandler): self.thisown = pre.thisown pre.thisown = 0 if hasattr(self, '_setOORInfo'): - self._setOORInfo(self) + try: + self._setOORInfo(self) + except TypeError: + pass if hasattr(self, '_setCallbackInfo'): - self._setCallbackInfo(self, self.__class__) + try: + self._setCallbackInfo(self, pre.__class__) + except TypeError: + pass def SendSizeEvent(self): self.GetEventHandler().ProcessEvent(wx.SizeEvent((-1,-1))) AcceleratorTable = property(GetAcceleratorTable,SetAcceleratorTable,doc="See `GetAcceleratorTable` and `SetAcceleratorTable`") - AdjustedBestSize = property(GetAdjustedBestSize,doc="See `GetAdjustedBestSize`") AutoLayout = property(GetAutoLayout,SetAutoLayout,doc="See `GetAutoLayout` and `SetAutoLayout`") BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") BackgroundStyle = property(GetBackgroundStyle,SetBackgroundStyle,doc="See `GetBackgroundStyle` and `SetBackgroundStyle`") - BestFittingSize = property(GetBestFittingSize,SetBestFittingSize,doc="See `GetBestFittingSize` and `SetBestFittingSize`") + EffectiveMinSize = property(GetEffectiveMinSize,doc="See `GetEffectiveMinSize`") BestSize = property(GetBestSize,doc="See `GetBestSize`") BestVirtualSize = property(GetBestVirtualSize,doc="See `GetBestVirtualSize`") Border = property(GetBorder,doc="See `GetBorder`") @@ -10002,6 +10468,7 @@ class Window(EvtHandler): Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") ForegroundColour = property(GetForegroundColour,SetForegroundColour,doc="See `GetForegroundColour` and `SetForegroundColour`") GrandParent = property(GetGrandParent,doc="See `GetGrandParent`") + TopLevelParent = property(GetTopLevelParent,doc="See `GetTopLevelParent`") Handle = property(GetHandle,doc="See `GetHandle`") HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`") Id = property(GetId,SetId,doc="See `GetId` and `SetId`") @@ -10222,6 +10689,7 @@ class Validator(EvtHandler): return _core_.Validator_SetBellOnError(*args, **kwargs) SetBellOnError = staticmethod(SetBellOnError) + Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") _core_.Validator_swigregister(Validator) def Validator_IsSilent(*args): @@ -10239,12 +10707,10 @@ class PyValidator(Validator): def __init__(self, *args, **kwargs): """__init__(self) -> PyValidator""" _core_.PyValidator_swiginit(self,_core_.new_PyValidator(*args, **kwargs)) - - self._setCallbackInfo(self, PyValidator, 1) - self._setOORInfo(self) + self._setOORInfo(self);PyValidator._setCallbackInfo(self, self, PyValidator) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=True)""" + """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=1)""" return _core_.PyValidator__setCallbackInfo(*args, **kwargs) _core_.PyValidator_swigregister(PyValidator) @@ -10353,9 +10819,15 @@ class Menu(EvtHandler): """Remove(self, int id) -> MenuItem""" return _core_.Menu_Remove(*args, **kwargs) - def RemoveItem(*args, **kwargs): + def RemoveItem(self, item): """RemoveItem(self, MenuItem item) -> MenuItem""" - return _core_.Menu_RemoveItem(*args, **kwargs) + #// The return object is always the parameter, so return that + #// proxy instead of the new one + val = _core_.Menu_RemoveItem(self, item) + item.this.own(val.this.own()) + val.this.disown() + return item + def Delete(*args, **kwargs): """Delete(self, int id) -> bool""" @@ -10371,29 +10843,16 @@ class Menu(EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - val = _core_.Menu_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _core_.Menu_Destroy(*args, **kwargs) def DestroyId(*args, **kwargs): - """ - DestroyId(self, int id) -> bool - - Deletes the C++ object this Python object is a proxy for. - """ - val = _core_.Menu_DestroyId(*args, **kwargs) - args[0].thisown = 0 - return val + """DestroyId(self, int id) -> bool""" + return _core_.Menu_DestroyId(*args, **kwargs) def DestroyItem(*args, **kwargs): - """ - DestroyItem(self, MenuItem item) -> bool - - Deletes the C++ object this Python object is a proxy for. - """ - val = _core_.Menu_DestroyItem(*args, **kwargs) - args[0].thisown = 0 - return val + """DestroyItem(self, MenuItem item) -> bool""" + return _core_.Menu_DestroyItem(*args, **kwargs) def GetMenuItemCount(*args, **kwargs): """GetMenuItemCount(self) -> size_t""" @@ -10653,7 +11112,6 @@ class MenuBar(Window): self.Append(m, l) Frame = property(GetFrame,doc="See `GetFrame`") - Menu = property(GetMenu,doc="See `GetMenu`") MenuCount = property(GetMenuCount,doc="See `GetMenuCount`") Menus = property(GetMenus,SetMenus,doc="See `GetMenus` and `SetMenus`") _core_.MenuBar_swigregister(MenuBar) @@ -10674,13 +11132,14 @@ class MenuItem(Object): __repr__ = _swig_repr def __init__(self, *args, **kwargs): """ - __init__(self, Menu parentMenu=None, int id=ID_ANY, String text=EmptyString, + __init__(self, Menu parentMenu=None, int id=ID_SEPARATOR, String text=EmptyString, String help=EmptyString, int kind=ITEM_NORMAL, Menu subMenu=None) -> MenuItem """ _core_.MenuItem_swiginit(self,_core_.new_MenuItem(*args, **kwargs)) __swig_destroy__ = _core_.delete_MenuItem __del__ = lambda self : None; + def Destroy(self): pass def GetMenu(*args, **kwargs): """GetMenu(self) -> Menu""" return _core_.MenuItem_GetMenu(*args, **kwargs) @@ -10935,14 +11394,15 @@ class Control(Window): """ return _core_.Control_Command(*args, **kwargs) - def GetLabel(*args, **kwargs): + def RemoveMnemonics(*args, **kwargs): """ - GetLabel(self) -> String + RemoveMnemonics(String str) -> String - Return a control's text. + removes the mnemonics characters """ - return _core_.Control_GetLabel(*args, **kwargs) + return _core_.Control_RemoveMnemonics(*args, **kwargs) + RemoveMnemonics = staticmethod(RemoveMnemonics) def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -10962,7 +11422,6 @@ class Control(Window): GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) Alignment = property(GetAlignment,doc="See `GetAlignment`") - Label = property(GetLabel,doc="See `GetLabel`") LabelText = property(GetLabelText,doc="See `GetLabelText`") _core_.Control_swigregister(Control) ControlNameStr = cvar.ControlNameStr @@ -10976,6 +11435,14 @@ def PreControl(*args, **kwargs): val = _core_.new_PreControl(*args, **kwargs) return val +def Control_RemoveMnemonics(*args, **kwargs): + """ + Control_RemoveMnemonics(String str) -> String + + removes the mnemonics characters + """ + return _core_.Control_RemoveMnemonics(*args, **kwargs) + def Control_GetClassDefaultAttributes(*args, **kwargs): """ Control_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -11037,7 +11504,7 @@ class ItemContainer(object): def Insert(*args, **kwargs): """ - Insert(self, String item, unsigned int pos, PyObject clientData=None) -> int + Insert(self, String item, int pos, PyObject clientData=None) -> int Insert an item into the control before the item at the ``pos`` index, optionally associating some data object with the item. @@ -11054,7 +11521,7 @@ class ItemContainer(object): def Delete(*args, **kwargs): """ - Delete(self, unsigned int n) + Delete(self, int n) Deletes the item at the zero-based index 'n' from the control. Note that it is an error (signalled by a `wx.PyAssertionError` exception if @@ -11065,7 +11532,7 @@ class ItemContainer(object): def GetClientData(*args, **kwargs): """ - GetClientData(self, unsigned int n) -> PyObject + GetClientData(self, int n) -> PyObject Returns the client data associated with the given item, (if any.) """ @@ -11073,7 +11540,7 @@ class ItemContainer(object): def SetClientData(*args, **kwargs): """ - SetClientData(self, unsigned int n, PyObject clientData) + SetClientData(self, int n, PyObject clientData) Associate the given client data with the item at position n. """ @@ -11081,7 +11548,7 @@ class ItemContainer(object): def GetCount(*args, **kwargs): """ - GetCount(self) -> unsigned int + GetCount(self) -> int Returns the number of items in the control. """ @@ -11097,7 +11564,7 @@ class ItemContainer(object): def GetString(*args, **kwargs): """ - GetString(self, unsigned int n) -> String + GetString(self, int n) -> String Returns the label of the item with the given index. """ @@ -11109,7 +11576,7 @@ class ItemContainer(object): def SetString(*args, **kwargs): """ - SetString(self, unsigned int n, String s) + SetString(self, int n, String s) Sets the label for the given item. """ @@ -11196,6 +11663,222 @@ _core_.ControlWithItems_swigregister(ControlWithItems) #--------------------------------------------------------------------------- +class SizerFlags(object): + """ + Normally, when you add an item to a sizer via `wx.Sizer.Add`, you have + to specify a lot of flags and parameters which can be unwieldy. This + is where wx.SizerFlags comes in: it allows you to specify all + parameters using the named methods instead. For example, instead of:: + + sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10) + + you can now write:: + + sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(wx.ALL, 10)) + + This is more readable and also allows you to create wx.SizerFlags + objects which can be reused for several sizer items.:: + + flagsExpand = wx.SizerFlags(1) + flagsExpand.Expand().Border(wx.ALL, 10) + sizer.AddF(ctrl1, flagsExpand) + sizer.AddF(ctrl2, flagsExpand) + + Note that by specification, all methods of wx.SizerFlags return the + wx.SizerFlags object itself allowing chaining multiple method calls + like in the examples above. + """ + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self, int proportion=0) -> SizerFlags + + Constructs the flags object with the specified proportion. + """ + _core_.SizerFlags_swiginit(self,_core_.new_SizerFlags(*args, **kwargs)) + __swig_destroy__ = _core_.delete_SizerFlags + __del__ = lambda self : None; + def Proportion(*args, **kwargs): + """ + Proportion(self, int proportion) -> SizerFlags + + Sets the item's proportion value. + """ + return _core_.SizerFlags_Proportion(*args, **kwargs) + + def Align(*args, **kwargs): + """ + Align(self, int alignment) -> SizerFlags + + Sets the item's alignment + """ + return _core_.SizerFlags_Align(*args, **kwargs) + + def Expand(*args, **kwargs): + """ + Expand(self) -> SizerFlags + + Sets the wx.EXPAND flag, which will cause the item to be expanded to + fill as much space as it is given by the sizer. + """ + return _core_.SizerFlags_Expand(*args, **kwargs) + + def Centre(*args, **kwargs): + """ + Centre(self) -> SizerFlags + + Same as `Center` for those with an alternate dialect of English. + """ + return _core_.SizerFlags_Centre(*args, **kwargs) + + def Center(*args, **kwargs): + """ + Center(self) -> SizerFlags + + Sets the centering alignment flags. + """ + return _core_.SizerFlags_Center(*args, **kwargs) + + def Left(*args, **kwargs): + """ + Left(self) -> SizerFlags + + Aligns the object to the left, a shortcut for calling + Align(wx.ALIGN_LEFT) + """ + return _core_.SizerFlags_Left(*args, **kwargs) + + def Right(*args, **kwargs): + """ + Right(self) -> SizerFlags + + Aligns the object to the right, a shortcut for calling + Align(wx.ALIGN_RIGHT) + """ + return _core_.SizerFlags_Right(*args, **kwargs) + + def Top(*args, **kwargs): + """ + Top(self) -> SizerFlags + + Aligns the object to the top of the available space, a shortcut for + calling Align(wx.ALIGN_TOP) + """ + return _core_.SizerFlags_Top(*args, **kwargs) + + def Bottom(*args, **kwargs): + """ + Bottom(self) -> SizerFlags + + Aligns the object to the bottom of the available space, a shortcut for + calling Align(wx.ALIGN_BOTTOM) + """ + return _core_.SizerFlags_Bottom(*args, **kwargs) + + def Shaped(*args, **kwargs): + """ + Shaped(self) -> SizerFlags + + Sets the wx.SHAPED flag. + """ + return _core_.SizerFlags_Shaped(*args, **kwargs) + + def FixedMinSize(*args, **kwargs): + """ + FixedMinSize(self) -> SizerFlags + + Sets the wx.FIXED_MINSIZE flag. + """ + return _core_.SizerFlags_FixedMinSize(*args, **kwargs) + + def Border(*args, **kwargs): + """ + Border(self, int direction=ALL, int borderInPixels=-1) -> SizerFlags + + Sets the border of the item in the direction(s) or sides given by the + direction parameter. If the borderInPixels value is not given then + the default border size (see `GetDefaultBorder`) will be used. + """ + return _core_.SizerFlags_Border(*args, **kwargs) + + def DoubleBorder(*args, **kwargs): + """ + DoubleBorder(self, int direction=ALL) -> SizerFlags + + Sets the border in the given direction to twice the default border + size. + """ + return _core_.SizerFlags_DoubleBorder(*args, **kwargs) + + def TripleBorder(*args, **kwargs): + """ + TripleBorder(self, int direction=ALL) -> SizerFlags + + Sets the border in the given direction to three times the default + border size. + """ + return _core_.SizerFlags_TripleBorder(*args, **kwargs) + + def HorzBorder(*args, **kwargs): + """ + HorzBorder(self) -> SizerFlags + + Sets the left and right borders to the default border size. + """ + return _core_.SizerFlags_HorzBorder(*args, **kwargs) + + def DoubleHorzBorder(*args, **kwargs): + """ + DoubleHorzBorder(self) -> SizerFlags + + Sets the left and right borders to twice the default border size. + """ + return _core_.SizerFlags_DoubleHorzBorder(*args, **kwargs) + + def GetDefaultBorder(*args, **kwargs): + """ + GetDefaultBorder() -> int + + Returns the default border size used by the other border methods + """ + return _core_.SizerFlags_GetDefaultBorder(*args, **kwargs) + + GetDefaultBorder = staticmethod(GetDefaultBorder) + def GetProportion(*args, **kwargs): + """ + GetProportion(self) -> int + + Returns the proportion value to be used in the sizer item. + """ + return _core_.SizerFlags_GetProportion(*args, **kwargs) + + def GetFlags(*args, **kwargs): + """ + GetFlags(self) -> int + + Returns the flags value to be used in the sizer item. + """ + return _core_.SizerFlags_GetFlags(*args, **kwargs) + + def GetBorderInPixels(*args, **kwargs): + """ + GetBorderInPixels(self) -> int + + Returns the border value in pixels to be used in the sizer item. + """ + return _core_.SizerFlags_GetBorderInPixels(*args, **kwargs) + +_core_.SizerFlags_swigregister(SizerFlags) + +def SizerFlags_GetDefaultBorder(*args): + """ + SizerFlags_GetDefaultBorder() -> int + + Returns the default border size used by the other border methods + """ + return _core_.SizerFlags_GetDefaultBorder(*args) + class SizerItem(Object): """ The wx.SizerItem class is used to track the position, size and other @@ -11415,14 +12098,6 @@ class SizerItem(Object): """ return _core_.SizerItem_GetWindow(*args, **kwargs) - def SetWindow(*args, **kwargs): - """ - SetWindow(self, Window window) - - Set the window to be managed by this sizer item. - """ - return _core_.SizerItem_SetWindow(*args, **kwargs) - def GetSizer(*args, **kwargs): """ GetSizer(self) -> Sizer @@ -11431,6 +12106,22 @@ class SizerItem(Object): """ return _core_.SizerItem_GetSizer(*args, **kwargs) + def GetSpacer(*args, **kwargs): + """ + GetSpacer(self) -> Size + + Get the size of the spacer managed by this sizer item. + """ + return _core_.SizerItem_GetSpacer(*args, **kwargs) + + def SetWindow(*args, **kwargs): + """ + SetWindow(self, Window window) + + Set the window to be managed by this sizer item. + """ + return _core_.SizerItem_SetWindow(*args, **kwargs) + def SetSizer(*args, **kwargs): """ SetSizer(self, Sizer sizer) @@ -11439,21 +12130,41 @@ class SizerItem(Object): """ return _core_.SizerItem_SetSizer(*args, **kwargs) - def GetSpacer(*args, **kwargs): + def SetSpacer(*args, **kwargs): """ - GetSpacer(self) -> Size + SetSpacer(self, Size size) - Get the size of the spacer managed by this sizer item. + Set the size of the spacer to be managed by this sizer item. """ - return _core_.SizerItem_GetSpacer(*args, **kwargs) + return _core_.SizerItem_SetSpacer(*args, **kwargs) - def SetSpacer(*args, **kwargs): + SetWindow = wx._deprecated(SetWindow, "Use `AssignWindow` instead.") + SetSizer = wx._deprecated(SetSizer, "Use `AssignSizer` instead.") + SetSpacer = wx._deprecated(SetSpacer, "Use `AssignSpacer` instead.") + + def AssignWindow(*args, **kwargs): """ - SetSpacer(self, Size size) + AssignWindow(self, Window window) + + Set the window to be managed by this sizer item. + """ + return _core_.SizerItem_AssignWindow(*args, **kwargs) + + def AssignSizer(*args, **kwargs): + """ + AssignSizer(self, Sizer sizer) + + Set the subsizer to be managed by this sizer item. + """ + return _core_.SizerItem_AssignSizer(*args, **kwargs) + + def AssignSpacer(*args, **kwargs): + """ + AssignSpacer(self, Size size) Set the size of the spacer to be managed by this sizer item. """ - return _core_.SizerItem_SetSpacer(*args, **kwargs) + return _core_.SizerItem_AssignSpacer(*args, **kwargs) def Show(*args, **kwargs): """ @@ -11507,10 +12218,10 @@ class SizerItem(Object): Ratio = property(GetRatio,SetRatio,doc="See `GetRatio` and `SetRatio`") Rect = property(GetRect,doc="See `GetRect`") Size = property(GetSize,doc="See `GetSize`") - Sizer = property(GetSizer,SetSizer,doc="See `GetSizer` and `SetSizer`") - Spacer = property(GetSpacer,SetSpacer,doc="See `GetSpacer` and `SetSpacer`") + Sizer = property(GetSizer,AssignSizer,doc="See `GetSizer` and `AssignSizer`") + Spacer = property(GetSpacer,AssignSpacer,doc="See `GetSpacer` and `AssignSpacer`") UserData = property(GetUserData,SetUserData,doc="See `GetUserData` and `SetUserData`") - Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") + Window = property(GetWindow,AssignWindow,doc="See `GetWindow` and `AssignWindow`") _core_.SizerItem_swigregister(SizerItem) def SizerItemWindow(*args, **kwargs): @@ -11591,6 +12302,15 @@ class Sizer(Object): """ return _core_.Sizer_Add(*args, **kwargs) + def AddF(*args, **kwargs): + """ + AddF(self, item, wx.SizerFlags flags) -> wx.SizerItem + + Similar to `Add` but uses the `wx.SizerFlags` convenience class for + setting the various flags, options and borders. + """ + return _core_.Sizer_AddF(*args, **kwargs) + def Insert(*args, **kwargs): """ Insert(self, int before, item, int proportion=0, int flag=0, int border=0, @@ -11601,6 +12321,15 @@ class Sizer(Object): """ return _core_.Sizer_Insert(*args, **kwargs) + def InsertF(*args, **kwargs): + """ + InsertF(self, int before, item, wx.SizerFlags flags) -> wx.SizerItem + + Similar to `Insert`, but uses the `wx.SizerFlags` convenience class + for setting the various flags, options and borders. + """ + return _core_.Sizer_InsertF(*args, **kwargs) + def Prepend(*args, **kwargs): """ Prepend(self, item, int proportion=0, int flag=0, int border=0, @@ -11611,6 +12340,15 @@ class Sizer(Object): """ return _core_.Sizer_Prepend(*args, **kwargs) + def PrependF(*args, **kwargs): + """ + PrependF(self, item, wx.SizerFlags flags) -> wx.SizerItem + + Similar to `Prepend` but uses the `wx.SizerFlags` convenience class + for setting the various flags, options and borders. + """ + return _core_.Sizer_PrependF(*args, **kwargs) + def Remove(*args, **kwargs): """ Remove(self, item) -> bool @@ -11638,7 +12376,7 @@ class Sizer(Object): def GetItem(*args, **kwargs): """ - GetItem(self, item) -> wx.SizerItem + GetItem(self, item, recursive=False) -> wx.SizerItem Returns the `wx.SizerItem` which holds the *item* given. The *item* parameter can be either a window, a sizer, or the zero-based index of @@ -11678,9 +12416,9 @@ class Sizer(Object): """ if isinstance(olditem, wx.Window): return self._ReplaceWin(olditem, item, recursive) - elif isinstnace(olditem, wx.Sizer): + elif isinstance(olditem, wx.Sizer): return self._ReplaceSizer(olditem, item, recursive) - elif isinstnace(olditem, int): + elif isinstance(olditem, int): return self._ReplaceItem(olditem, item) else: raise TypeError("Expected Window, Sizer, or integer for first parameter.") @@ -12092,7 +12830,7 @@ class PySizer(Sizer): class. """ _core_.PySizer_swiginit(self,_core_.new_PySizer(*args, **kwargs)) - self._setCallbackInfo(self, PySizer);self._setOORInfo(self) + self._setOORInfo(self);PySizer._setCallbackInfo(self, self, PySizer) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" @@ -12965,6 +13703,16 @@ class GridBagSizer(FlexGridSizer): """ return _core_.GridBagSizer_FindItem(*args) + def GetItem(self, item): + gbsi = None + si = wx.FlexGridSizer.GetItem(self, item) + if not si: + return None + if type(item) is not int: + gbsi = self.FindItem(item) + if gbsi: return gbsi + return si + def FindItemAtPosition(*args, **kwargs): """ FindItemAtPosition(self, GBPosition pos) -> GBSizerItem @@ -13318,6 +14066,24 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION: import warnings warnings.warn("wxPython/wxWidgets release number mismatch") + +def version(): + """Returns a string containing version and port info""" + ctype = wx.USE_UNICODE and 'unicode' or 'ansi' + if wx.Platform == '__WXMSW__': + port = 'msw' + elif wx.Platform == '__WXMAC__': + port = 'mac' + elif wx.Platform == '__WXGTK__': + port = 'gtk' + if 'gtk2' in wx.PlatformInfo: + port = 'gtk2' + else: + port = '?' + + return "%s (%s-%s)" % (wx.VERSION_STRING, port, ctype) + + #---------------------------------------------------------------------------- # Set wxPython's default string<-->unicode conversion encoding from @@ -13337,7 +14103,10 @@ if default == 'ascii': import locale import codecs try: - default = locale.getdefaultlocale()[1] + if hasattr(locale, 'getpreferredencoding'): + default = locale.getpreferredencoding() + else: + default = locale.getdefaultlocale()[1] codecs.lookup(default) except (ValueError, LookupError, TypeError): default = _sys.getdefaultencoding() @@ -13415,7 +14184,7 @@ def CallAfter(callable, *args, **kw): method calls from non-GUI threads. Any extra positional or keyword args are passed on to the callable when it is called. - :see: `wx.FutureCall` + :see: `wx.CallLater` """ app = wx.GetApp() assert app is not None, 'No wx.App created yet' @@ -13434,7 +14203,7 @@ def CallAfter(callable, *args, **kw): #---------------------------------------------------------------------------- -class FutureCall: +class CallLater: """ A convenience class for `wx.Timer`, that calls the given callable object once after the given amount of milliseconds, passing any @@ -13445,7 +14214,7 @@ class FutureCall: then there is no need to hold a reference to this object. It will hold a reference to itself while the timer is running (the timer has a reference to self.Notify) but the cycle will be broken when - the timer completes, automatically cleaning up the wx.FutureCall + the timer completes, automatically cleaning up the wx.CallLater object. :see: `wx.CallAfter` @@ -13535,6 +14304,9 @@ class FutureCall: Result = property(GetResult) +class FutureCall(CallLater): + """A compatibility alias for `CallLater`.""" + #---------------------------------------------------------------------------- # Control which items in this module should be documented by epydoc. # We allow only classes and functions, which will help reduce the size