X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/412d302d2dcb2828002dae5ec41a51de37be5e89..5f57b149e60ac95a47d45409ae3a9c9acaee04be:/wxPython/src/gtk/_core.py diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index a6ed1991e3..366bb71994 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -3,6 +3,47 @@ import _core_ +def _swig_setattr_nondynamic(self,class_type,name,value,static=1): + if (name == "this"): + if isinstance(value, class_type): + self.__dict__[name] = value.this + if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown + del value.thisown + return + method = class_type.__swig_setmethods__.get(name,None) + if method: return method(self,value) + if (not static) or hasattr(self,name) or (name == "thisown"): + self.__dict__[name] = value + else: + raise AttributeError("You cannot add attributes to %s" % self) + +def _swig_setattr(self,class_type,name,value): + return _swig_setattr_nondynamic(self,class_type,name,value,0) + +def _swig_getattr(self,class_type,name): + method = class_type.__swig_getmethods__.get(name,None) + if method: return method(self) + raise AttributeError,name + +import types +try: + _object = types.ObjectType + _newclass = 1 +except AttributeError: + class _object : pass + _newclass = 0 +del types + + +def _swig_setattr_nondynamic_method(set): + def set_attr(self,name,value): + if hasattr(self,name) or (name in ("this", "thisown")): + set(self,name,value) + else: + raise AttributeError("You cannot add attributes to %s" % self) + return set_attr + + #// Give a reference to the dictionary of this module to the C++ extension #// code. _core_._wxPySetDictionary(vars()) @@ -44,17 +85,13 @@ SIMPLE_BORDER = _core_.SIMPLE_BORDER STATIC_BORDER = _core_.STATIC_BORDER TRANSPARENT_WINDOW = _core_.TRANSPARENT_WINDOW NO_BORDER = _core_.NO_BORDER +DEFAULT_CONTROL_BORDER = _core_.DEFAULT_CONTROL_BORDER TAB_TRAVERSAL = _core_.TAB_TRAVERSAL WANTS_CHARS = _core_.WANTS_CHARS POPUP_WINDOW = _core_.POPUP_WINDOW CENTER_FRAME = _core_.CENTER_FRAME CENTRE_ON_SCREEN = _core_.CENTRE_ON_SCREEN CENTER_ON_SCREEN = _core_.CENTER_ON_SCREEN -ED_CLIENT_MARGIN = _core_.ED_CLIENT_MARGIN -ED_BUTTONS_BOTTOM = _core_.ED_BUTTONS_BOTTOM -ED_BUTTONS_RIGHT = _core_.ED_BUTTONS_RIGHT -ED_STATIC_LINE = _core_.ED_STATIC_LINE -EXT_DIALOG_STYLE = _core_.EXT_DIALOG_STYLE CLIP_CHILDREN = _core_.CLIP_CHILDREN CLIP_SIBLINGS = _core_.CLIP_SIBLINGS ALWAYS_SHOW_SB = _core_.ALWAYS_SHOW_SB @@ -80,20 +117,12 @@ RA_HORIZONTAL = _core_.RA_HORIZONTAL RA_VERTICAL = _core_.RA_VERTICAL RA_SPECIFY_ROWS = _core_.RA_SPECIFY_ROWS RA_SPECIFY_COLS = _core_.RA_SPECIFY_COLS +RA_USE_CHECKBOX = _core_.RA_USE_CHECKBOX RB_GROUP = _core_.RB_GROUP RB_SINGLE = _core_.RB_SINGLE -SL_HORIZONTAL = _core_.SL_HORIZONTAL -SL_VERTICAL = _core_.SL_VERTICAL -SL_AUTOTICKS = _core_.SL_AUTOTICKS -SL_LABELS = _core_.SL_LABELS -SL_LEFT = _core_.SL_LEFT -SL_TOP = _core_.SL_TOP -SL_RIGHT = _core_.SL_RIGHT -SL_BOTTOM = _core_.SL_BOTTOM -SL_BOTH = _core_.SL_BOTH -SL_SELRANGE = _core_.SL_SELRANGE 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 FLOOD_SURFACE = _core_.FLOOD_SURFACE @@ -206,6 +235,29 @@ ID_NOTOALL = _core_.ID_NOTOALL ID_ABORT = _core_.ID_ABORT ID_RETRY = _core_.ID_RETRY ID_IGNORE = _core_.ID_IGNORE +ID_ADD = _core_.ID_ADD +ID_REMOVE = _core_.ID_REMOVE +ID_UP = _core_.ID_UP +ID_DOWN = _core_.ID_DOWN +ID_HOME = _core_.ID_HOME +ID_REFRESH = _core_.ID_REFRESH +ID_STOP = _core_.ID_STOP +ID_INDEX = _core_.ID_INDEX +ID_BOLD = _core_.ID_BOLD +ID_ITALIC = _core_.ID_ITALIC +ID_JUSTIFY_CENTER = _core_.ID_JUSTIFY_CENTER +ID_JUSTIFY_FILL = _core_.ID_JUSTIFY_FILL +ID_JUSTIFY_RIGHT = _core_.ID_JUSTIFY_RIGHT +ID_JUSTIFY_LEFT = _core_.ID_JUSTIFY_LEFT +ID_UNDERLINE = _core_.ID_UNDERLINE +ID_INDENT = _core_.ID_INDENT +ID_UNINDENT = _core_.ID_UNINDENT +ID_ZOOM_100 = _core_.ID_ZOOM_100 +ID_ZOOM_FIT = _core_.ID_ZOOM_FIT +ID_ZOOM_IN = _core_.ID_ZOOM_IN +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 OPEN = _core_.OPEN SAVE = _core_.SAVE @@ -224,6 +276,8 @@ 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 DD_NEW_DIR_BUTTON = _core_.DD_NEW_DIR_BUTTON DD_DEFAULT_STYLE = _core_.DD_DEFAULT_STYLE MENU_TEAROFF = _core_.MENU_TEAROFF @@ -292,6 +346,9 @@ BORDER_RAISED = _core_.BORDER_RAISED BORDER_SUNKEN = _core_.BORDER_SUNKEN BORDER_DOUBLE = _core_.BORDER_DOUBLE BORDER_MASK = _core_.BORDER_MASK +BG_STYLE_SYSTEM = _core_.BG_STYLE_SYSTEM +BG_STYLE_COLOUR = _core_.BG_STYLE_COLOUR +BG_STYLE_CUSTOM = _core_.BG_STYLE_CUSTOM DEFAULT = _core_.DEFAULT DECORATIVE = _core_.DECORATIVE ROMAN = _core_.ROMAN @@ -448,6 +505,27 @@ WXK_NUMPAD_DIVIDE = _core_.WXK_NUMPAD_DIVIDE WXK_WINDOWS_LEFT = _core_.WXK_WINDOWS_LEFT WXK_WINDOWS_RIGHT = _core_.WXK_WINDOWS_RIGHT WXK_WINDOWS_MENU = _core_.WXK_WINDOWS_MENU +WXK_COMMAND = _core_.WXK_COMMAND +WXK_SPECIAL1 = _core_.WXK_SPECIAL1 +WXK_SPECIAL2 = _core_.WXK_SPECIAL2 +WXK_SPECIAL3 = _core_.WXK_SPECIAL3 +WXK_SPECIAL4 = _core_.WXK_SPECIAL4 +WXK_SPECIAL5 = _core_.WXK_SPECIAL5 +WXK_SPECIAL6 = _core_.WXK_SPECIAL6 +WXK_SPECIAL7 = _core_.WXK_SPECIAL7 +WXK_SPECIAL8 = _core_.WXK_SPECIAL8 +WXK_SPECIAL9 = _core_.WXK_SPECIAL9 +WXK_SPECIAL10 = _core_.WXK_SPECIAL10 +WXK_SPECIAL11 = _core_.WXK_SPECIAL11 +WXK_SPECIAL12 = _core_.WXK_SPECIAL12 +WXK_SPECIAL13 = _core_.WXK_SPECIAL13 +WXK_SPECIAL14 = _core_.WXK_SPECIAL14 +WXK_SPECIAL15 = _core_.WXK_SPECIAL15 +WXK_SPECIAL16 = _core_.WXK_SPECIAL16 +WXK_SPECIAL17 = _core_.WXK_SPECIAL17 +WXK_SPECIAL18 = _core_.WXK_SPECIAL18 +WXK_SPECIAL19 = _core_.WXK_SPECIAL19 +WXK_SPECIAL20 = _core_.WXK_SPECIAL20 PAPER_NONE = _core_.PAPER_NONE PAPER_LETTER = _core_.PAPER_LETTER PAPER_LEGAL = _core_.PAPER_LEGAL @@ -645,9 +723,9 @@ CURSOR_MAX = _core_.CURSOR_MAX class Size(object): """ wx.Size is a useful data structure used to represent the size of - something. It simply contians integer width and height proprtites. - In most places in wxPython where a wx.Size is expected a - (width,height) tuple can be used instead. + something. It simply contians integer width and height + proprtites. In most places in wxPython where a wx.Size is + expected a (width, height) tuple can be used instead. """ def __repr__(self): return "<%s.%s; proxy of C++ wxSize instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -1074,6 +1152,10 @@ class Rect(object): """SetSize(self, Size s)""" return _core_.Rect_SetSize(*args, **kwargs) + def IsEmpty(*args, **kwargs): + """IsEmpty(self) -> bool""" + return _core_.Rect_IsEmpty(*args, **kwargs) + def GetTopLeft(*args, **kwargs): """GetTopLeft(self) -> Point""" return _core_.Rect_GetTopLeft(*args, **kwargs) @@ -1133,9 +1215,24 @@ class Rect(object): """ Inflate(self, int dx, int dy) -> Rect - Increase the rectangle size by dx in x direction and dy in y - direction. Both or one of) parameters may be negative to decrease the - rectangle size. + Increases the size of the rectangle. + + The left border is moved farther left and the right border is moved + farther right by ``dx``. The upper border is moved farther up and the + bottom border is moved farther down by ``dy``. (Note the the width and + height of the rectangle thus change by ``2*dx`` and ``2*dy``, + respectively.) If one or both of ``dx`` and ``dy`` are negative, the + opposite happens: the rectangle size decreases in the respective + direction. + + The change is made to the rectangle inplace, if instead you need a + copy that is inflated, preserving the original then make the copy + first:: + + copy = wx.Rect(*original) + copy.Inflate(10,15) + + """ return _core_.Rect_Inflate(*args, **kwargs) @@ -1143,9 +1240,9 @@ class Rect(object): """ Deflate(self, int dx, int dy) -> Rect - Decrease the rectangle size by dx in x direction and dy in y - direction. Both or one of) parameters may be negative to increase the - rectngle size. This method is the opposite of Inflate. + Decrease the rectangle size. This method is the opposite of `Inflate` + in that Deflate(a,b) is equivalent to Inflate(-a,-b). Please refer to + `Inflate` for a full description. """ return _core_.Rect_Deflate(*args, **kwargs) @@ -1171,10 +1268,18 @@ class Rect(object): """ Intersect(self, Rect rect) -> Rect - Return the intersectsion of this rectangle and rect. + Returns the intersectsion of this rectangle and rect. """ return _core_.Rect_Intersect(*args, **kwargs) + def Union(*args, **kwargs): + """ + Union(self, Rect rect) -> Rect + + Returns the union of this rectangle and rect. + """ + return _core_.Rect_Union(*args, **kwargs) + def __add__(*args, **kwargs): """ __add__(self, Rect rect) -> Rect @@ -1294,6 +1399,16 @@ def RectPS(*args, **kwargs): val.thisown = 1 return val +def RectS(*args, **kwargs): + """ + RectS(Size size) -> Rect + + Create a new Rect from a size only. + """ + val = _core_.new_RectS(*args, **kwargs) + val.thisown = 1 + return val + def IntersectRect(*args, **kwargs): """ @@ -1476,6 +1591,7 @@ FromStart = _core_.FromStart FromCurrent = _core_.FromCurrent FromEnd = _core_.FromEnd class InputStream(object): + """Proxy of C++ InputStream class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPyInputStream instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -1484,6 +1600,12 @@ class InputStream(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_InputStream): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def close(*args, **kwargs): """close(self)""" return _core_.InputStream_close(*args, **kwargs) @@ -1559,6 +1681,7 @@ DefaultPosition = cvar.DefaultPosition DefaultSize = cvar.DefaultSize class OutputStream(object): + """Proxy of C++ OutputStream class""" def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): return "<%s.%s; proxy of C++ wxOutputStream instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -1577,6 +1700,7 @@ _core_.OutputStream_swigregister(OutputStreamPtr) #--------------------------------------------------------------------------- class FSFile(Object): + """Proxy of C++ FSFile class""" def __repr__(self): return "<%s.%s; proxy of C++ wxFSFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -1588,6 +1712,8 @@ class FSFile(Object): self.this = newobj.this self.thisown = 1 del newobj.thisown + self.thisown = 0 # It will normally be deleted by the user of the wx.FileSystem + def __del__(self, destroy=_core_.delete_FSFile): """__del__(self)""" try: @@ -1623,6 +1749,7 @@ class FSFilePtr(FSFile): _core_.FSFile_swigregister(FSFilePtr) class CPPFileSystemHandler(object): + """Proxy of C++ CPPFileSystemHandler class""" def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): return "<%s.%s; proxy of C++ wxFileSystemHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -1635,6 +1762,7 @@ class CPPFileSystemHandlerPtr(CPPFileSystemHandler): _core_.CPPFileSystemHandler_swigregister(CPPFileSystemHandlerPtr) class FileSystemHandler(CPPFileSystemHandler): + """Proxy of C++ FileSystemHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPyFileSystemHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -1694,6 +1822,7 @@ class FileSystemHandlerPtr(FileSystemHandler): _core_.FileSystemHandler_swigregister(FileSystemHandlerPtr) class FileSystem(Object): + """Proxy of C++ FileSystem class""" def __repr__(self): return "<%s.%s; proxy of C++ wxFileSystem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -1743,6 +1872,11 @@ class FileSystem(Object): return _core_.FileSystem_FileNameToURL(*args, **kwargs) FileNameToURL = staticmethod(FileNameToURL) + def URLToFileName(*args, **kwargs): + """URLToFileName(String url) -> String""" + return _core_.FileSystem_URLToFileName(*args, **kwargs) + + URLToFileName = staticmethod(URLToFileName) class FileSystemPtr(FileSystem): def __init__(self, this): @@ -1763,11 +1897,12 @@ def FileSystem_FileNameToURL(*args, **kwargs): """FileSystem_FileNameToURL(String filename) -> String""" return _core_.FileSystem_FileNameToURL(*args, **kwargs) - def FileSystem_URLToFileName(*args, **kwargs): """FileSystem_URLToFileName(String url) -> String""" return _core_.FileSystem_URLToFileName(*args, **kwargs) + class InternetFSHandler(CPPFileSystemHandler): + """Proxy of C++ InternetFSHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxInternetFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -1793,6 +1928,7 @@ class InternetFSHandlerPtr(InternetFSHandler): _core_.InternetFSHandler_swigregister(InternetFSHandlerPtr) class ZipFSHandler(CPPFileSystemHandler): + """Proxy of C++ ZipFSHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxZipFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -1837,16 +1973,25 @@ def __wxMemoryFSHandler_AddFile_wxBitmap(*args, **kwargs): def __wxMemoryFSHandler_AddFile_Data(*args, **kwargs): """__wxMemoryFSHandler_AddFile_Data(String filename, PyObject data)""" return _core_.__wxMemoryFSHandler_AddFile_Data(*args, **kwargs) -def MemoryFSHandler_AddFile(filename, a, b=''): - if isinstance(a, wx.Image): - __wxMemoryFSHandler_AddFile_wxImage(filename, a, b) - elif isinstance(a, wx.Bitmap): - __wxMemoryFSHandler_AddFile_wxBitmap(filename, a, b) - elif type(a) == str: - __wxMemoryFSHandler_AddFile_Data(filename, a) - else: raise TypeError, 'wx.Image, wx.Bitmap or string expected' +def MemoryFSHandler_AddFile(filename, dataItem, imgType=-1): + """ + Add 'file' to the memory filesystem. The dataItem parameter can + either be a `wx.Bitmap`, `wx.Image` or a string that can contain + arbitrary data. If a bitmap or image is used then the imgType + parameter should specify what kind of image file it should be + written as, wx.BITMAP_TYPE_PNG, etc. + """ + if isinstance(dataItem, wx.Image): + __wxMemoryFSHandler_AddFile_wxImage(filename, dataItem, imgType) + elif isinstance(dataItem, wx.Bitmap): + __wxMemoryFSHandler_AddFile_wxBitmap(filename, dataItem, imgType) + elif type(dataItem) == str: + __wxMemoryFSHandler_AddFile_Data(filename, dataItem) + else: + raise TypeError, 'wx.Image, wx.Bitmap or string expected' class MemoryFSHandler(CPPFileSystemHandler): + """Proxy of C++ MemoryFSHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxMemoryFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -1889,9 +2034,13 @@ def MemoryFSHandler_RemoveFile(*args, **kwargs): """MemoryFSHandler_RemoveFile(String filename)""" return _core_.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 #--------------------------------------------------------------------------- class ImageHandler(Object): + """Proxy of C++ ImageHandler class""" def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): return "<%s.%s; proxy of C++ wxImageHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -1940,6 +2089,7 @@ class ImageHandlerPtr(ImageHandler): _core_.ImageHandler_swigregister(ImageHandlerPtr) class ImageHistogram(object): + """Proxy of C++ ImageHistogram class""" def __repr__(self): return "<%s.%s; proxy of C++ wxImageHistogram instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -1967,6 +2117,31 @@ class ImageHistogram(object): """ return _core_.ImageHistogram_FindFirstUnusedColour(*args, **kwargs) + def GetCount(*args, **kwargs): + """ + GetCount(self, unsigned long key) -> unsigned long + + Returns the pixel count for the given key. Use `MakeKey` to create a + key value from a RGB tripple. + """ + return _core_.ImageHistogram_GetCount(*args, **kwargs) + + def GetCountRGB(*args, **kwargs): + """ + GetCountRGB(self, unsigned char r, unsigned char g, unsigned char b) -> unsigned long + + Returns the pixel count for the given RGB values. + """ + return _core_.ImageHistogram_GetCountRGB(*args, **kwargs) + + def GetCountColour(*args, **kwargs): + """ + GetCountColour(self, Colour colour) -> unsigned long + + Returns the pixel count for the given `wx.Colour` value. + """ + return _core_.ImageHistogram_GetCountColour(*args, **kwargs) + class ImageHistogramPtr(ImageHistogram): def __init__(self, this): @@ -1984,6 +2159,7 @@ def ImageHistogram_MakeKey(*args, **kwargs): return _core_.ImageHistogram_MakeKey(*args, **kwargs) class Image(Object): + """Proxy of C++ Image class""" def __repr__(self): return "<%s.%s; proxy of C++ wxImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2022,10 +2198,18 @@ class Image(Object): """Rescale(self, int width, int height) -> Image""" return _core_.Image_Rescale(*args, **kwargs) + def Resize(*args, **kwargs): + """Resize(self, Size size, Point pos, int r=-1, int g=-1, int b=-1) -> Image""" + return _core_.Image_Resize(*args, **kwargs) + def SetRGB(*args, **kwargs): """SetRGB(self, int x, int y, unsigned char r, unsigned char g, unsigned char b)""" return _core_.Image_SetRGB(*args, **kwargs) + def SetRGBRect(*args, **kwargs): + """SetRGBRect(self, Rect rect, unsigned char r, unsigned char g, unsigned char b)""" + return _core_.Image_SetRGBRect(*args, **kwargs) + def GetRed(*args, **kwargs): """GetRed(self, int x, int y) -> unsigned char""" return _core_.Image_GetRed(*args, **kwargs) @@ -2050,6 +2234,26 @@ class Image(Object): """HasAlpha(self) -> bool""" return _core_.Image_HasAlpha(*args, **kwargs) + def InitAlpha(*args, **kwargs): + """ + InitAlpha(self) + + Initializes the image alpha channel data. It is an error to call it if + the image already has alpha data. If it doesn't, alpha data will be by + default initialized to all pixels being fully opaque. But if the image + has a a mask colour, all mask pixels will be completely transparent. + """ + return _core_.Image_InitAlpha(*args, **kwargs) + + def IsTransparent(*args, **kwargs): + """ + IsTransparent(self, int x, int y, unsigned char threshold=IMAGE_ALPHA_THRESHOLD) -> bool + + Returns True if this pixel is masked or has an alpha value less than + the spcified threshold. + """ + return _core_.Image_IsTransparent(*args, **kwargs) + def FindFirstUnusedColour(*args, **kwargs): """ FindFirstUnusedColour(int startR=1, int startG=0, int startB=0) -> (success, r, g, b) @@ -2060,6 +2264,34 @@ class Image(Object): """ return _core_.Image_FindFirstUnusedColour(*args, **kwargs) + def ConvertAlphaToMask(*args, **kwargs): + """ + ConvertAlphaToMask(self, byte threshold=IMAGE_ALPHA_THRESHOLD) -> bool + + If the image has alpha channel, this method converts it to mask. All pixels + with alpha value less than ``threshold`` are replaced with mask colour and the + alpha channel is removed. Mask colour is chosen automatically using + `FindFirstUnusedColour`. + + If the image image doesn't have alpha channel, ConvertAlphaToMask does + nothing. + """ + return _core_.Image_ConvertAlphaToMask(*args, **kwargs) + + def ConvertColourToAlpha(*args, **kwargs): + """ + ConvertColourToAlpha(self, unsigned char r, unsigned char g, unsigned char b) -> bool + + This method converts an image where the original alpha information is + only available as a shades of a colour (actually shades of grey) + typically when you draw anti-aliased text into a bitmap. The DC + drawing routines draw grey values on the black background although + they actually mean to draw white with differnt alpha values. This + method reverses it, assuming a black (!) background and white text. + The method will then fill up the whole image with the colour given. + """ + return _core_.Image_ConvertColourToAlpha(*args, **kwargs) + def SetMaskFromImage(*args, **kwargs): """SetMaskFromImage(self, Image mask, byte mr, byte mg, byte mb) -> bool""" return _core_.Image_SetMaskFromImage(*args, **kwargs) @@ -2123,6 +2355,10 @@ class Image(Object): """GetSubImage(self, Rect rect) -> Image""" return _core_.Image_GetSubImage(*args, **kwargs) + def Size(*args, **kwargs): + """Size(self, Size size, Point pos, int r=-1, int g=-1, int b=-1) -> Image""" + return _core_.Image_Size(*args, **kwargs) + def Copy(*args, **kwargs): """Copy(self) -> Image""" return _core_.Image_Copy(*args, **kwargs) @@ -2132,27 +2368,58 @@ class Image(Object): return _core_.Image_Paste(*args, **kwargs) def GetData(*args, **kwargs): - """GetData(self) -> PyObject""" + """ + GetData(self) -> PyObject + + Returns a string containing a copy of the RGB bytes of the image. + """ return _core_.Image_GetData(*args, **kwargs) def SetData(*args, **kwargs): - """SetData(self, PyObject data)""" + """ + SetData(self, buffer data) + + Resets the Image's RGB data from a buffer of RGB bytes. Accepts + either a string or a buffer object holding the data and the length of + the data must be width*height*3. + """ return _core_.Image_SetData(*args, **kwargs) def GetDataBuffer(*args, **kwargs): - """GetDataBuffer(self) -> PyObject""" + """ + GetDataBuffer(self) -> PyObject + + Returns a writable Python buffer object that is pointing at the RGB + image data buffer inside the wx.Image. + """ return _core_.Image_GetDataBuffer(*args, **kwargs) def SetDataBuffer(*args, **kwargs): - """SetDataBuffer(self, PyObject data)""" + """ + SetDataBuffer(self, buffer data) + + Sets the internal image data pointer to point at a Python buffer + object. This can save a copy of the data but you must ensure that the + buffer object lives longer than the wx.Image does. + """ return _core_.Image_SetDataBuffer(*args, **kwargs) def GetAlphaData(*args, **kwargs): - """GetAlphaData(self) -> PyObject""" + """ + GetAlphaData(self) -> PyObject + + Returns a string containing a copy of the alpha bytes of the image. + """ return _core_.Image_GetAlphaData(*args, **kwargs) def SetAlphaData(*args, **kwargs): - """SetAlphaData(self, PyObject data)""" + """ + SetAlphaData(self, buffer alpha) + + Resets the Image's alpha data from a buffer of bytes. Accepts either + a string or a buffer object holding the data and the length of the + data must be width*height. + """ return _core_.Image_SetAlphaData(*args, **kwargs) def GetAlphaBuffer(*args, **kwargs): @@ -2160,13 +2427,21 @@ class Image(Object): return _core_.Image_GetAlphaBuffer(*args, **kwargs) def SetAlphaBuffer(*args, **kwargs): - """SetAlphaBuffer(self, PyObject data)""" + """SetAlphaBuffer(self, buffer alpha)""" return _core_.Image_SetAlphaBuffer(*args, **kwargs) def SetMaskColour(*args, **kwargs): """SetMaskColour(self, unsigned char r, unsigned char g, unsigned char b)""" return _core_.Image_SetMaskColour(*args, **kwargs) + def GetOrFindMaskColour(*args, **kwargs): + """ + GetOrFindMaskColour() -> (r,g,b) + + Get the current mask colour or find a suitable colour. + """ + return _core_.Image_GetOrFindMaskColour(*args, **kwargs) + def GetMaskRed(*args, **kwargs): """GetMaskRed(self) -> unsigned char""" return _core_.Image_GetMaskRed(*args, **kwargs) @@ -2262,7 +2537,7 @@ class Image(Object): GetImageExtWildcard = staticmethod(GetImageExtWildcard) def ConvertToBitmap(*args, **kwargs): - """ConvertToBitmap(self) -> Bitmap""" + """ConvertToBitmap(self, int depth=-1) -> Bitmap""" return _core_.Image_ConvertToBitmap(*args, **kwargs) def ConvertToMonoBitmap(*args, **kwargs): @@ -2297,23 +2572,50 @@ def ImageFromStreamMime(*args, **kwargs): return val def EmptyImage(*args, **kwargs): - """EmptyImage(int width=0, int height=0, bool clear=True) -> Image""" + """ + EmptyImage(int width=0, int height=0, bool clear=True) -> Image + + Construct an empty image of a given size, optionally setting all + pixels to black. + """ val = _core_.new_EmptyImage(*args, **kwargs) val.thisown = 1 return val def ImageFromBitmap(*args, **kwargs): - """ImageFromBitmap(Bitmap bitmap) -> Image""" + """ + ImageFromBitmap(Bitmap bitmap) -> Image + + Construct an Image from a `wx.Bitmap`. + """ val = _core_.new_ImageFromBitmap(*args, **kwargs) val.thisown = 1 return val def ImageFromData(*args, **kwargs): - """ImageFromData(int width, int height, unsigned char data) -> Image""" + """ + ImageFromData(int width, int height, buffer data) -> Image + + Construct an Image from a buffer of RGB bytes. Accepts either a + string or a buffer object holding the data and the length of the data + must be width*height*3. + """ val = _core_.new_ImageFromData(*args, **kwargs) val.thisown = 1 return val +def ImageFromDataWithAlpha(*args, **kwargs): + """ + ImageFromDataWithAlpha(int width, int height, buffer data, buffer alpha) -> Image + + Construct an Image from a buffer of RGB bytes with an Alpha channel. + Accepts either a string or a buffer object holding the data and the + length of the data must be width*height*3. + """ + val = _core_.new_ImageFromDataWithAlpha(*args, **kwargs) + val.thisown = 1 + return val + def Image_CanRead(*args, **kwargs): """Image_CanRead(String name) -> bool""" return _core_.Image_CanRead(*args, **kwargs) @@ -2351,6 +2653,9 @@ def InitAllImageHandlers(): IMAGE_RESOLUTION_INCHES = _core_.IMAGE_RESOLUTION_INCHES IMAGE_RESOLUTION_CM = _core_.IMAGE_RESOLUTION_CM +PNG_TYPE_COLOUR = _core_.PNG_TYPE_COLOUR +PNG_TYPE_GREY = _core_.PNG_TYPE_GREY +PNG_TYPE_GREY_RED = _core_.PNG_TYPE_GREY_RED BMP_24BPP = _core_.BMP_24BPP BMP_8BPP = _core_.BMP_8BPP BMP_8BPP_GREY = _core_.BMP_8BPP_GREY @@ -2361,6 +2666,7 @@ BMP_4BPP = _core_.BMP_4BPP BMP_1BPP = _core_.BMP_1BPP BMP_1BPP_BW = _core_.BMP_1BPP_BW class BMPHandler(ImageHandler): + """Proxy of C++ BMPHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxBMPHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2377,13 +2683,24 @@ class BMPHandlerPtr(BMPHandler): self.__class__ = BMPHandler _core_.BMPHandler_swigregister(BMPHandlerPtr) NullImage = cvar.NullImage +IMAGE_OPTION_FILENAME = cvar.IMAGE_OPTION_FILENAME IMAGE_OPTION_BMP_FORMAT = cvar.IMAGE_OPTION_BMP_FORMAT IMAGE_OPTION_CUR_HOTSPOT_X = cvar.IMAGE_OPTION_CUR_HOTSPOT_X IMAGE_OPTION_CUR_HOTSPOT_Y = cvar.IMAGE_OPTION_CUR_HOTSPOT_Y IMAGE_OPTION_RESOLUTION = cvar.IMAGE_OPTION_RESOLUTION +IMAGE_OPTION_RESOLUTIONX = cvar.IMAGE_OPTION_RESOLUTIONX +IMAGE_OPTION_RESOLUTIONY = cvar.IMAGE_OPTION_RESOLUTIONY IMAGE_OPTION_RESOLUTIONUNIT = cvar.IMAGE_OPTION_RESOLUTIONUNIT +IMAGE_OPTION_QUALITY = cvar.IMAGE_OPTION_QUALITY +IMAGE_OPTION_BITSPERSAMPLE = cvar.IMAGE_OPTION_BITSPERSAMPLE +IMAGE_OPTION_SAMPLESPERPIXEL = cvar.IMAGE_OPTION_SAMPLESPERPIXEL +IMAGE_OPTION_COMPRESSION = cvar.IMAGE_OPTION_COMPRESSION +IMAGE_OPTION_IMAGEDESCRIPTOR = cvar.IMAGE_OPTION_IMAGEDESCRIPTOR +IMAGE_OPTION_PNG_FORMAT = cvar.IMAGE_OPTION_PNG_FORMAT +IMAGE_OPTION_PNG_BITDEPTH = cvar.IMAGE_OPTION_PNG_BITDEPTH class ICOHandler(BMPHandler): + """Proxy of C++ ICOHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxICOHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2401,6 +2718,7 @@ class ICOHandlerPtr(ICOHandler): _core_.ICOHandler_swigregister(ICOHandlerPtr) class CURHandler(ICOHandler): + """Proxy of C++ CURHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxCURHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2418,6 +2736,7 @@ class CURHandlerPtr(CURHandler): _core_.CURHandler_swigregister(CURHandlerPtr) class ANIHandler(CURHandler): + """Proxy of C++ ANIHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxANIHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2435,6 +2754,7 @@ class ANIHandlerPtr(ANIHandler): _core_.ANIHandler_swigregister(ANIHandlerPtr) class PNGHandler(ImageHandler): + """Proxy of C++ PNGHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPNGHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2452,6 +2772,7 @@ class PNGHandlerPtr(PNGHandler): _core_.PNGHandler_swigregister(PNGHandlerPtr) class GIFHandler(ImageHandler): + """Proxy of C++ GIFHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxGIFHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2469,6 +2790,7 @@ class GIFHandlerPtr(GIFHandler): _core_.GIFHandler_swigregister(GIFHandlerPtr) class PCXHandler(ImageHandler): + """Proxy of C++ PCXHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPCXHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2486,6 +2808,7 @@ class PCXHandlerPtr(PCXHandler): _core_.PCXHandler_swigregister(PCXHandlerPtr) class JPEGHandler(ImageHandler): + """Proxy of C++ JPEGHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxJPEGHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2503,6 +2826,7 @@ class JPEGHandlerPtr(JPEGHandler): _core_.JPEGHandler_swigregister(JPEGHandlerPtr) class PNMHandler(ImageHandler): + """Proxy of C++ PNMHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPNMHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2520,6 +2844,7 @@ class PNMHandlerPtr(PNMHandler): _core_.PNMHandler_swigregister(PNMHandlerPtr) class XPMHandler(ImageHandler): + """Proxy of C++ XPMHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxXPMHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2537,6 +2862,7 @@ class XPMHandlerPtr(XPMHandler): _core_.XPMHandler_swigregister(XPMHandlerPtr) class TIFFHandler(ImageHandler): + """Proxy of C++ TIFFHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxTIFFHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2553,9 +2879,46 @@ class TIFFHandlerPtr(TIFFHandler): self.__class__ = TIFFHandler _core_.TIFFHandler_swigregister(TIFFHandlerPtr) +QUANTIZE_INCLUDE_WINDOWS_COLOURS = _core_.QUANTIZE_INCLUDE_WINDOWS_COLOURS +QUANTIZE_FILL_DESTINATION_IMAGE = _core_.QUANTIZE_FILL_DESTINATION_IMAGE +class Quantize(object): + """Performs quantization, or colour reduction, on a wxImage.""" + def __init__(self): raise RuntimeError, "No constructor defined" + def __repr__(self): + return "<%s.%s; proxy of C++ wxQuantize instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def Quantize(*args, **kwargs): + """ + Quantize(Image src, Image dest, int desiredNoColours=236, int flags=wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|wxQUANTIZE_FILL_DESTINATION_IMAGE) -> bool + + Reduce the colours in the source image and put the result into the + destination image, setting the palette in the destination if + needed. Both images may be the same, to overwrite the source image. + """ + return _core_.Quantize_Quantize(*args, **kwargs) + + Quantize = staticmethod(Quantize) + +class QuantizePtr(Quantize): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = Quantize +_core_.Quantize_swigregister(QuantizePtr) + +def Quantize_Quantize(*args, **kwargs): + """ + Quantize_Quantize(Image src, Image dest, int desiredNoColours=236, int flags=wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|wxQUANTIZE_FILL_DESTINATION_IMAGE) -> bool + + Reduce the colours in the source image and put the result into the + destination image, setting the palette in the destination if + needed. Both images may be the same, to overwrite the source image. + """ + return _core_.Quantize_Quantize(*args, **kwargs) + #--------------------------------------------------------------------------- class EvtHandler(Object): + """Proxy of C++ EvtHandler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxEvtHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2609,7 +2972,7 @@ class EvtHandler(Object): return _core_.EvtHandler_Disconnect(*args, **kwargs) def _setOORInfo(*args, **kwargs): - """_setOORInfo(self, PyObject _self)""" + """_setOORInfo(self, PyObject _self, bool incref=True)""" return _core_.EvtHandler__setOORInfo(*args, **kwargs) def Bind(self, event, handler, source=None, id=wx.ID_ANY, id2=wx.ID_ANY): @@ -2841,6 +3204,7 @@ wxEVT_IDLE = _core_.wxEVT_IDLE wxEVT_UPDATE_UI = _core_.wxEVT_UPDATE_UI wxEVT_SIZING = _core_.wxEVT_SIZING wxEVT_MOVING = _core_.wxEVT_MOVING +wxEVT_HIBERNATE = _core_.wxEVT_HIBERNATE wxEVT_COMMAND_LEFT_CLICK = _core_.wxEVT_COMMAND_LEFT_CLICK wxEVT_COMMAND_LEFT_DCLICK = _core_.wxEVT_COMMAND_LEFT_DCLICK wxEVT_COMMAND_RIGHT_CLICK = _core_.wxEVT_COMMAND_RIGHT_CLICK @@ -2874,6 +3238,7 @@ EVT_KILL_FOCUS = wx.PyEventBinder( wxEVT_KILL_FOCUS ) EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS ) EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE ) EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP ) +EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE ) EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION ) EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION ) EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES ) @@ -3027,6 +3392,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU ) #--------------------------------------------------------------------------- class Event(Object): + """Proxy of C++ Event class""" def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): return "<%s.%s; proxy of C++ wxEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -3073,7 +3439,18 @@ class Event(Object): return _core_.Event_IsCommandEvent(*args, **kwargs) def Skip(*args, **kwargs): - """Skip(self, bool skip=True)""" + """ + 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. + + """ return _core_.Event_Skip(*args, **kwargs) def GetSkipped(*args, **kwargs): @@ -3107,6 +3484,7 @@ _core_.Event_swigregister(EventPtr) #--------------------------------------------------------------------------- class PropagationDisabler(object): + """Proxy of C++ PropagationDisabler class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPropagationDisabler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3130,6 +3508,7 @@ class PropagationDisablerPtr(PropagationDisabler): _core_.PropagationDisabler_swigregister(PropagationDisablerPtr) class PropagateOnce(object): + """Proxy of C++ PropagateOnce class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPropagateOnce instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3155,6 +3534,7 @@ _core_.PropagateOnce_swigregister(PropagateOncePtr) #--------------------------------------------------------------------------- class CommandEvent(Event): + """Proxy of C++ CommandEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxCommandEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3215,6 +3595,7 @@ _core_.CommandEvent_swigregister(CommandEventPtr) #--------------------------------------------------------------------------- class NotifyEvent(CommandEvent): + """Proxy of C++ NotifyEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxNotifyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3246,6 +3627,7 @@ _core_.NotifyEvent_swigregister(NotifyEventPtr) #--------------------------------------------------------------------------- class ScrollEvent(CommandEvent): + """Proxy of C++ ScrollEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxScrollEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3284,6 +3666,7 @@ _core_.ScrollEvent_swigregister(ScrollEventPtr) #--------------------------------------------------------------------------- class ScrollWinEvent(Event): + """Proxy of C++ ScrollWinEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxScrollWinEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3324,6 +3707,7 @@ MOUSE_BTN_LEFT = _core_.MOUSE_BTN_LEFT MOUSE_BTN_MIDDLE = _core_.MOUSE_BTN_MIDDLE MOUSE_BTN_RIGHT = _core_.MOUSE_BTN_RIGHT class MouseEvent(Event): + """Proxy of C++ MouseEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxMouseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3523,6 +3907,7 @@ _core_.MouseEvent_swigregister(MouseEventPtr) #--------------------------------------------------------------------------- class SetCursorEvent(Event): + """Proxy of C++ SetCursorEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxSetCursorEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3562,6 +3947,7 @@ _core_.SetCursorEvent_swigregister(SetCursorEventPtr) #--------------------------------------------------------------------------- class KeyEvent(Event): + """Proxy of C++ KeyEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxKeyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3667,6 +4053,7 @@ _core_.KeyEvent_swigregister(KeyEventPtr) #--------------------------------------------------------------------------- class SizeEvent(Event): + """Proxy of C++ SizeEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxSizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3704,6 +4091,7 @@ _core_.SizeEvent_swigregister(SizeEventPtr) #--------------------------------------------------------------------------- class MoveEvent(Event): + """Proxy of C++ MoveEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxMoveEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3728,8 +4116,9 @@ class MoveEvent(Event): """SetPosition(self, Point pos)""" return _core_.MoveEvent_SetPosition(*args, **kwargs) - m_pos = property(_core_.MoveEvent_m_pos_get, _core_.MoveEvent_m_pos_set) - m_rect = property(_core_.MoveEvent_m_rect_get, _core_.MoveEvent_m_rect_set) + m_pos = property(GetPosition, SetPosition) + m_rect = property(GetRect, SetRect) + class MoveEventPtr(MoveEvent): def __init__(self, this): @@ -3741,6 +4130,7 @@ _core_.MoveEvent_swigregister(MoveEventPtr) #--------------------------------------------------------------------------- class PaintEvent(Event): + """Proxy of C++ PaintEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPaintEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3758,6 +4148,7 @@ class PaintEventPtr(PaintEvent): _core_.PaintEvent_swigregister(PaintEventPtr) class NcPaintEvent(Event): + """Proxy of C++ NcPaintEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxNcPaintEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3777,6 +4168,7 @@ _core_.NcPaintEvent_swigregister(NcPaintEventPtr) #--------------------------------------------------------------------------- class EraseEvent(Event): + """Proxy of C++ EraseEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxEraseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3800,6 +4192,7 @@ _core_.EraseEvent_swigregister(EraseEventPtr) #--------------------------------------------------------------------------- class FocusEvent(Event): + """Proxy of C++ FocusEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxFocusEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3827,6 +4220,7 @@ _core_.FocusEvent_swigregister(FocusEventPtr) #--------------------------------------------------------------------------- class ChildFocusEvent(CommandEvent): + """Proxy of C++ ChildFocusEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxChildFocusEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3850,6 +4244,7 @@ _core_.ChildFocusEvent_swigregister(ChildFocusEventPtr) #--------------------------------------------------------------------------- class ActivateEvent(Event): + """Proxy of C++ ActivateEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxActivateEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3873,6 +4268,7 @@ _core_.ActivateEvent_swigregister(ActivateEventPtr) #--------------------------------------------------------------------------- class InitDialogEvent(Event): + """Proxy of C++ InitDialogEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxInitDialogEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3892,6 +4288,7 @@ _core_.InitDialogEvent_swigregister(InitDialogEventPtr) #--------------------------------------------------------------------------- class MenuEvent(Event): + """Proxy of C++ MenuEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxMenuEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3923,6 +4320,7 @@ _core_.MenuEvent_swigregister(MenuEventPtr) #--------------------------------------------------------------------------- class CloseEvent(Event): + """Proxy of C++ CloseEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxCloseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3966,6 +4364,7 @@ _core_.CloseEvent_swigregister(CloseEventPtr) #--------------------------------------------------------------------------- class ShowEvent(Event): + """Proxy of C++ ShowEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxShowEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -3993,6 +4392,7 @@ _core_.ShowEvent_swigregister(ShowEventPtr) #--------------------------------------------------------------------------- class IconizeEvent(Event): + """Proxy of C++ IconizeEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxIconizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4016,6 +4416,7 @@ _core_.IconizeEvent_swigregister(IconizeEventPtr) #--------------------------------------------------------------------------- class MaximizeEvent(Event): + """Proxy of C++ MaximizeEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxMaximizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4035,6 +4436,7 @@ _core_.MaximizeEvent_swigregister(MaximizeEventPtr) #--------------------------------------------------------------------------- class DropFilesEvent(Event): + """Proxy of C++ DropFilesEvent class""" def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): return "<%s.%s; proxy of C++ wxDropFilesEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -4063,6 +4465,7 @@ _core_.DropFilesEvent_swigregister(DropFilesEventPtr) UPDATE_UI_PROCESS_ALL = _core_.UPDATE_UI_PROCESS_ALL UPDATE_UI_PROCESS_SPECIFIED = _core_.UPDATE_UI_PROCESS_SPECIFIED class UpdateUIEvent(CommandEvent): + """Proxy of C++ UpdateUIEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxUpdateUIEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4172,6 +4575,7 @@ def UpdateUIEvent_GetMode(*args, **kwargs): #--------------------------------------------------------------------------- class SysColourChangedEvent(Event): + """Proxy of C++ SysColourChangedEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxSysColourChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4191,6 +4595,7 @@ _core_.SysColourChangedEvent_swigregister(SysColourChangedEventPtr) #--------------------------------------------------------------------------- class MouseCaptureChangedEvent(Event): + """Proxy of C++ MouseCaptureChangedEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxMouseCaptureChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4214,6 +4619,7 @@ _core_.MouseCaptureChangedEvent_swigregister(MouseCaptureChangedEventPtr) #--------------------------------------------------------------------------- class DisplayChangedEvent(Event): + """Proxy of C++ DisplayChangedEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxDisplayChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4233,6 +4639,7 @@ _core_.DisplayChangedEvent_swigregister(DisplayChangedEventPtr) #--------------------------------------------------------------------------- class PaletteChangedEvent(Event): + """Proxy of C++ PaletteChangedEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPaletteChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4260,6 +4667,7 @@ _core_.PaletteChangedEvent_swigregister(PaletteChangedEventPtr) #--------------------------------------------------------------------------- class QueryNewPaletteEvent(Event): + """Proxy of C++ QueryNewPaletteEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxQueryNewPaletteEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4287,6 +4695,7 @@ _core_.QueryNewPaletteEvent_swigregister(QueryNewPaletteEventPtr) #--------------------------------------------------------------------------- class NavigationKeyEvent(Event): + """Proxy of C++ NavigationKeyEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxNavigationKeyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4311,6 +4720,14 @@ class NavigationKeyEvent(Event): """SetWindowChange(self, bool ischange)""" return _core_.NavigationKeyEvent_SetWindowChange(*args, **kwargs) + def IsFromTab(*args, **kwargs): + """IsFromTab(self) -> bool""" + return _core_.NavigationKeyEvent_IsFromTab(*args, **kwargs) + + def SetFromTab(*args, **kwargs): + """SetFromTab(self, bool bIs)""" + return _core_.NavigationKeyEvent_SetFromTab(*args, **kwargs) + def SetFlags(*args, **kwargs): """SetFlags(self, long flags)""" return _core_.NavigationKeyEvent_SetFlags(*args, **kwargs) @@ -4323,8 +4740,10 @@ class NavigationKeyEvent(Event): """SetCurrentFocus(self, Window win)""" return _core_.NavigationKeyEvent_SetCurrentFocus(*args, **kwargs) + IsBackward = _core_.NavigationKeyEvent_IsBackward IsForward = _core_.NavigationKeyEvent_IsForward WinChange = _core_.NavigationKeyEvent_WinChange + FromTab = _core_.NavigationKeyEvent_FromTab class NavigationKeyEventPtr(NavigationKeyEvent): def __init__(self, this): @@ -4336,6 +4755,7 @@ _core_.NavigationKeyEvent_swigregister(NavigationKeyEventPtr) #--------------------------------------------------------------------------- class WindowCreateEvent(CommandEvent): + """Proxy of C++ WindowCreateEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxWindowCreateEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4357,6 +4777,7 @@ class WindowCreateEventPtr(WindowCreateEvent): _core_.WindowCreateEvent_swigregister(WindowCreateEventPtr) class WindowDestroyEvent(CommandEvent): + """Proxy of C++ WindowDestroyEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxWindowDestroyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4380,6 +4801,7 @@ _core_.WindowDestroyEvent_swigregister(WindowDestroyEventPtr) #--------------------------------------------------------------------------- class ContextMenuEvent(CommandEvent): + """Proxy of C++ ContextMenuEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxContextMenuEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4409,6 +4831,7 @@ _core_.ContextMenuEvent_swigregister(ContextMenuEventPtr) IDLE_PROCESS_ALL = _core_.IDLE_PROCESS_ALL IDLE_PROCESS_SPECIFIED = _core_.IDLE_PROCESS_SPECIFIED class IdleEvent(Event): + """Proxy of C++ IdleEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxIdleEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4463,6 +4886,7 @@ def IdleEvent_CanSend(*args, **kwargs): #--------------------------------------------------------------------------- class PyEvent(Event): + """Proxy of C++ PyEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4496,6 +4920,7 @@ class PyEventPtr(PyEvent): _core_.PyEvent_swigregister(PyEventPtr) class PyCommandEvent(CommandEvent): + """Proxy of C++ PyCommandEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPyCommandEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -4528,6 +4953,35 @@ class PyCommandEventPtr(PyCommandEvent): self.__class__ = PyCommandEvent _core_.PyCommandEvent_swigregister(PyCommandEventPtr) +class DateEvent(CommandEvent): + """Proxy of C++ DateEvent class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxDateEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """__init__(self, Window win, DateTime dt, wxEventType type) -> DateEvent""" + newobj = _core_.new_DateEvent(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + def GetDate(*args, **kwargs): + """GetDate(self) -> DateTime""" + return _core_.DateEvent_GetDate(*args, **kwargs) + + def SetDate(*args, **kwargs): + """SetDate(self, DateTime date)""" + return _core_.DateEvent_SetDate(*args, **kwargs) + + +class DateEventPtr(DateEvent): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = DateEvent +_core_.DateEvent_swigregister(DateEventPtr) + +wxEVT_DATE_CHANGED = _core_.wxEVT_DATE_CHANGED +EVT_DATE_CHANGED = wx.PyEventBinder( wxEVT_DATE_CHANGED, 1 ) + #--------------------------------------------------------------------------- PYAPP_ASSERT_SUPPRESS = _core_.PYAPP_ASSERT_SUPPRESS @@ -4669,6 +5123,16 @@ class PyApp(EvtHandler): """ return _core_.PyApp_WakeUpIdle(*args, **kwargs) + def IsMainLoopRunning(*args, **kwargs): + """ + IsMainLoopRunning() -> bool + + Returns True if we're running the main loop, i.e. if the events can + currently be dispatched. + """ + return _core_.PyApp_IsMainLoopRunning(*args, **kwargs) + + IsMainLoopRunning = staticmethod(IsMainLoopRunning) def MainLoop(*args, **kwargs): """ MainLoop(self) -> int @@ -4895,6 +5359,15 @@ class PyAppPtr(PyApp): self.__class__ = PyApp _core_.PyApp_swigregister(PyAppPtr) +def PyApp_IsMainLoopRunning(*args, **kwargs): + """ + PyApp_IsMainLoopRunning() -> bool + + Returns True if we're running the main loop, i.e. if the events can + currently be dispatched. + """ + return _core_.PyApp_IsMainLoopRunning(*args, **kwargs) + def PyApp_GetMacSupportPCMenuShortcuts(*args, **kwargs): """PyApp_GetMacSupportPCMenuShortcuts() -> bool""" return _core_.PyApp_GetMacSupportPCMenuShortcuts(*args, **kwargs) @@ -5019,6 +5492,30 @@ def GetApp(*args, **kwargs): Return a reference to the current wx.App object. """ return _core_.GetApp(*args, **kwargs) + +def SetDefaultPyEncoding(*args, **kwargs): + """ + SetDefaultPyEncoding(string encoding) + + Sets the encoding that wxPython will use when it needs to convert a + Python string or unicode object to or from a wxString. + + The default encoding is the value of ``locale.getdefaultlocale()[1]`` + but please be aware that the default encoding within the same locale + may be slightly different on different platforms. For example, please + see http://www.alanwood.net/demos/charsetdiffs.html for differences + between the common latin/roman encodings. + """ + return _core_.SetDefaultPyEncoding(*args, **kwargs) + +def GetDefaultPyEncoding(*args, **kwargs): + """ + GetDefaultPyEncoding() -> string + + Gets the current encoding that wxPython will use when it needs to + convert a Python string or unicode object to or from a wxString. + """ + return _core_.GetDefaultPyEncoding(*args, **kwargs) #---------------------------------------------------------------------- class PyOnDemandOutputWindow: @@ -5185,6 +5682,9 @@ your Mac.""" if redirect: self.RedirectStdio(filename) + # Use Python's install prefix as the default + wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix) + # This finishes the initialization of wxWindows and then calls # the OnInit that should be present in the derived class self._BootstrapApp() @@ -5226,7 +5726,8 @@ your Mac.""" def SetOutputWindowAttributes(self, title=None, pos=None, size=None): """ Set the title, position and/or size of the output window if - the stdio has been redirected. + the stdio has been redirected. This should be called before + any output would cause the output window to be created. """ if self.stdioWin: if title is not None: @@ -5318,6 +5819,70 @@ _sys.__wxPythonCleanup = __wxPyCleanup() #--------------------------------------------------------------------------- +class EventLoop(object): + """Proxy of C++ EventLoop class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxEventLoop instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """__init__(self) -> EventLoop""" + newobj = _core_.new_EventLoop(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + def __del__(self, destroy=_core_.delete_EventLoop): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + + def Run(*args, **kwargs): + """Run(self) -> int""" + return _core_.EventLoop_Run(*args, **kwargs) + + def Exit(*args, **kwargs): + """Exit(self, int rc=0)""" + return _core_.EventLoop_Exit(*args, **kwargs) + + def Pending(*args, **kwargs): + """Pending(self) -> bool""" + return _core_.EventLoop_Pending(*args, **kwargs) + + def Dispatch(*args, **kwargs): + """Dispatch(self) -> bool""" + return _core_.EventLoop_Dispatch(*args, **kwargs) + + def IsRunning(*args, **kwargs): + """IsRunning(self) -> bool""" + return _core_.EventLoop_IsRunning(*args, **kwargs) + + def GetActive(*args, **kwargs): + """GetActive() -> EventLoop""" + return _core_.EventLoop_GetActive(*args, **kwargs) + + GetActive = staticmethod(GetActive) + def SetActive(*args, **kwargs): + """SetActive(EventLoop loop)""" + return _core_.EventLoop_SetActive(*args, **kwargs) + + SetActive = staticmethod(SetActive) + +class EventLoopPtr(EventLoop): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = EventLoop +_core_.EventLoop_swigregister(EventLoopPtr) + +def EventLoop_GetActive(*args, **kwargs): + """EventLoop_GetActive() -> EventLoop""" + return _core_.EventLoop_GetActive(*args, **kwargs) + +def EventLoop_SetActive(*args, **kwargs): + """EventLoop_SetActive(EventLoop loop)""" + return _core_.EventLoop_SetActive(*args, **kwargs) + +#--------------------------------------------------------------------------- + class AcceleratorEntry(object): """ A class used to define items in an `wx.AcceleratorTable`. wxPython @@ -5679,11 +6244,18 @@ class Window(EvtHandler): Sets the position and size of the window in pixels. The sizeFlags parameter indicates the interpretation of the other params if they are - -1. wx.SIZE_AUTO*: a -1 indicates that a class-specific default - shoudl be used. wx.SIZE_USE_EXISTING: existing dimensions should be - used if -1 values are supplied. wxSIZE_ALLOW_MINUS_ONE: allow - dimensions of -1 and less to be interpreted as real dimensions, not - default values. + equal to -1. + + ======================== ====================================== + wx.SIZE_AUTO A -1 indicates that a class-specific + default should be used. + wx.SIZE_USE_EXISTING Axisting dimensions should be used if + -1 values are supplied. + wxSIZE_ALLOW_MINUS_ONE Allow dimensions of -1 and less to be + interpreted as real dimensions, not + default values. + ======================== ====================================== + """ return _core_.Window_SetDimensions(*args, **kwargs) @@ -5978,9 +6550,8 @@ class Window(EvtHandler): """ return _core_.Window_FitInside(*args, **kwargs) - def SetSizeHints(*args): + def SetSizeHints(*args, **kwargs): """ - SetSizeHints(self, Size minSize, Size maxSize=DefaultSize, Size incSize=DefaultSize) SetSizeHints(self, int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1) @@ -5993,11 +6564,25 @@ class Window(EvtHandler): The resizing increments are only significant under Motif or Xt. """ - return _core_.Window_SetSizeHints(*args) + return _core_.Window_SetSizeHints(*args, **kwargs) - def SetVirtualSizeHints(*args): + def SetSizeHintsSz(*args, **kwargs): + """ + SetSizeHintsSz(self, Size minSize, Size maxSize=DefaultSize, Size incSize=DefaultSize) + + Allows specification of minimum and maximum window sizes, and window + size increments. If a pair of values is not set (or set to -1), the + default values will be used. If this function is called, the user + will not be able to size the window outside the given bounds (if it is + a top-level window.) Sizers will also inspect the minimum window size + and will use that value if set when calculating layout. + + The resizing increments are only significant under Motif or Xt. + """ + return _core_.Window_SetSizeHintsSz(*args, **kwargs) + + def SetVirtualSizeHints(*args, **kwargs): """ - SetVirtualSizeHints(self, Size minSize, Size maxSize=DefaultSize) SetVirtualSizeHints(self, int minW, int minH, int maxW=-1, int maxH=-1) Allows specification of minimum and maximum virtual window sizes. If a @@ -6005,7 +6590,18 @@ class Window(EvtHandler): used. If this function is called, the user will not be able to size the virtual area of the window outside the given bounds. """ - return _core_.Window_SetVirtualSizeHints(*args) + return _core_.Window_SetVirtualSizeHints(*args, **kwargs) + + def SetVirtualSizeHintsSz(*args, **kwargs): + """ + SetVirtualSizeHintsSz(self, Size minSize, Size maxSize=DefaultSize) + + Allows specification of minimum and maximum virtual window sizes. If a + pair of values is not set (or set to -1), the default values will be + used. If this function is called, the user will not be able to size + the virtual area of the window outside the given bounds. + """ + return _core_.Window_SetVirtualSizeHintsSz(*args, **kwargs) def GetMaxSize(*args, **kwargs): """GetMaxSize(self) -> Size""" @@ -6323,6 +6919,30 @@ class Window(EvtHandler): """ return _core_.Window_Navigate(*args, **kwargs) + def MoveAfterInTabOrder(*args, **kwargs): + """ + MoveAfterInTabOrder(self, Window win) + + Moves this window in the tab navigation order after the specified + sibling window. This means that when the user presses the TAB key on + that other window, the focus switches to this window. + + The default tab order is the same as creation order. This function + and `MoveBeforeInTabOrder` allow to change it after creating all the + windows. + + """ + return _core_.Window_MoveAfterInTabOrder(*args, **kwargs) + + def MoveBeforeInTabOrder(*args, **kwargs): + """ + MoveBeforeInTabOrder(self, Window win) + + Same as `MoveAfterInTabOrder` except that it inserts this window just + before win instead of putting it right after it. + """ + return _core_.Window_MoveBeforeInTabOrder(*args, **kwargs) + def GetChildren(*args, **kwargs): """ GetChildren(self) -> PyObject @@ -6695,7 +7315,7 @@ class Window(EvtHandler): def RefreshRect(*args, **kwargs): """ - RefreshRect(self, Rect rect) + RefreshRect(self, Rect rect, bool eraseBackground=True) Redraws the contents of the given rectangle: the area inside it will be repainted. This is the same as Refresh but has a nicer syntax. @@ -6901,6 +7521,62 @@ class Window(EvtHandler): """ return _core_.Window_GetForegroundColour(*args, **kwargs) + def InheritsBackgroundColour(*args, **kwargs): + """InheritsBackgroundColour(self) -> bool""" + return _core_.Window_InheritsBackgroundColour(*args, **kwargs) + + def UseBgCol(*args, **kwargs): + """UseBgCol(self) -> bool""" + return _core_.Window_UseBgCol(*args, **kwargs) + + def SetBackgroundStyle(*args, **kwargs): + """ + SetBackgroundStyle(self, int style) -> bool + + Returns the background style of the window. The background style + indicates how the background of the window is drawn. + + ====================== ======================================== + wx.BG_STYLE_SYSTEM The background colour or pattern should + be determined by the system + wx.BG_STYLE_COLOUR The background should be a solid colour + wx.BG_STYLE_CUSTOM The background will be implemented by the + application. + ====================== ======================================== + + On GTK+, use of wx.BG_STYLE_CUSTOM allows the flicker-free drawing of + a custom background, such as a tiled bitmap. Currently the style has + no effect on other platforms. + + :see: `GetBackgroundStyle`, `SetBackgroundColour` + """ + return _core_.Window_SetBackgroundStyle(*args, **kwargs) + + def GetBackgroundStyle(*args, **kwargs): + """ + GetBackgroundStyle(self) -> int + + Returns the background style of the window. + + :see: `SetBackgroundStyle` + """ + return _core_.Window_GetBackgroundStyle(*args, **kwargs) + + def HasTransparentBackground(*args, **kwargs): + """ + HasTransparentBackground(self) -> bool + + Returns True if this window's background is transparent (as, for + example, for `wx.StaticText`) and should show the parent window's + background. + + This method is mostly used internally by the library itself and you + normally shouldn't have to call it. You may, however, have to override + it in your custom control classes to ensure that background is painted + correctly. + """ + return _core_.Window_HasTransparentBackground(*args, **kwargs) + def SetCursor(*args, **kwargs): """ SetCursor(self, Cursor cursor) -> bool @@ -7099,6 +7775,22 @@ class Window(EvtHandler): """ return _core_.Window_GetHandle(*args, **kwargs) + def AssociateHandle(*args, **kwargs): + """ + AssociateHandle(self, long handle) + + Associate the window with a new native handle + """ + return _core_.Window_AssociateHandle(*args, **kwargs) + + def DissociateHandle(*args, **kwargs): + """ + DissociateHandle(self) + + Dissociate the current native handle from the window + """ + return _core_.Window_DissociateHandle(*args, **kwargs) + def HasScrollbar(*args, **kwargs): """ HasScrollbar(self, int orient) -> bool @@ -7348,7 +8040,7 @@ class Window(EvtHandler): layout sizer object is already owned by the window, it will be deleted if the deleteOld parameter is true. Note that this function will also call SetAutoLayout implicitly with a True parameter if the sizer is - non-NoneL and False otherwise. + non-None, and False otherwise. """ return _core_.Window_SetSizer(*args, **kwargs) @@ -7406,8 +8098,8 @@ class Window(EvtHandler): ShouldInheritColours to return false, the colours will not be changed no matter what and only the font might. - This rather complicated logic is necessary in order to accomodate the - different usage scenarius. The most common one is when all default + This rather complicated logic is necessary in order to accommodate the + different usage scenarios. The most common one is when all default attributes are used and in this case, nothing should be inherited as in modern GUIs different controls use different fonts (and colours) than their siblings so they can't inherit the same value from the @@ -7587,6 +8279,7 @@ def Window_FromHWND(*args, **kwargs): #--------------------------------------------------------------------------- class Validator(EvtHandler): + """Proxy of C++ Validator class""" def __repr__(self): return "<%s.%s; proxy of C++ wxValidator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -7648,6 +8341,7 @@ def Validator_SetBellOnError(*args, **kwargs): return _core_.Validator_SetBellOnError(*args, **kwargs) class PyValidator(Validator): + """Proxy of C++ PyValidator class""" def __repr__(self): return "<%s.%s; proxy of C++ wxPyValidator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -7675,6 +8369,7 @@ _core_.PyValidator_swigregister(PyValidatorPtr) #--------------------------------------------------------------------------- class Menu(EvtHandler): + """Proxy of C++ Menu class""" def __repr__(self): return "<%s.%s; proxy of C++ wxMenu instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -7924,6 +8619,7 @@ DefaultValidator = cvar.DefaultValidator #--------------------------------------------------------------------------- class MenuBar(Window): + """Proxy of C++ MenuBar class""" def __repr__(self): return "<%s.%s; proxy of C++ wxMenuBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -8045,6 +8741,7 @@ _core_.MenuBar_swigregister(MenuBarPtr) #--------------------------------------------------------------------------- class MenuItem(Object): + """Proxy of C++ MenuItem class""" def __repr__(self): return "<%s.%s; proxy of C++ wxMenuItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -8158,11 +8855,67 @@ class MenuItem(Object): """SetAccel(self, AcceleratorEntry accel)""" return _core_.MenuItem_SetAccel(*args, **kwargs) + def SetFont(*args, **kwargs): + """SetFont(self, Font font)""" + return _core_.MenuItem_SetFont(*args, **kwargs) + + def GetFont(*args, **kwargs): + """GetFont(self) -> Font""" + return _core_.MenuItem_GetFont(*args, **kwargs) + + def SetTextColour(*args, **kwargs): + """SetTextColour(self, Colour colText)""" + return _core_.MenuItem_SetTextColour(*args, **kwargs) + + def GetTextColour(*args, **kwargs): + """GetTextColour(self) -> Colour""" + return _core_.MenuItem_GetTextColour(*args, **kwargs) + + def SetBackgroundColour(*args, **kwargs): + """SetBackgroundColour(self, Colour colBack)""" + return _core_.MenuItem_SetBackgroundColour(*args, **kwargs) + + def GetBackgroundColour(*args, **kwargs): + """GetBackgroundColour(self) -> Colour""" + return _core_.MenuItem_GetBackgroundColour(*args, **kwargs) + + def SetBitmaps(*args, **kwargs): + """SetBitmaps(self, Bitmap bmpChecked, Bitmap bmpUnchecked=wxNullBitmap)""" + return _core_.MenuItem_SetBitmaps(*args, **kwargs) + + def SetDisabledBitmap(*args, **kwargs): + """SetDisabledBitmap(self, Bitmap bmpDisabled)""" + return _core_.MenuItem_SetDisabledBitmap(*args, **kwargs) + + def GetDisabledBitmap(*args, **kwargs): + """GetDisabledBitmap(self) -> Bitmap""" + return _core_.MenuItem_GetDisabledBitmap(*args, **kwargs) + + def SetMarginWidth(*args, **kwargs): + """SetMarginWidth(self, int nWidth)""" + return _core_.MenuItem_SetMarginWidth(*args, **kwargs) + + def GetMarginWidth(*args, **kwargs): + """GetMarginWidth(self) -> int""" + return _core_.MenuItem_GetMarginWidth(*args, **kwargs) + def GetDefaultMarginWidth(*args, **kwargs): """GetDefaultMarginWidth() -> int""" return _core_.MenuItem_GetDefaultMarginWidth(*args, **kwargs) GetDefaultMarginWidth = staticmethod(GetDefaultMarginWidth) + def IsOwnerDrawn(*args, **kwargs): + """IsOwnerDrawn(self) -> bool""" + return _core_.MenuItem_IsOwnerDrawn(*args, **kwargs) + + def SetOwnerDrawn(*args, **kwargs): + """SetOwnerDrawn(self, bool ownerDrawn=True)""" + return _core_.MenuItem_SetOwnerDrawn(*args, **kwargs) + + def ResetOwnerDrawn(*args, **kwargs): + """ResetOwnerDrawn(self)""" + return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs) + def SetBitmap(*args, **kwargs): """SetBitmap(self, Bitmap bitmap)""" return _core_.MenuItem_SetBitmap(*args, **kwargs) @@ -8308,10 +9061,10 @@ def Control_GetClassDefaultAttributes(*args, **kwargs): class ItemContainer(object): """ - wx.ItemContainer defines an interface which is implemented by all - controls which have string subitems, each of which may be selected, - such as `wx.ListBox`, `wx.CheckListBox`, `wx.Choice` as well as - `wx.ComboBox` which implements an extended interface deriving from + The wx.ItemContainer class defines an interface which is implemented + by all controls which have string subitems, each of which may be + selected, such as `wx.ListBox`, `wx.CheckListBox`, `wx.Choice` as well + as `wx.ComboBox` which implements an extended interface deriving from this one. It defines the methods for accessing the control's items and although @@ -8338,7 +9091,7 @@ class ItemContainer(object): def AppendItems(*args, **kwargs): """ - AppendItems(self, wxArrayString strings) + AppendItems(self, List strings) Apend several items at once to the control. Notice that calling this method may be much faster than appending the items one by one if you @@ -8374,6 +9127,22 @@ class ItemContainer(object): """ return _core_.ItemContainer_Delete(*args, **kwargs) + def GetClientData(*args, **kwargs): + """ + GetClientData(self, int n) -> PyObject + + Returns the client data associated with the given item, (if any.) + """ + return _core_.ItemContainer_GetClientData(*args, **kwargs) + + def SetClientData(*args, **kwargs): + """ + SetClientData(self, int n, PyObject clientData) + + Associate the given client data with the item at position n. + """ + return _core_.ItemContainer_SetClientData(*args, **kwargs) + def GetCount(*args, **kwargs): """ GetCount(self) -> int @@ -8420,15 +9189,14 @@ class ItemContainer(object): """ return _core_.ItemContainer_FindString(*args, **kwargs) - def Select(*args, **kwargs): + def SetSelection(*args, **kwargs): """ - Select(self, int n) + SetSelection(self, int n) Sets the item at index 'n' to be the selected item. """ - return _core_.ItemContainer_Select(*args, **kwargs) + return _core_.ItemContainer_SetSelection(*args, **kwargs) - SetSelection = Select def GetSelection(*args, **kwargs): """ GetSelection(self) -> int @@ -8438,6 +9206,10 @@ class ItemContainer(object): """ return _core_.ItemContainer_GetSelection(*args, **kwargs) + def SetStringSelection(*args, **kwargs): + """SetStringSelection(self, String s) -> bool""" + return _core_.ItemContainer_SetStringSelection(*args, **kwargs) + def GetStringSelection(*args, **kwargs): """ GetStringSelection(self) -> String @@ -8447,21 +9219,14 @@ class ItemContainer(object): """ return _core_.ItemContainer_GetStringSelection(*args, **kwargs) - def GetClientData(*args, **kwargs): - """ - GetClientData(self, int n) -> PyObject - - Returns the client data associated with the given item, (if any.) - """ - return _core_.ItemContainer_GetClientData(*args, **kwargs) - - def SetClientData(*args, **kwargs): + def Select(*args, **kwargs): """ - SetClientData(self, int n, PyObject clientData) + Select(self, int n) - Associate the given client data with the item at position n. + This is the same as `SetSelection` and exists only because it is + slightly more natural for controls which support multiple selection. """ - return _core_.ItemContainer_SetClientData(*args, **kwargs) + return _core_.ItemContainer_Select(*args, **kwargs) class ItemContainerPtr(ItemContainer): @@ -8619,6 +9384,14 @@ class SizerItem(Object): """ return _core_.SizerItem_GetRatio(*args, **kwargs) + def GetRect(*args, **kwargs): + """ + GetRect(self) -> Rect + + Returns the rectangle that the sizer item should occupy + """ + return _core_.SizerItem_GetRect(*args, **kwargs) + def IsWindow(*args, **kwargs): """ IsWindow(self) -> bool @@ -8857,7 +9630,7 @@ class Sizer(Object): def Add(*args, **kwargs): """ Add(self, item, int proportion=0, int flag=0, int border=0, - PyObject userData=None) + PyObject userData=None) -> wx.SizerItem Appends a child item to the sizer. """ @@ -8866,7 +9639,7 @@ class Sizer(Object): def Insert(*args, **kwargs): """ Insert(self, int before, item, int proportion=0, int flag=0, int border=0, - PyObject userData=None) + PyObject userData=None) -> wx.SizerItem Inserts a new item into the list of items managed by this sizer before the item at index *before*. See `Add` for a description of the parameters. @@ -8876,7 +9649,7 @@ class Sizer(Object): def Prepend(*args, **kwargs): """ Prepend(self, item, int proportion=0, int flag=0, int border=0, - PyObject userData=None) + PyObject userData=None) -> wx.SizerItem Adds a new item to the begining of the list of sizer items managed by this sizer. See `Add` for a description of the parameters. @@ -8908,6 +9681,16 @@ class Sizer(Object): """ return _core_.Sizer_Detach(*args, **kwargs) + def GetItem(*args, **kwargs): + """ + GetItem(self, item) -> 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 + the item to be detached. + """ + return _core_.Sizer_GetItem(*args, **kwargs) + def _SetItemMinSize(*args, **kwargs): """_SetItemMinSize(self, PyObject item, Size size)""" return _core_.Sizer__SetItemMinSize(*args, **kwargs) @@ -8964,18 +9747,45 @@ class Sizer(Object): self.Add(*item) # for backwards compatibility only, please do not use in new code - AddWindow = wx._deprecated(Add, "AddWindow is deprecated, use `Add` instead.") - AddSizer = wx._deprecated(Add, "AddSizer is deprecated, use `Add` instead.") - AddSpacer = wx._deprecated(Add, "AddSpacer is deprecated, use `Add` instead.") - PrependWindow = wx._deprecated(Prepend, "PrependWindow is deprecated, use `Prepend` instead.") - PrependSizer = wx._deprecated(Prepend, "PrependSizer is deprecated, use `Prepend` instead.") - PrependSpacer = wx._deprecated(Prepend, "PrependSpacer is deprecated, use `Prepend` instead.") - InsertWindow = wx._deprecated(Insert, "InsertWindow is deprecated, use `Insert` instead.") - InsertSizer = wx._deprecated(Insert, "InsertSizer is deprecated, use `Insert` instead.") - InsertSpacer = wx._deprecated(Insert, "InsertSpacer is deprecated, use `Insert` instead.") - RemoveWindow = wx._deprecated(Remove, "RemoveWindow is deprecated, use `Remove` instead.") - RemoveSizer = wx._deprecated(Remove, "RemoveSizer is deprecated, use `Remove` instead.") - RemovePos = wx._deprecated(Remove, "RemovePos is deprecated, use `Remove` instead.") + def AddWindow(self, *args, **kw): + """Compatibility alias for `Add`.""" + return self.Add(*args, **kw) + def AddSizer(self, *args, **kw): + """Compatibility alias for `Add`.""" + return self.Add(*args, **kw) + def AddSpacer(self, *args, **kw): + """Compatibility alias for `Add`.""" + return self.Add(*args, **kw) + + def PrependWindow(self, *args, **kw): + """Compatibility alias for `Prepend`.""" + return self.Prepend(*args, **kw) + def PrependSizer(self, *args, **kw): + """Compatibility alias for `Prepend`.""" + return self.Prepend(*args, **kw) + def PrependSpacer(self, *args, **kw): + """Compatibility alias for `Prepend`.""" + return self.Prepend(*args, **kw) + + def InsertWindow(self, *args, **kw): + """Compatibility alias for `Insert`.""" + return self.Insert(*args, **kw) + def InsertSizer(self, *args, **kw): + """Compatibility alias for `Insert`.""" + return self.Insert(*args, **kw) + def InsertSpacer(self, *args, **kw): + """Compatibility alias for `Insert`.""" + return self.Insert(*args, **kw) + + def RemoveWindow(self, *args, **kw): + """Compatibility alias for `Remove`.""" + return self.Remove(*args, **kw) + def RemoveSizer(self, *args, **kw): + """Compatibility alias for `Remove`.""" + return self.Remove(*args, **kw) + def RemovePos(self, *args, **kw): + """Compatibility alias for `Remove`.""" + return self.Remove(*args, **kw) def SetDimension(*args, **kwargs): @@ -9139,7 +9949,7 @@ class Sizer(Object): def GetChildren(*args, **kwargs): """ - GetChildren(sefl) -> list + GetChildren(self) -> list Returns a list of all the `wx.SizerItem` objects managed by the sizer. """ @@ -9147,12 +9957,13 @@ class Sizer(Object): def Show(*args, **kwargs): """ - Show(self, item, bool show=True) + Show(self, item, bool show=True, bool recursive=false) -> bool Shows or hides an item managed by the sizer. To make a sizer item disappear or reappear, use Show followed by `Layout`. The *item* parameter can be either a window, a sizer, or the zero-based index of - the item. + the item. Use the recursive parameter to show or hide an item in a + subsizer. Returns True if the item was found. """ return _core_.Sizer_Show(*args, **kwargs) @@ -9167,17 +9978,17 @@ class Sizer(Object): """ return _core_.Sizer_IsShown(*args, **kwargs) - def Hide(self, item): + def Hide(self, item, recursive=False): """ - A convenience method for Show(item, False). + A convenience method for `Show`(item, False, recursive). """ - self.Show(item, False) + return self.Show(item, False, recursive) def ShowItems(*args, **kwargs): """ ShowItems(self, bool show) - Recursively call `wx.Window.Show` on all sizer items. + Recursively call `wx.SizerItem.Show` on all sizer items. """ return _core_.Sizer_ShowItems(*args, **kwargs) @@ -9225,7 +10036,7 @@ class PySizer(Sizer): When `Layout` is called it first calls `CalcMin` followed by `RecalcSizes` so you can optimize a bit by saving the results of - `CalcMin` and resuing them in `RecalcSizes`. + `CalcMin` and reusing them in `RecalcSizes`. :see: `wx.SizerItem`, `wx.Sizer.GetChildren` @@ -9633,6 +10444,82 @@ class FlexGridSizerPtr(FlexGridSizer): self.__class__ = FlexGridSizer _core_.FlexGridSizer_swigregister(FlexGridSizerPtr) +class StdDialogButtonSizer(BoxSizer): + """ + A special sizer that knows how to order and position standard buttons + in order to conform to the current platform's standards. You simply + need to add each `wx.Button` to the sizer, and be sure to create the + buttons using the standard ID's. Then call `Realize` and the sizer + will take care of the rest. + + """ + def __repr__(self): + return "<%s.%s; proxy of C++ wxStdDialogButtonSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """__init__(self) -> StdDialogButtonSizer""" + newobj = _core_.new_StdDialogButtonSizer(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + def AddButton(*args, **kwargs): + """ + AddButton(self, wxButton button) + + Use this to add the buttons to this sizer. Do not use the `Add` + method in the base class. + """ + return _core_.StdDialogButtonSizer_AddButton(*args, **kwargs) + + def Realize(*args, **kwargs): + """ + Realize(self) + + This funciton needs to be called after all the buttons have been added + to the sizer. It will reorder them and position them in a platform + specifc manner. + """ + return _core_.StdDialogButtonSizer_Realize(*args, **kwargs) + + def SetAffirmativeButton(*args, **kwargs): + """SetAffirmativeButton(self, wxButton button)""" + return _core_.StdDialogButtonSizer_SetAffirmativeButton(*args, **kwargs) + + def SetNegativeButton(*args, **kwargs): + """SetNegativeButton(self, wxButton button)""" + return _core_.StdDialogButtonSizer_SetNegativeButton(*args, **kwargs) + + def SetCancelButton(*args, **kwargs): + """SetCancelButton(self, wxButton button)""" + return _core_.StdDialogButtonSizer_SetCancelButton(*args, **kwargs) + + def GetAffirmativeButton(*args, **kwargs): + """GetAffirmativeButton(self) -> wxButton""" + return _core_.StdDialogButtonSizer_GetAffirmativeButton(*args, **kwargs) + + def GetApplyButton(*args, **kwargs): + """GetApplyButton(self) -> wxButton""" + return _core_.StdDialogButtonSizer_GetApplyButton(*args, **kwargs) + + def GetNegativeButton(*args, **kwargs): + """GetNegativeButton(self) -> wxButton""" + return _core_.StdDialogButtonSizer_GetNegativeButton(*args, **kwargs) + + def GetCancelButton(*args, **kwargs): + """GetCancelButton(self) -> wxButton""" + return _core_.StdDialogButtonSizer_GetCancelButton(*args, **kwargs) + + def GetHelpButton(*args, **kwargs): + """GetHelpButton(self) -> wxButton""" + return _core_.StdDialogButtonSizer_GetHelpButton(*args, **kwargs) + + +class StdDialogButtonSizerPtr(StdDialogButtonSizer): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = StdDialogButtonSizer +_core_.StdDialogButtonSizer_swigregister(StdDialogButtonSizerPtr) + #--------------------------------------------------------------------------- class GBPosition(object): @@ -9964,10 +10851,12 @@ class GridBagSizer(FlexGridSizer): self.this = newobj.this self.thisown = 1 del newobj.thisown + self._setOORInfo(self) + def Add(*args, **kwargs): """ Add(self, item, GBPosition pos, GBSpan span=DefaultSpan, int flag=0, - int border=0, userData=None) + int border=0, userData=None) -> wx.GBSizerItem Adds an item to the sizer at the grid cell *pos*, optionally spanning more than one row or column as specified with *span*. The remaining @@ -9981,7 +10870,7 @@ class GridBagSizer(FlexGridSizer): def AddItem(*args, **kwargs): """ - Add(self, GBSizerItem item) -> bool + Add(self, GBSizerItem item) -> wx.GBSizerItem Add an item to the sizer using a `wx.GBSizerItem`. Returns True if the item was successfully placed at its given cell position, False if @@ -9989,6 +10878,15 @@ class GridBagSizer(FlexGridSizer): """ return _core_.GridBagSizer_AddItem(*args, **kwargs) + def GetCellSize(*args, **kwargs): + """ + GetCellSize(self, int row, int col) -> Size + + Get the size of the specified cell, including hgap and + vgap. Only valid after a Layout. + """ + return _core_.GridBagSizer_GetCellSize(*args, **kwargs) + def GetEmptyCellSize(*args, **kwargs): """ GetEmptyCellSize(self) -> Size @@ -10410,16 +11308,41 @@ __wxPyPtrTypeMap['wxStatusBar95'] = 'wxStatusBar' #---------------------------------------------------------------------------- # Load version numbers from __version__... Ensure that major and minor -# versions are the same for both wxPython and wxWindows. +# versions are the same for both wxPython and wxWidgets. from __version__ import * __version__ = VERSION_STRING -assert MAJOR_VERSION == _core_.MAJOR_VERSION, "wxPython/wxWindows version mismatch" -assert MINOR_VERSION == _core_.MINOR_VERSION, "wxPython/wxWindows version mismatch" +assert MAJOR_VERSION == _core_.MAJOR_VERSION, "wxPython/wxWidgets version mismatch" +assert MINOR_VERSION == _core_.MINOR_VERSION, "wxPython/wxWidgets version mismatch" if RELEASE_VERSION != _core_.RELEASE_VERSION: import warnings - warnings.warn("wxPython/wxWindows release number mismatch") + warnings.warn("wxPython/wxWidgets release number mismatch") + +#---------------------------------------------------------------------------- + +# Set the default string<-->unicode conversion encoding from the +# locale. This encoding is used when string or unicode objects need +# to be converted in order to pass them to wxWidgets. Please be aware +# that the default encoding within the same locale may be slightly +# different on different platforms. For example, please see +# http://www.alanwood.net/demos/charsetdiffs.html for differences +# between the common latin/roman encodings. + +default = _sys.getdefaultencoding() +if default == 'ascii': + import locale + import codecs + try: + default = locale.getdefaultlocale()[1] + codecs.lookup(default) + except (ValueError, LookupError): + default = _sys.getdefaultencoding() + del locale + del codecs +if default: + wx.SetDefaultPyEncoding(default) +del default #---------------------------------------------------------------------------- @@ -10481,7 +11404,6 @@ class _wxPyUnbornObject(object): #---------------------------------------------------------------------------- -_wxPyCallAfterId = None def CallAfter(callable, *args, **kw): """ @@ -10495,25 +11417,23 @@ def CallAfter(callable, *args, **kw): app = wx.GetApp() assert app is not None, 'No wx.App created yet' - global _wxPyCallAfterId - if _wxPyCallAfterId is None: - _wxPyCallAfterId = wx.NewEventType() - app.Connect(-1, -1, _wxPyCallAfterId, - lambda event: event.callable(*event.args, **event.kw) ) + if not hasattr(app, "_CallAfterId"): + app._CallAfterId = wx.NewEventType() + app.Connect(-1, -1, app._CallAfterId, + lambda event: event.callable(*event.args, **event.kw) ) evt = wx.PyEvent() - evt.SetEventType(_wxPyCallAfterId) + evt.SetEventType(app._CallAfterId) evt.callable = callable evt.args = args evt.kw = kw wx.PostEvent(app, evt) - #---------------------------------------------------------------------------- class FutureCall: """ - A convenience class for wx.Timer, that calls the given callable + A convenience class for `wx.Timer`, that calls the given callable object once after the given amount of milliseconds, passing any positional or keyword args. The return value of the callable is availbale after it has been run with the `GetResult` method.