X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc46b7f37c8818707e3921ce42892d5c6859c096..365271b573e3d0ab7512471358f98a589f18c104:/wxPython/src/gtk/_core.py diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index 837170a76b..bcdab6ff04 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -205,6 +205,7 @@ ID_HELP_INDEX = _core_.ID_HELP_INDEX ID_HELP_SEARCH = _core_.ID_HELP_SEARCH ID_CLOSE_ALL = _core_.ID_CLOSE_ALL ID_PREFERENCES = _core_.ID_PREFERENCES +ID_EDIT = _core_.ID_EDIT ID_CUT = _core_.ID_CUT ID_COPY = _core_.ID_COPY ID_PASTE = _core_.ID_PASTE @@ -224,6 +225,7 @@ ID_VIEW_SORTDATE = _core_.ID_VIEW_SORTDATE ID_VIEW_SORTNAME = _core_.ID_VIEW_SORTNAME ID_VIEW_SORTSIZE = _core_.ID_VIEW_SORTSIZE ID_VIEW_SORTTYPE = _core_.ID_VIEW_SORTTYPE +ID_FILE = _core_.ID_FILE ID_FILE1 = _core_.ID_FILE1 ID_FILE2 = _core_.ID_FILE2 ID_FILE3 = _core_.ID_FILE3 @@ -275,18 +277,6 @@ ID_ZOOM_OUT = _core_.ID_ZOOM_OUT ID_UNDELETE = _core_.ID_UNDELETE ID_REVERT_TO_SAVED = _core_.ID_REVERT_TO_SAVED ID_HIGHEST = _core_.ID_HIGHEST -ACCEL_ALT = _core_.ACCEL_ALT -ACCEL_CTRL = _core_.ACCEL_CTRL -ACCEL_SHIFT = _core_.ACCEL_SHIFT -ACCEL_NORMAL = _core_.ACCEL_NORMAL -PD_AUTO_HIDE = _core_.PD_AUTO_HIDE -PD_APP_MODAL = _core_.PD_APP_MODAL -PD_CAN_ABORT = _core_.PD_CAN_ABORT -PD_ELAPSED_TIME = _core_.PD_ELAPSED_TIME -PD_ESTIMATED_TIME = _core_.PD_ESTIMATED_TIME -PD_REMAINING_TIME = _core_.PD_REMAINING_TIME -PD_SMOOTH = _core_.PD_SMOOTH -PD_CAN_SKIP = _core_.PD_CAN_SKIP MENU_TEAROFF = _core_.MENU_TEAROFF MB_DOCKABLE = _core_.MB_DOCKABLE NO_FULL_REPAINT_ON_RESIZE = _core_.NO_FULL_REPAINT_ON_RESIZE @@ -688,6 +678,9 @@ MOD_ALL = _core_.MOD_ALL UPDATE_UI_NONE = _core_.UPDATE_UI_NONE UPDATE_UI_RECURSE = _core_.UPDATE_UI_RECURSE UPDATE_UI_FROMIDLE = _core_.UPDATE_UI_FROMIDLE +Layout_Default = _core_.Layout_Default +Layout_LeftToRight = _core_.Layout_LeftToRight +Layout_RightToLeft = _core_.Layout_RightToLeft #--------------------------------------------------------------------------- class Object(object): @@ -712,10 +705,20 @@ 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) _wxPySetDictionary = _core_._wxPySetDictionary cvar = _core_.cvar @@ -741,6 +744,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 @@ -847,6 +851,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) @@ -1190,6 +1202,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) @@ -1330,30 +1358,37 @@ class Rect(object): """ return _core_.Rect___ne__(*args, **kwargs) - def InsideXY(*args, **kwargs): + def ContainsXY(*args, **kwargs): """ - InsideXY(self, int x, int y) -> bool + ContainsXY(self, int x, int y) -> bool - Return True if the point is (not strcitly) inside the rect. + Return True if the point is inside the rect. """ - return _core_.Rect_InsideXY(*args, **kwargs) + return _core_.Rect_ContainsXY(*args, **kwargs) - def Inside(*args, **kwargs): + def Contains(*args, **kwargs): """ - Inside(self, Point pt) -> bool + Contains(self, Point pt) -> bool - Return True if the point is (not strcitly) inside the rect. + Return True if the point is inside the rect. """ - return _core_.Rect_Inside(*args, **kwargs) + return _core_.Rect_Contains(*args, **kwargs) - def InsideRect(*args, **kwargs): + def ContainsRect(*args, **kwargs): """ - InsideRect(self, Rect rect) -> bool + ContainsRect(self, Rect rect) -> bool Returns ``True`` if the given rectangle is completely inside this rectangle or touches its boundary. """ - return _core_.Rect_InsideRect(*args, **kwargs) + 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 = Contains + InsideXY = ContainsXY + InsideRect = ContainsRect def Intersects(*args, **kwargs): """ @@ -1408,6 +1443,21 @@ class Rect(object): __safe_for_unpickling__ = True def __reduce__(self): return (wx.Rect, self.Get()) + 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`") + Right = property(GetRight,SetRight,doc="See `GetRight` and `SetRight`") + 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`") + Empty = property(IsEmpty,doc="See `IsEmpty`") _core_.Rect_swigregister(Rect) def RectPP(*args, **kwargs): @@ -1461,6 +1511,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) @@ -1582,6 +1634,10 @@ class Point2D(object): __safe_for_unpickling__ = True def __reduce__(self): return (wx.Point2D, self.Get()) + Floor = property(GetFloor,doc="See `GetFloor`") + Rounded = property(GetRounded,doc="See `GetRounded`") + VectorAngle = property(GetVectorAngle,SetVectorAngle,doc="See `GetVectorAngle` and `SetVectorAngle`") + VectorLength = property(GetVectorLength,SetVectorLength,doc="See `GetVectorLength` and `SetVectorLength`") _core_.Point2D_swigregister(Point2D) def Point2DCopy(*args, **kwargs): @@ -1604,6 +1660,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 @@ -1717,6 +2027,10 @@ class FSFile(Object): """GetStream(self) -> InputStream""" return _core_.FSFile_GetStream(*args, **kwargs) + def DetachStream(*args, **kwargs): + """DetachStream(self)""" + return _core_.FSFile_DetachStream(*args, **kwargs) + def GetMimeType(*args, **kwargs): """GetMimeType(self) -> String""" return _core_.FSFile_GetMimeType(*args, **kwargs) @@ -1733,6 +2047,11 @@ class FSFile(Object): """GetModificationTime(self) -> DateTime""" return _core_.FSFile_GetModificationTime(*args, **kwargs) + Anchor = property(GetAnchor,doc="See `GetAnchor`") + Location = property(GetLocation,doc="See `GetLocation`") + MimeType = property(GetMimeType,doc="See `GetMimeType`") + ModificationTime = property(GetModificationTime,doc="See `GetModificationTime`") + Stream = property(GetStream,doc="See `GetStream`") _core_.FSFile_swigregister(FSFile) class CPPFileSystemHandler(object): @@ -1751,7 +2070,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)""" @@ -1793,6 +2112,11 @@ class FileSystemHandler(CPPFileSystemHandler): """GetMimeTypeFromExt(self, String location) -> String""" return _core_.FileSystemHandler_GetMimeTypeFromExt(*args, **kwargs) + Anchor = property(GetAnchor,doc="See `GetAnchor`") + LeftLocation = property(GetLeftLocation,doc="See `GetLeftLocation`") + MimeTypeFromExt = property(GetMimeTypeFromExt,doc="See `GetMimeTypeFromExt`") + Protocol = property(GetProtocol,doc="See `GetProtocol`") + RightLocation = property(GetRightLocation,doc="See `GetRightLocation`") _core_.FileSystemHandler_swigregister(FileSystemHandler) class FileSystem(Object): @@ -1829,6 +2153,11 @@ class FileSystem(Object): return _core_.FileSystem_AddHandler(*args, **kwargs) AddHandler = staticmethod(AddHandler) + def RemoveHandler(*args, **kwargs): + """RemoveHandler(CPPFileSystemHandler handler) -> CPPFileSystemHandler""" + return _core_.FileSystem_RemoveHandler(*args, **kwargs) + + RemoveHandler = staticmethod(RemoveHandler) def CleanUpHandlers(*args, **kwargs): """CleanUpHandlers()""" return _core_.FileSystem_CleanUpHandlers(*args, **kwargs) @@ -1844,12 +2173,17 @@ class FileSystem(Object): return _core_.FileSystem_URLToFileName(*args, **kwargs) URLToFileName = staticmethod(URLToFileName) + Path = property(GetPath,doc="See `GetPath`") _core_.FileSystem_swigregister(FileSystem) def FileSystem_AddHandler(*args, **kwargs): """FileSystem_AddHandler(CPPFileSystemHandler handler)""" return _core_.FileSystem_AddHandler(*args, **kwargs) +def FileSystem_RemoveHandler(*args, **kwargs): + """FileSystem_RemoveHandler(CPPFileSystemHandler handler) -> CPPFileSystemHandler""" + return _core_.FileSystem_RemoveHandler(*args, **kwargs) + def FileSystem_CleanUpHandlers(*args): """FileSystem_CleanUpHandlers()""" return _core_.FileSystem_CleanUpHandlers(*args) @@ -1971,6 +2305,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): @@ -2022,6 +2358,10 @@ class ImageHandler(Object): """SetMimeType(self, String mimetype)""" return _core_.ImageHandler_SetMimeType(*args, **kwargs) + Extension = property(GetExtension,SetExtension,doc="See `GetExtension` and `SetExtension`") + MimeType = property(GetMimeType,SetMimeType,doc="See `GetMimeType` and `SetMimeType`") + Name = property(GetName,SetName,doc="See `GetName` and `SetName`") + Type = property(GetType,SetType,doc="See `GetType` and `SetType`") _core_.ImageHandler_swigregister(ImageHandler) class PyImageHandler(ImageHandler): @@ -2245,20 +2585,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 @@ -2269,7 +2650,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. @@ -2533,14 +2914,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 @@ -2918,7 +3300,16 @@ 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`") + DataBuffer = property(GetDataBuffer,SetDataBuffer,doc="See `GetDataBuffer` and `SetDataBuffer`") + Height = property(GetHeight,doc="See `GetHeight`") + MaskBlue = property(GetMaskBlue,doc="See `GetMaskBlue`") + MaskGreen = property(GetMaskGreen,doc="See `GetMaskGreen`") + MaskRed = property(GetMaskRed,doc="See `GetMaskRed`") + Width = property(GetWidth,doc="See `GetWidth`") _core_.Image_swigregister(Image) def ImageFromMime(*args, **kwargs): @@ -3070,12 +3461,11 @@ def _ImageFromBuffer(*args, **kwargs): def ImageFromBuffer(width, height, dataBuffer, alphaBuffer=None): """ Creates a `wx.Image` from the data in dataBuffer. The dataBuffer - parameter must be a Python object that implements the buffer interface, or - is convertable to a buffer object, such as a string, array, etc. The - dataBuffer object is expected to contain a series of RGB bytes and be - width*height*3 bytes long. A buffer object can optionally be supplied for - the image's alpha channel data, and it is expected to be width*height - bytes long. + parameter must be a Python object that implements the buffer interface, + such as a string, array, etc. The dataBuffer object is expected to + contain a series of RGB bytes and be width*height*3 bytes long. A buffer + object can optionally be supplied for the image's alpha channel data, and + it is expected to be width*height bytes long. The wx.Image will be created with its data and alpha pointers initialized to the memory address pointed to by the buffer objects, thus saving the @@ -3093,10 +3483,6 @@ def ImageFromBuffer(width, height, dataBuffer, alphaBuffer=None): the objects used for the data and alpha buffers in a way that would cause them to change size. """ - if not isinstance(dataBuffer, buffer): - dataBuffer = buffer(dataBuffer) - if alphaBuffer is not None and not isinstance(alphaBuffer, buffer): - alphaBuffer = buffer(alphaBuffer) image = _core_._ImageFromBuffer(width, height, dataBuffer, alphaBuffer) image._buffer = dataBuffer image._alpha = alphaBuffer @@ -3282,6 +3668,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): @@ -3321,6 +3720,8 @@ class EvtHandler(Object): def __init__(self, *args, **kwargs): """__init__(self) -> EvtHandler""" _core_.EvtHandler_swiginit(self,_core_.new_EvtHandler(*args, **kwargs)) + self._setOORInfo(self) + def GetNextHandler(*args, **kwargs): """GetNextHandler(self) -> EvtHandler""" return _core_.EvtHandler_GetNextHandler(*args, **kwargs) @@ -3368,7 +3769,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): @@ -3410,6 +3811,9 @@ class EvtHandler(Object): id = source.GetId() return event.Unbind(self, id, id2) + EvtHandlerEnabled = property(GetEvtHandlerEnabled,SetEvtHandlerEnabled,doc="See `GetEvtHandlerEnabled` and `SetEvtHandlerEnabled`") + NextHandler = property(GetNextHandler,SetNextHandler,doc="See `GetNextHandler` and `SetNextHandler`") + PreviousHandler = property(GetPreviousHandler,SetPreviousHandler,doc="See `GetPreviousHandler` and `SetPreviousHandler`") _core_.EvtHandler_swigregister(EvtHandler) #--------------------------------------------------------------------------- @@ -3443,6 +3847,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): """ @@ -3877,14 +4290,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) @@ -3931,6 +4343,11 @@ class Event(Object): """Clone(self) -> Event""" return _core_.Event_Clone(*args, **kwargs) + EventObject = property(GetEventObject,SetEventObject,doc="See `GetEventObject` and `SetEventObject`") + EventType = property(GetEventType,SetEventType,doc="See `GetEventType` and `SetEventType`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") + Skipped = property(GetSkipped,doc="See `GetSkipped`") + Timestamp = property(GetTimestamp,SetTimestamp,doc="See `GetTimestamp` and `SetTimestamp`") _core_.Event_swigregister(Event) #--------------------------------------------------------------------------- @@ -4094,6 +4511,12 @@ class CommandEvent(Event): """Clone(self) -> Event""" return _core_.CommandEvent_Clone(*args, **kwargs) + ClientData = property(GetClientData,SetClientData,doc="See `GetClientData` and `SetClientData`") + ClientObject = property(GetClientObject,SetClientObject,doc="See `GetClientObject` and `SetClientObject`") + ExtraLong = property(GetExtraLong,SetExtraLong,doc="See `GetExtraLong` and `SetExtraLong`") + Int = property(GetInt,SetInt,doc="See `GetInt` and `SetInt`") + Selection = property(GetSelection,doc="See `GetSelection`") + String = property(GetString,SetString,doc="See `GetString` and `SetString`") _core_.CommandEvent_swigregister(CommandEvent) #--------------------------------------------------------------------------- @@ -4193,6 +4616,8 @@ class ScrollEvent(CommandEvent): """SetPosition(self, int pos)""" return _core_.ScrollEvent_SetPosition(*args, **kwargs) + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _core_.ScrollEvent_swigregister(ScrollEvent) #--------------------------------------------------------------------------- @@ -4239,6 +4664,8 @@ class ScrollWinEvent(Event): """SetPosition(self, int pos)""" return _core_.ScrollWinEvent_SetPosition(*args, **kwargs) + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _core_.ScrollWinEvent_swigregister(ScrollWinEvent) #--------------------------------------------------------------------------- @@ -4654,6 +5081,14 @@ class MouseEvent(Event): m_wheelRotation = property(_core_.MouseEvent_m_wheelRotation_get, _core_.MouseEvent_m_wheelRotation_set) m_wheelDelta = property(_core_.MouseEvent_m_wheelDelta_get, _core_.MouseEvent_m_wheelDelta_set) m_linesPerAction = property(_core_.MouseEvent_m_linesPerAction_get, _core_.MouseEvent_m_linesPerAction_set) + Button = property(GetButton,doc="See `GetButton`") + LinesPerAction = property(GetLinesPerAction,doc="See `GetLinesPerAction`") + LogicalPosition = property(GetLogicalPosition,doc="See `GetLogicalPosition`") + Position = property(GetPosition,doc="See `GetPosition`") + WheelDelta = property(GetWheelDelta,doc="See `GetWheelDelta`") + WheelRotation = property(GetWheelRotation,doc="See `GetWheelRotation`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _core_.MouseEvent_swigregister(MouseEvent) #--------------------------------------------------------------------------- @@ -4715,6 +5150,9 @@ class SetCursorEvent(Event): """ return _core_.SetCursorEvent_HasCursor(*args, **kwargs) + Cursor = property(GetCursor,SetCursor,doc="See `GetCursor` and `SetCursor`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _core_.SetCursorEvent_swigregister(SetCursorEvent) #--------------------------------------------------------------------------- @@ -4882,7 +5320,6 @@ class KeyEvent(Event): """ return _core_.KeyEvent_GetKeyCode(*args, **kwargs) - KeyCode = GetKeyCode def GetUnicodeKey(*args, **kwargs): """ GetUnicodeKey(self) -> int @@ -4967,6 +5404,14 @@ class KeyEvent(Event): m_scanCode = property(_core_.KeyEvent_m_scanCode_get, _core_.KeyEvent_m_scanCode_set) m_rawCode = property(_core_.KeyEvent_m_rawCode_get, _core_.KeyEvent_m_rawCode_set) m_rawFlags = property(_core_.KeyEvent_m_rawFlags_get, _core_.KeyEvent_m_rawFlags_set) + KeyCode = property(GetKeyCode,doc="See `GetKeyCode`") + Modifiers = property(GetModifiers,doc="See `GetModifiers`") + Position = property(GetPosition,doc="See `GetPosition`") + RawKeyCode = property(GetRawKeyCode,doc="See `GetRawKeyCode`") + RawKeyFlags = property(GetRawKeyFlags,doc="See `GetRawKeyFlags`") + UnicodeKey = property(GetUnicodeKey,SetUnicodeKey,doc="See `GetUnicodeKey` and `SetUnicodeKey`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _core_.KeyEvent_swigregister(KeyEvent) #--------------------------------------------------------------------------- @@ -5021,6 +5466,8 @@ class SizeEvent(Event): m_size = property(_core_.SizeEvent_m_size_get, _core_.SizeEvent_m_size_set) m_rect = property(_core_.SizeEvent_m_rect_get, _core_.SizeEvent_m_rect_set) + Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") _core_.SizeEvent_swigregister(SizeEvent) #--------------------------------------------------------------------------- @@ -5062,6 +5509,8 @@ class MoveEvent(Event): m_pos = property(GetPosition, SetPosition) m_rect = property(GetRect, SetRect) + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") + Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") _core_.MoveEvent_swigregister(MoveEvent) #--------------------------------------------------------------------------- @@ -5131,6 +5580,7 @@ class EraseEvent(Event): """ return _core_.EraseEvent_GetDC(*args, **kwargs) + DC = property(GetDC,doc="See `GetDC`") _core_.EraseEvent_swigregister(EraseEvent) #--------------------------------------------------------------------------- @@ -5171,15 +5621,21 @@ class FocusEvent(Event): """SetWindow(self, Window win)""" return _core_.FocusEvent_SetWindow(*args, **kwargs) + Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") _core_.FocusEvent_swigregister(FocusEvent) #--------------------------------------------------------------------------- class ChildFocusEvent(CommandEvent): """ - wx.ChildFocusEvent notifies the parent that a child has received the - focus. Unlike `wx.FocusEvent` it is propagated up the window - heirarchy. + A child focus event is sent to a (parent-)window when one of its child + windows gains focus, so that the window could restore the focus back + to its corresponding child if it loses it now and regains later. + + Notice that child window is the direct child of the window receiving + the event, and so may not be the actual widget recieving focus if it + is further down the containment heirarchy. Use `wx.Window.FindFocus` + to get the widget that is actually receiving focus. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr @@ -5194,10 +5650,12 @@ class ChildFocusEvent(CommandEvent): """ GetWindow(self) -> Window - The window which has just received the focus. + The window, or (grand)parent of the window which has just received the + focus. """ return _core_.ChildFocusEvent_GetWindow(*args, **kwargs) + Window = property(GetWindow,doc="See `GetWindow`") _core_.ChildFocusEvent_swigregister(ChildFocusEvent) #--------------------------------------------------------------------------- @@ -5237,6 +5695,7 @@ class ActivateEvent(Event): """ return _core_.ActivateEvent_GetActive(*args, **kwargs) + Active = property(GetActive,doc="See `GetActive`") _core_.ActivateEvent_swigregister(ActivateEvent) #--------------------------------------------------------------------------- @@ -5308,6 +5767,8 @@ class MenuEvent(Event): """ return _core_.MenuEvent_GetMenu(*args, **kwargs) + Menu = property(GetMenu,doc="See `GetMenu`") + MenuId = property(GetMenuId,doc="See `GetMenuId`") _core_.MenuEvent_swigregister(MenuEvent) #--------------------------------------------------------------------------- @@ -5397,6 +5858,7 @@ class CloseEvent(Event): """ return _core_.CloseEvent_CanVeto(*args, **kwargs) + LoggingOff = property(GetLoggingOff,SetLoggingOff,doc="See `GetLoggingOff` and `SetLoggingOff`") _core_.CloseEvent_swigregister(CloseEvent) #--------------------------------------------------------------------------- @@ -5420,6 +5882,7 @@ class ShowEvent(Event): """GetShow(self) -> bool""" return _core_.ShowEvent_GetShow(*args, **kwargs) + Show = property(GetShow,SetShow,doc="See `GetShow` and `SetShow`") _core_.ShowEvent_swigregister(ShowEvent) #--------------------------------------------------------------------------- @@ -5510,6 +5973,9 @@ class DropFilesEvent(Event): """ return _core_.DropFilesEvent_GetFiles(*args, **kwargs) + Files = property(GetFiles,doc="See `GetFiles`") + NumberOfFiles = property(GetNumberOfFiles,doc="See `GetNumberOfFiles`") + Position = property(GetPosition,doc="See `GetPosition`") _core_.DropFilesEvent_swigregister(DropFilesEvent) #--------------------------------------------------------------------------- @@ -5769,6 +6235,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): @@ -5912,6 +6382,7 @@ class MouseCaptureChangedEvent(Event): """ return _core_.MouseCaptureChangedEvent_GetCapturedWindow(*args, **kwargs) + CapturedWindow = property(GetCapturedWindow,doc="See `GetCapturedWindow`") _core_.MouseCaptureChangedEvent_swigregister(MouseCaptureChangedEvent) #--------------------------------------------------------------------------- @@ -6002,6 +6473,7 @@ class PaletteChangedEvent(Event): """GetChangedWindow(self) -> Window""" return _core_.PaletteChangedEvent_GetChangedWindow(*args, **kwargs) + ChangedWindow = property(GetChangedWindow,SetChangedWindow,doc="See `GetChangedWindow` and `SetChangedWindow`") _core_.PaletteChangedEvent_swigregister(PaletteChangedEvent) #--------------------------------------------------------------------------- @@ -6034,6 +6506,7 @@ class QueryNewPaletteEvent(Event): """GetPaletteRealized(self) -> bool""" return _core_.QueryNewPaletteEvent_GetPaletteRealized(*args, **kwargs) + PaletteRealized = property(GetPaletteRealized,SetPaletteRealized,doc="See `GetPaletteRealized` and `SetPaletteRealized`") _core_.QueryNewPaletteEvent_swigregister(QueryNewPaletteEvent) #--------------------------------------------------------------------------- @@ -6141,6 +6614,8 @@ class NavigationKeyEvent(Event): IsForward = _core_.NavigationKeyEvent_IsForward WinChange = _core_.NavigationKeyEvent_WinChange FromTab = _core_.NavigationKeyEvent_FromTab + CurrentFocus = property(GetCurrentFocus,SetCurrentFocus,doc="See `GetCurrentFocus` and `SetCurrentFocus`") + Direction = property(GetDirection,SetDirection,doc="See `GetDirection` and `SetDirection`") _core_.NavigationKeyEvent_swigregister(NavigationKeyEvent) #--------------------------------------------------------------------------- @@ -6168,6 +6643,7 @@ class WindowCreateEvent(CommandEvent): """ return _core_.WindowCreateEvent_GetWindow(*args, **kwargs) + Window = property(GetWindow,doc="See `GetWindow`") _core_.WindowCreateEvent_swigregister(WindowCreateEvent) class WindowDestroyEvent(CommandEvent): @@ -6207,6 +6683,7 @@ class WindowDestroyEvent(CommandEvent): """ return _core_.WindowDestroyEvent_GetWindow(*args, **kwargs) + Window = property(GetWindow,doc="See `GetWindow`") _core_.WindowDestroyEvent_swigregister(WindowDestroyEvent) #--------------------------------------------------------------------------- @@ -6242,6 +6719,7 @@ class ContextMenuEvent(CommandEvent): """ return _core_.ContextMenuEvent_SetPosition(*args, **kwargs) + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _core_.ContextMenuEvent_swigregister(ContextMenuEvent) #--------------------------------------------------------------------------- @@ -6510,6 +6988,7 @@ class DateEvent(CommandEvent): """ return _core_.DateEvent_SetDate(*args, **kwargs) + Date = property(GetDate,SetDate,doc="See `GetDate` and `SetDate`") _core_.DateEvent_swigregister(DateEvent) wxEVT_DATE_CHANGED = _core_.wxEVT_DATE_CHANGED @@ -6537,13 +7016,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): @@ -6677,6 +7155,14 @@ class PyApp(EvtHandler): """ return _core_.PyApp_Exit(*args, **kwargs) + def GetLayoutDirection(*args, **kwargs): + """ + GetLayoutDirection(self) -> int + + Return the layout direction for the current locale. + """ + return _core_.PyApp_GetLayoutDirection(*args, **kwargs) + def ExitMainLoop(*args, **kwargs): """ ExitMainLoop(self) @@ -6770,7 +7256,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.) @@ -6877,9 +7363,9 @@ class PyApp(EvtHandler): return _core_.PyApp_GetComCtl32Version(*args, **kwargs) GetComCtl32Version = staticmethod(GetComCtl32Version) - def DisplayAvailable(*args, **kwargs): + def IsDisplayAvailable(*args, **kwargs): """ - DisplayAvailable() -> bool + IsDisplayAvailable() -> bool Tests if it is possible to create a GUI in the current environment. This will mean different things on the different platforms. @@ -6896,9 +7382,20 @@ class PyApp(EvtHandler): * On MS Windows... """ - return _core_.PyApp_DisplayAvailable(*args, **kwargs) - - DisplayAvailable = staticmethod(DisplayAvailable) + return _core_.PyApp_IsDisplayAvailable(*args, **kwargs) + + IsDisplayAvailable = staticmethod(IsDisplayAvailable) + AppName = property(GetAppName,SetAppName,doc="See `GetAppName` and `SetAppName`") + AssertMode = property(GetAssertMode,SetAssertMode,doc="See `GetAssertMode` and `SetAssertMode`") + ClassName = property(GetClassName,SetClassName,doc="See `GetClassName` and `SetClassName`") + ExitOnFrameDelete = property(GetExitOnFrameDelete,SetExitOnFrameDelete,doc="See `GetExitOnFrameDelete` and `SetExitOnFrameDelete`") + LayoutDirection = property(GetLayoutDirection,doc="See `GetLayoutDirection`") + PrintMode = property(GetPrintMode,SetPrintMode,doc="See `GetPrintMode` and `SetPrintMode`") + TopWindow = property(GetTopWindow,SetTopWindow,doc="See `GetTopWindow` and `SetTopWindow`") + Traits = property(GetTraits,doc="See `GetTraits`") + UseBestVisual = property(GetUseBestVisual,SetUseBestVisual,doc="See `GetUseBestVisual` and `SetUseBestVisual`") + VendorName = property(GetVendorName,SetVendorName,doc="See `GetVendorName` and `SetVendorName`") + Active = property(IsActive) _core_.PyApp_swigregister(PyApp) def PyApp_IsMainLoopRunning(*args): @@ -6959,9 +7456,9 @@ def PyApp_GetComCtl32Version(*args): """ return _core_.PyApp_GetComCtl32Version(*args) -def PyApp_DisplayAvailable(*args): +def PyApp_IsDisplayAvailable(*args): """ - PyApp_DisplayAvailable() -> bool + PyApp_IsDisplayAvailable() -> bool Tests if it is possible to create a GUI in the current environment. This will mean different things on the different platforms. @@ -6978,7 +7475,7 @@ def PyApp_DisplayAvailable(*args): * On MS Windows... """ - return _core_.PyApp_DisplayAvailable(*args) + return _core_.PyApp_IsDisplayAvailable(*args) #--------------------------------------------------------------------------- @@ -7211,7 +7708,7 @@ class App(wx.PyApp): wx.PyApp.__init__(self) # make sure we can create a GUI - if not self.DisplayAvailable(): + if not self.IsDisplayAvailable(): if wx.Platform == "__WXMAC__": msg = """This program needs access to the screen. @@ -7252,6 +7749,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() @@ -7271,8 +7771,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""" @@ -7461,6 +7961,11 @@ _core_.EventLoopActivator_swigregister(EventLoopActivator) #--------------------------------------------------------------------------- +ACCEL_ALT = _core_.ACCEL_ALT +ACCEL_CTRL = _core_.ACCEL_CTRL +ACCEL_SHIFT = _core_.ACCEL_SHIFT +ACCEL_NORMAL = _core_.ACCEL_NORMAL +ACCEL_CMD = _core_.ACCEL_CMD class AcceleratorEntry(object): """ A class used to define items in an `wx.AcceleratorTable`. wxPython @@ -7490,6 +7995,16 @@ class AcceleratorEntry(object): """ return _core_.AcceleratorEntry_Set(*args, **kwargs) + def Create(*args, **kwargs): + """ + Create(String str) -> AcceleratorEntry + + Create accelerator corresponding to the specified string, or None if + it coulnd't be parsed. + """ + return _core_.AcceleratorEntry_Create(*args, **kwargs) + + Create = staticmethod(Create) def GetFlags(*args, **kwargs): """ GetFlags(self) -> int @@ -7514,8 +8029,43 @@ class AcceleratorEntry(object): """ return _core_.AcceleratorEntry_GetCommand(*args, **kwargs) + def IsOk(*args, **kwargs): + """IsOk(self) -> bool""" + return _core_.AcceleratorEntry_IsOk(*args, **kwargs) + + def ToString(*args, **kwargs): + """ + ToString(self) -> String + + Returns a string representation for the this accelerator. The string + is formatted using the - format where maybe a + hyphen-separed list of "shift|alt|ctrl" + + """ + return _core_.AcceleratorEntry_ToString(*args, **kwargs) + + def FromString(*args, **kwargs): + """ + FromString(self, String str) -> bool + + Returns true if the given string correctly initialized this object. + """ + return _core_.AcceleratorEntry_FromString(*args, **kwargs) + + Command = property(GetCommand,doc="See `GetCommand`") + Flags = property(GetFlags,doc="See `GetFlags`") + KeyCode = property(GetKeyCode,doc="See `GetKeyCode`") _core_.AcceleratorEntry_swigregister(AcceleratorEntry) +def AcceleratorEntry_Create(*args, **kwargs): + """ + AcceleratorEntry_Create(String str) -> AcceleratorEntry + + Create accelerator corresponding to the specified string, or None if + it coulnd't be parsed. + """ + return _core_.AcceleratorEntry_Create(*args, **kwargs) + class AcceleratorTable(Object): """ An accelerator table allows the application to specify a table of @@ -7537,10 +8087,11 @@ 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) @@ -7627,9 +8178,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): """ @@ -7752,6 +8302,32 @@ class Window(EvtHandler): return _core_.Window_PrevControlId(*args, **kwargs) PrevControlId = staticmethod(PrevControlId) + def GetLayoutDirection(*args, **kwargs): + """ + GetLayoutDirection(self) -> int + + Get the layout direction (LTR or RTL) for this window. Returns + ``wx.Layout_Default`` if layout direction is not supported. + """ + return _core_.Window_GetLayoutDirection(*args, **kwargs) + + def SetLayoutDirection(*args, **kwargs): + """ + SetLayoutDirection(self, int dir) + + Set the layout direction (LTR or RTL) for this window. + """ + return _core_.Window_SetLayoutDirection(*args, **kwargs) + + def AdjustForLayoutDirection(*args, **kwargs): + """ + AdjustForLayoutDirection(self, int x, int width, int widthTotal) -> int + + Mirror coordinates for RTL layout if this window uses it and if the + mirroring is not done automatically like Win32. + """ + return _core_.Window_AdjustForLayoutDirection(*args, **kwargs) + def SetSize(*args, **kwargs): """ SetSize(self, Size size) @@ -7814,21 +8390,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) @@ -7837,7 +8414,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) @@ -8030,29 +8607,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): """ @@ -8238,6 +8809,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 @@ -8303,6 +8882,16 @@ class Window(EvtHandler): """ return _core_.Window_IsEnabled(*args, **kwargs) + def IsShownOnScreen(*args, **kwargs): + """ + IsShownOnScreen(self) -> bool + + Returns ``True`` if the window is physically visible on the screen, + i.e. it is shown and all its parents up to the toplevel window are + shown as well. + """ + return _core_.Window_IsShownOnScreen(*args, **kwargs) + def SetWindowStyleFlag(*args, **kwargs): """ SetWindowStyleFlag(self, long style) @@ -8341,6 +8930,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) @@ -8578,14 +9176,16 @@ class Window(EvtHandler): SetEventHandler(self, EvtHandler handler) Sets the event handler for this window. An event handler is an object - that is capable of processing the events sent to a window. By default, - the window is its own event handler, but an application may wish to - substitute another, for example to allow central implementation of - event-handling for a variety of different window classes. + that is capable of processing the events sent to a window. (In other + words, is able to dispatch the events to handler function.) By + default, the window is its own event handler, but an application may + wish to substitute another, for example to allow central + implementation of event-handling for a variety of different window + classes. It is usually better to use `wx.Window.PushEventHandler` since this sets up a chain of event handlers, where an event not handled by one event - handler is handed to the next one in the chain. + handler is handed off to the next one in the chain. """ return _core_.Window_SetEventHandler(*args, **kwargs) @@ -8595,15 +9195,19 @@ class Window(EvtHandler): Pushes this event handler onto the event handler stack for the window. An event handler is an object that is capable of processing the events - sent to a window. By default, the window is its own event handler, but - an application may wish to substitute another, for example to allow - central implementation of event-handling for a variety of different - window classes. + sent to a window. (In other words, is able to dispatch the events to + handler function.) By default, the window is its own event handler, + but an application may wish to substitute another, for example to + allow central implementation of event-handling for a variety of + different window classes. wx.Window.PushEventHandler allows an application to set up a chain of event handlers, where an event not handled by one event handler is - handed to the next one in the chain. Use `wx.Window.PopEventHandler` to - remove the event handler. + handed to the next one in the chain. Use `wx.Window.PopEventHandler` + to remove the event handler. Ownership of the handler is *not* given + to the window, so you should be sure to pop the handler before the + window is destroyed and either let PopEventHandler destroy it, or call + its Destroy method yourself. """ return _core_.Window_PushEventHandler(*args, **kwargs) @@ -8613,7 +9217,7 @@ class Window(EvtHandler): Removes and returns the top-most event handler on the event handler stack. If deleteHandler is True then the wx.EvtHandler object will be - destroyed after it is popped. + destroyed after it is popped, and ``None`` will be returned instead. """ return _core_.Window_PopEventHandler(*args, **kwargs) @@ -8622,7 +9226,7 @@ class Window(EvtHandler): RemoveEventHandler(self, EvtHandler handler) -> bool Find the given handler in the event handler chain and remove (but not - delete) it from the event handler chain, return True if it was found + delete) it from the event handler chain, returns True if it was found and False otherwise (this also results in an assert failure so this function should only be called when the handler is supposed to be there.) @@ -8872,7 +9476,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. """ @@ -8905,6 +9509,16 @@ class Window(EvtHandler): """ return _core_.Window_Freeze(*args, **kwargs) + def IsFrozen(*args, **kwargs): + """ + IsFrozen(self) -> bool + + Returns ``True`` if the window has been frozen and not thawed yet. + + :see: `Freeze` and `Thaw` + """ + return _core_.Window_IsFrozen(*args, **kwargs) + def Thaw(*args, **kwargs): """ Thaw(self) @@ -8925,6 +9539,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 @@ -9732,11 +10357,67 @@ class Window(EvtHandler): if hasattr(self, '_setOORInfo'): self._setOORInfo(self) if hasattr(self, '_setCallbackInfo'): - self._setCallbackInfo(self, self.__class__) + self._setCallbackInfo(self, pre.__class__) def SendSizeEvent(self): self.GetEventHandler().ProcessEvent(wx.SizeEvent((-1,-1))) + AcceleratorTable = property(GetAcceleratorTable,SetAcceleratorTable,doc="See `GetAcceleratorTable` and `SetAcceleratorTable`") + 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`") + EffectiveMinSize = property(GetEffectiveMinSize,doc="See `GetEffectiveMinSize`") + BestSize = property(GetBestSize,doc="See `GetBestSize`") + BestVirtualSize = property(GetBestVirtualSize,doc="See `GetBestVirtualSize`") + Border = property(GetBorder,doc="See `GetBorder`") + Caret = property(GetCaret,SetCaret,doc="See `GetCaret` and `SetCaret`") + CharHeight = property(GetCharHeight,doc="See `GetCharHeight`") + CharWidth = property(GetCharWidth,doc="See `GetCharWidth`") + Children = property(GetChildren,doc="See `GetChildren`") + ClientAreaOrigin = property(GetClientAreaOrigin,doc="See `GetClientAreaOrigin`") + ClientRect = property(GetClientRect,SetClientRect,doc="See `GetClientRect` and `SetClientRect`") + ClientSize = property(GetClientSize,SetClientSize,doc="See `GetClientSize` and `SetClientSize`") + Constraints = property(GetConstraints,SetConstraints,doc="See `GetConstraints` and `SetConstraints`") + ContainingSizer = property(GetContainingSizer,SetContainingSizer,doc="See `GetContainingSizer` and `SetContainingSizer`") + Cursor = property(GetCursor,SetCursor,doc="See `GetCursor` and `SetCursor`") + DefaultAttributes = property(GetDefaultAttributes,doc="See `GetDefaultAttributes`") + DropTarget = property(GetDropTarget,SetDropTarget,doc="See `GetDropTarget` and `SetDropTarget`") + EventHandler = property(GetEventHandler,SetEventHandler,doc="See `GetEventHandler` and `SetEventHandler`") + ExtraStyle = property(GetExtraStyle,SetExtraStyle,doc="See `GetExtraStyle` and `SetExtraStyle`") + Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") + ForegroundColour = property(GetForegroundColour,SetForegroundColour,doc="See `GetForegroundColour` and `SetForegroundColour`") + GrandParent = property(GetGrandParent,doc="See `GetGrandParent`") + Handle = property(GetHandle,doc="See `GetHandle`") + HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") + Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") + LayoutDirection = property(GetLayoutDirection,SetLayoutDirection,doc="See `GetLayoutDirection` and `SetLayoutDirection`") + MaxHeight = property(GetMaxHeight,doc="See `GetMaxHeight`") + MaxSize = property(GetMaxSize,SetMaxSize,doc="See `GetMaxSize` and `SetMaxSize`") + MaxWidth = property(GetMaxWidth,doc="See `GetMaxWidth`") + MinHeight = property(GetMinHeight,doc="See `GetMinHeight`") + MinSize = property(GetMinSize,SetMinSize,doc="See `GetMinSize` and `SetMinSize`") + MinWidth = property(GetMinWidth,doc="See `GetMinWidth`") + Name = property(GetName,SetName,doc="See `GetName` and `SetName`") + Parent = property(GetParent,doc="See `GetParent`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") + Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") + ScreenPosition = property(GetScreenPosition,doc="See `GetScreenPosition`") + ScreenRect = property(GetScreenRect,doc="See `GetScreenRect`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") + Sizer = property(GetSizer,SetSizer,doc="See `GetSizer` and `SetSizer`") + ThemeEnabled = property(GetThemeEnabled,SetThemeEnabled,doc="See `GetThemeEnabled` and `SetThemeEnabled`") + ToolTip = property(GetToolTip,SetToolTip,doc="See `GetToolTip` and `SetToolTip`") + UpdateClientRect = property(GetUpdateClientRect,doc="See `GetUpdateClientRect`") + UpdateRegion = property(GetUpdateRegion,doc="See `GetUpdateRegion`") + Validator = property(GetValidator,SetValidator,doc="See `GetValidator` and `SetValidator`") + VirtualSize = property(GetVirtualSize,SetVirtualSize,doc="See `GetVirtualSize` and `SetVirtualSize`") + WindowStyle = property(GetWindowStyle,SetWindowStyle,doc="See `GetWindowStyle` and `SetWindowStyle`") + WindowStyleFlag = property(GetWindowStyleFlag,SetWindowStyleFlag,doc="See `GetWindowStyleFlag` and `SetWindowStyleFlag`") + WindowVariant = property(GetWindowVariant,SetWindowVariant,doc="See `GetWindowVariant` and `SetWindowVariant`") + Shown = property(IsShown,Show,doc="See `IsShown` and `Show`") + Enabled = property(IsEnabled,Enable,doc="See `IsEnabled` and `Enable`") + TopLevel = property(IsTopLevel,doc="See `IsTopLevel`") _core_.Window_swigregister(Window) def PreWindow(*args, **kwargs): @@ -9926,6 +10607,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): @@ -9943,12 +10625,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) @@ -9965,7 +10645,10 @@ class Menu(EvtHandler): self._setOORInfo(self) def Append(*args, **kwargs): - """Append(self, int id, String text, String help=EmptyString, int kind=ITEM_NORMAL) -> MenuItem""" + """ + Append(self, int id, String text=EmptyString, String help=EmptyString, + int kind=ITEM_NORMAL) -> MenuItem + """ return _core_.Menu_Append(*args, **kwargs) def AppendSeparator(*args, **kwargs): @@ -10006,7 +10689,7 @@ class Menu(EvtHandler): def Insert(*args, **kwargs): """ - Insert(self, size_t pos, int id, String text, String help=EmptyString, + Insert(self, size_t pos, int id, String text=EmptyString, String help=EmptyString, int kind=ITEM_NORMAL) -> MenuItem """ return _core_.Menu_Insert(*args, **kwargs) @@ -10028,7 +10711,10 @@ class Menu(EvtHandler): return _core_.Menu_InsertMenu(*args, **kwargs) def Prepend(*args, **kwargs): - """Prepend(self, int id, String text, String help=EmptyString, int kind=ITEM_NORMAL) -> MenuItem""" + """ + Prepend(self, int id, String text=EmptyString, String help=EmptyString, + int kind=ITEM_NORMAL) -> MenuItem + """ return _core_.Menu_Prepend(*args, **kwargs) def PrependSeparator(*args, **kwargs): @@ -10051,9 +10737,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""" @@ -10069,29 +10761,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""" @@ -10201,6 +10880,15 @@ class Menu(EvtHandler): """GetParent(self) -> Menu""" return _core_.Menu_GetParent(*args, **kwargs) + EventHandler = property(GetEventHandler,SetEventHandler,doc="See `GetEventHandler` and `SetEventHandler`") + HelpString = property(GetHelpString,SetHelpString,doc="See `GetHelpString` and `SetHelpString`") + InvokingWindow = property(GetInvokingWindow,SetInvokingWindow,doc="See `GetInvokingWindow` and `SetInvokingWindow`") + MenuBar = property(GetMenuBar,doc="See `GetMenuBar`") + MenuItemCount = property(GetMenuItemCount,doc="See `GetMenuItemCount`") + MenuItems = property(GetMenuItems,doc="See `GetMenuItems`") + Parent = property(GetParent,SetParent,doc="See `GetParent` and `SetParent`") + Style = property(GetStyle,doc="See `GetStyle`") + Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") _core_.Menu_swigregister(Menu) DefaultValidator = cvar.DefaultValidator @@ -10329,6 +11017,22 @@ class MenuBar(Window): return _core_.MenuBar_GetAutoWindowMenu(*args, **kwargs) GetAutoWindowMenu = staticmethod(GetAutoWindowMenu) + def GetMenus(self): + """Return a list of (menu, label) items for the menus in the MenuBar. """ + return [(self.GetMenu(i), self.GetLabelTop(i)) + for i in range(self.GetMenuCount())] + + def SetMenus(self, items): + """Clear and add new menus to the MenuBar from a list of (menu, label) items. """ + for i in range(self.GetMenuCount()-1, -1, -1): + self.Remove(i) + for m, l in items: + 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) def MenuBar_SetAutoWindowMenu(*args, **kwargs): @@ -10347,13 +11051,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) @@ -10524,6 +11229,20 @@ class MenuItem(Object): """ResetOwnerDrawn(self)""" return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs) + Accel = property(GetAccel,SetAccel,doc="See `GetAccel` and `SetAccel`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") + DisabledBitmap = property(GetDisabledBitmap,SetDisabledBitmap,doc="See `GetDisabledBitmap` and `SetDisabledBitmap`") + Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") + Help = property(GetHelp,SetHelp,doc="See `GetHelp` and `SetHelp`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") + Kind = property(GetKind,SetKind,doc="See `GetKind` and `SetKind`") + Label = property(GetLabel,doc="See `GetLabel`") + MarginWidth = property(GetMarginWidth,SetMarginWidth,doc="See `GetMarginWidth` and `SetMarginWidth`") + Menu = property(GetMenu,SetMenu,doc="See `GetMenu` and `SetMenu`") + SubMenu = property(GetSubMenu,SetSubMenu,doc="See `GetSubMenu` and `SetSubMenu`") + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") _core_.MenuItem_swigregister(MenuItem) def MenuItem_GetLabelFromText(*args, **kwargs): @@ -10594,14 +11313,6 @@ class Control(Window): """ return _core_.Control_Command(*args, **kwargs) - def GetLabel(*args, **kwargs): - """ - GetLabel(self) -> String - - Return a control's text. - """ - return _core_.Control_GetLabel(*args, **kwargs) - def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -10620,6 +11331,8 @@ class Control(Window): return _core_.Control_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Alignment = property(GetAlignment,doc="See `GetAlignment`") + LabelText = property(GetLabelText,doc="See `GetLabelText`") _core_.Control_swigregister(Control) ControlNameStr = cvar.ControlNameStr @@ -10693,7 +11406,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. @@ -10710,7 +11423,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 @@ -10721,7 +11434,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.) """ @@ -10729,7 +11442,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. """ @@ -10737,7 +11450,7 @@ class ItemContainer(object): def GetCount(*args, **kwargs): """ - GetCount(self) -> unsigned int + GetCount(self) -> int Returns the number of items in the control. """ @@ -10753,7 +11466,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. """ @@ -10765,7 +11478,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. """ @@ -10820,6 +11533,21 @@ class ItemContainer(object): """ return _core_.ItemContainer_Select(*args, **kwargs) + def GetItems(self): + """Return a list of the strings in the control""" + return [self.GetString(i) for i in xrange(self.GetCount())] + + def SetItems(self, items): + """Clear and set the strings in the control from a list""" + self.Clear() + for i in items: + self.Append(i) + + Count = property(GetCount,doc="See `GetCount`") + Items = property(GetItems,SetItems,doc="See `GetItems` and `SetItems`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + StringSelection = property(GetStringSelection,SetStringSelection,doc="See `GetStringSelection` and `SetStringSelection`") + Strings = property(GetStrings,doc="See `GetStrings`") _core_.ItemContainer_swigregister(ItemContainer) #--------------------------------------------------------------------------- @@ -11139,6 +11867,19 @@ class SizerItem(Object): """ return _core_.SizerItem_SetUserData(*args, **kwargs) + Border = property(GetBorder,SetBorder,doc="See `GetBorder` and `SetBorder`") + Flag = property(GetFlag,SetFlag,doc="See `GetFlag` and `SetFlag`") + MinSize = property(GetMinSize,doc="See `GetMinSize`") + MinSizeWithBorder = property(GetMinSizeWithBorder,doc="See `GetMinSizeWithBorder`") + Position = property(GetPosition,doc="See `GetPosition`") + Proportion = property(GetProportion,SetProportion,doc="See `GetProportion` and `SetProportion`") + 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`") + UserData = property(GetUserData,SetUserData,doc="See `GetUserData` and `SetUserData`") + Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") _core_.SizerItem_swigregister(SizerItem) def SizerItemWindow(*args, **kwargs): @@ -11278,6 +12019,57 @@ class Sizer(Object): """_SetItemMinSize(self, PyObject item, Size size)""" return _core_.Sizer__SetItemMinSize(*args, **kwargs) + def _ReplaceWin(*args, **kwargs): + """_ReplaceWin(self, Window oldwin, Window newwin, bool recursive=False) -> bool""" + return _core_.Sizer__ReplaceWin(*args, **kwargs) + + def _ReplaceSizer(*args, **kwargs): + """_ReplaceSizer(self, Sizer oldsz, Sizer newsz, bool recursive=False) -> bool""" + return _core_.Sizer__ReplaceSizer(*args, **kwargs) + + def _ReplaceItem(*args, **kwargs): + """_ReplaceItem(self, size_t index, SizerItem newitem) -> bool""" + return _core_.Sizer__ReplaceItem(*args, **kwargs) + + def Replace(self, olditem, item, recursive=False): + """ + Detaches the given ``olditem`` from the sizer and replaces it with + ``item`` which can be a window, sizer, or `wx.SizerItem`. The + detached child is destroyed only if it is not a window, (because + windows are owned by their parent, not the sizer.) The + ``recursive`` parameter can be used to search for the given + element recursivly in subsizers. + + This method does not cause any layout or resizing to take place, + call `Layout` to do so. + + Returns ``True`` if the child item was found and removed. + """ + if isinstance(olditem, wx.Window): + return self._ReplaceWin(olditem, item, recursive) + elif isinstnace(olditem, wx.Sizer): + return self._ReplaceSizer(olditem, item, recursive) + elif isinstnace(olditem, int): + return self._ReplaceItem(olditem, item) + else: + raise TypeError("Expected Window, Sizer, or integer for first parameter.") + + def SetContainingWindow(*args, **kwargs): + """ + SetContainingWindow(self, Window window) + + Set (or unset) the window this sizer is used in. + """ + return _core_.Sizer_SetContainingWindow(*args, **kwargs) + + def GetContainingWindow(*args, **kwargs): + """ + GetContainingWindow(self) -> Window + + Get the window this sizer is used in. + """ + return _core_.Sizer_GetContainingWindow(*args, **kwargs) + def SetItemMinSize(self, item, *args): """ SetItemMinSize(self, item, Size size) @@ -11329,6 +12121,50 @@ class Sizer(Object): item = (item, ) self.Add(*item) + def AddSpacer(self, *args, **kw): + """AddSpacer(int size) --> SizerItem + + Add a spacer that is (size,size) pixels. + """ + if args and type(args[0]) == int: + return self.Add( (args[0],args[0] ), 0) + else: # otherwise stay compatible with old AddSpacer + return self.Add(*args, **kw) + def PrependSpacer(self, *args, **kw): + """PrependSpacer(int size) --> SizerItem + + Prepend a spacer that is (size, size) pixels.""" + if args and type(args[0]) == int: + return self.Prepend( (args[0],args[0] ), 0) + else: # otherwise stay compatible with old PrependSpacer + return self.Prepend(*args, **kw) + def InsertSpacer(self, index, *args, **kw): + """InsertSpacer(int index, int size) --> SizerItem + + Insert a spacer at position index that is (size, size) pixels.""" + if args and type(args[0]) == int: + return self.Insert( index, (args[0],args[0] ), 0) + else: # otherwise stay compatible with old InsertSpacer + return self.Insert(index, *args, **kw) + + + def AddStretchSpacer(self, prop=1): + """AddStretchSpacer(int prop=1) --> SizerItem + + Add a stretchable spacer.""" + return self.Add((0,0), prop) + def PrependStretchSpacer(self, prop=1): + """PrependStretchSpacer(int prop=1) --> SizerItem + + Prepend a stretchable spacer.""" + return self.Prepend((0,0), prop) + def InsertStretchSpacer(self, index, prop=1): + """InsertStretchSpacer(int index, int prop=1) --> SizerItem + + Insert a stretchable spacer.""" + return self.Insert(index, (0,0), prop) + + # for backwards compatibility only, please do not use in new code def AddWindow(self, *args, **kw): """Compatibility alias for `Add`.""" @@ -11336,9 +12172,6 @@ class Sizer(Object): 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`.""" @@ -11346,9 +12179,6 @@ class Sizer(Object): 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`.""" @@ -11356,9 +12186,6 @@ class Sizer(Object): 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`.""" @@ -11575,6 +12402,11 @@ class Sizer(Object): """ return _core_.Sizer_ShowItems(*args, **kwargs) + Children = property(GetChildren,doc="See `GetChildren`") + ContainingWindow = property(GetContainingWindow,SetContainingWindow,doc="See `GetContainingWindow` and `SetContainingWindow`") + MinSize = property(GetMinSize,SetMinSize,doc="See `GetMinSize` and `SetMinSize`") + Position = property(GetPosition,doc="See `GetPosition`") + Size = property(GetSize,doc="See `GetSize`") _core_.Sizer_swigregister(Sizer) class PySizer(Sizer): @@ -11629,7 +12461,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)""" @@ -11676,6 +12508,7 @@ class BoxSizer(Sizer): """ return _core_.BoxSizer_SetOrientation(*args, **kwargs) + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") _core_.BoxSizer_swigregister(BoxSizer) #--------------------------------------------------------------------------- @@ -11708,6 +12541,7 @@ class StaticBoxSizer(BoxSizer): """ return _core_.StaticBoxSizer_GetStaticBox(*args, **kwargs) + StaticBox = property(GetStaticBox,doc="See `GetStaticBox`") _core_.StaticBoxSizer_swigregister(StaticBoxSizer) #--------------------------------------------------------------------------- @@ -11826,6 +12660,10 @@ class GridSizer(Sizer): cols = (nitems + rows - 1) / rows return (rows, cols) + Cols = property(GetCols,SetCols,doc="See `GetCols` and `SetCols`") + HGap = property(GetHGap,SetHGap,doc="See `GetHGap` and `SetHGap`") + Rows = property(GetRows,SetRows,doc="See `GetRows` and `SetRows`") + VGap = property(GetVGap,SetVGap,doc="See `GetVGap` and `SetVGap`") _core_.GridSizer_swigregister(GridSizer) #--------------------------------------------------------------------------- @@ -11958,8 +12796,6 @@ class FlexGridSizer(GridSizer): ========================== ================================================= Note that this method does not trigger relayout. - - """ return _core_.FlexGridSizer_SetNonFlexibleGrowMode(*args, **kwargs) @@ -11992,6 +12828,10 @@ class FlexGridSizer(GridSizer): """ return _core_.FlexGridSizer_GetColWidths(*args, **kwargs) + ColWidths = property(GetColWidths,doc="See `GetColWidths`") + FlexibleDirection = property(GetFlexibleDirection,SetFlexibleDirection,doc="See `GetFlexibleDirection` and `SetFlexibleDirection`") + NonFlexibleGrowMode = property(GetNonFlexibleGrowMode,SetNonFlexibleGrowMode,doc="See `GetNonFlexibleGrowMode` and `SetNonFlexibleGrowMode`") + RowHeights = property(GetRowHeights,doc="See `GetRowHeights`") _core_.FlexGridSizer_swigregister(FlexGridSizer) class StdDialogButtonSizer(BoxSizer): @@ -12059,6 +12899,11 @@ class StdDialogButtonSizer(BoxSizer): """GetHelpButton(self) -> wxButton""" return _core_.StdDialogButtonSizer_GetHelpButton(*args, **kwargs) + AffirmativeButton = property(GetAffirmativeButton,SetAffirmativeButton,doc="See `GetAffirmativeButton` and `SetAffirmativeButton`") + ApplyButton = property(GetApplyButton,doc="See `GetApplyButton`") + CancelButton = property(GetCancelButton,SetCancelButton,doc="See `GetCancelButton` and `SetCancelButton`") + HelpButton = property(GetHelpButton,doc="See `GetHelpButton`") + NegativeButton = property(GetNegativeButton,SetNegativeButton,doc="See `GetNegativeButton` and `SetNegativeButton`") _core_.StdDialogButtonSizer_swigregister(StdDialogButtonSizer) #--------------------------------------------------------------------------- @@ -12328,6 +13173,10 @@ class GBSizerItem(SizerItem): """ return _core_.GBSizerItem_SetGBSizer(*args, **kwargs) + EndPos = property(GetEndPos,doc="See `GetEndPos`") + GBSizer = property(GetGBSizer,SetGBSizer,doc="See `GetGBSizer` and `SetGBSizer`") + Pos = property(GetPos,SetPos,doc="See `GetPos` and `SetPos`") + Span = property(GetSpan,SetSpan,doc="See `GetSpan` and `SetSpan`") _core_.GBSizerItem_swigregister(GBSizerItem) DefaultSpan = cvar.DefaultSpan @@ -12485,6 +13334,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 @@ -12739,6 +13598,14 @@ class IndividualLayoutConstraint(Object): """ return _core_.IndividualLayoutConstraint_GetEdge(*args, **kwargs) + Done = property(GetDone,SetDone,doc="See `GetDone` and `SetDone`") + Margin = property(GetMargin,SetMargin,doc="See `GetMargin` and `SetMargin`") + MyEdge = property(GetMyEdge,doc="See `GetMyEdge`") + OtherEdge = property(GetOtherEdge,doc="See `GetOtherEdge`") + OtherWindow = property(GetOtherWindow,doc="See `GetOtherWindow`") + Percent = property(GetPercent,doc="See `GetPercent`") + Relationship = property(GetRelationship,SetRelationship,doc="See `GetRelationship` and `SetRelationship`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _core_.IndividualLayoutConstraint_swigregister(IndividualLayoutConstraint) class LayoutConstraints(Object): @@ -12830,6 +13697,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 @@ -12849,7 +13734,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() @@ -12927,7 +13815,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' @@ -12946,7 +13834,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 @@ -12957,7 +13845,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` @@ -13043,7 +13931,12 @@ class FutureCall: # if it wasn't restarted, then cleanup wx.CallAfter(self.Stop) + Interval = property(GetInterval) + Result = property(GetResult) + +class FutureCall(CallLater): + """A compatibility alias for `CallLater`.""" #---------------------------------------------------------------------------- # Control which items in this module should be documented by epydoc.