reSWIGged

[wxWidgets.git] / wxPython / src / mac / _core.py

diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py
index d8374f26a4c43471c15c593d77349c298ce43255..0d380a49b215ce9337579f7b5bd371a6b19fd6a7 100644 (file)
--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -102,6 +102,7 @@ CENTRE_ON_SCREEN = _core_.CENTRE_ON_SCREEN
 CENTER_ON_SCREEN = _core_.CENTER_ON_SCREEN
 CLIP_CHILDREN = _core_.CLIP_CHILDREN
 CLIP_SIBLINGS = _core_.CLIP_SIBLINGS
 CENTER_ON_SCREEN = _core_.CENTER_ON_SCREEN
 CLIP_CHILDREN = _core_.CLIP_CHILDREN
 CLIP_SIBLINGS = _core_.CLIP_SIBLINGS

+WINDOW_STYLE_MASK = _core_.WINDOW_STYLE_MASK

 ALWAYS_SHOW_SB = _core_.ALWAYS_SHOW_SB
 RETAINED = _core_.RETAINED
 BACKINGSTORE = _core_.BACKINGSTORE
 ALWAYS_SHOW_SB = _core_.ALWAYS_SHOW_SB
 RETAINED = _core_.RETAINED
 BACKINGSTORE = _core_.BACKINGSTORE


@@ -133,6 +134,8 @@ SB_VERTICAL = _core_.SB_VERTICAL
 RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX
 ST_SIZEGRIP = _core_.ST_SIZEGRIP
 ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE
 RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX
 ST_SIZEGRIP = _core_.ST_SIZEGRIP
 ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE

+ST_DOTS_MIDDLE = _core_.ST_DOTS_MIDDLE
+ST_DOTS_END = _core_.ST_DOTS_END

 FLOOD_SURFACE = _core_.FLOOD_SURFACE
 FLOOD_BORDER = _core_.FLOOD_BORDER
 ODDEVEN_RULE = _core_.ODDEVEN_RULE
 FLOOD_SURFACE = _core_.FLOOD_SURFACE
 FLOOD_BORDER = _core_.FLOOD_BORDER
 ODDEVEN_RULE = _core_.ODDEVEN_RULE


@@ -269,13 +272,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
 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
-HIDE_READONLY = _core_.HIDE_READONLY
-OVERWRITE_PROMPT = _core_.OVERWRITE_PROMPT
-FILE_MUST_EXIST = _core_.FILE_MUST_EXIST
-MULTIPLE = _core_.MULTIPLE
-CHANGE_DIR = _core_.CHANGE_DIR

 ACCEL_ALT = _core_.ACCEL_ALT
 ACCEL_CTRL = _core_.ACCEL_CTRL
 ACCEL_SHIFT = _core_.ACCEL_SHIFT
 ACCEL_ALT = _core_.ACCEL_ALT
 ACCEL_CTRL = _core_.ACCEL_CTRL
 ACCEL_SHIFT = _core_.ACCEL_SHIFT


@@ -288,8 +284,6 @@ 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
 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
 MB_DOCKABLE = _core_.MB_DOCKABLE
 NO_FULL_REPAINT_ON_RESIZE = _core_.NO_FULL_REPAINT_ON_RESIZE
 MENU_TEAROFF = _core_.MENU_TEAROFF
 MB_DOCKABLE = _core_.MB_DOCKABLE
 NO_FULL_REPAINT_ON_RESIZE = _core_.NO_FULL_REPAINT_ON_RESIZE


@@ -719,10 +713,8 @@ class Object(object):
         args[0].thisown = 0
         return val
 
         args[0].thisown = 0
         return val
 

-Object_swigregister = _core_.Object_swigregister
-Object_swigregister(Object)
+_core_.Object_swigregister(Object)

 _wxPySetDictionary = _core_._wxPySetDictionary
 _wxPySetDictionary = _core_._wxPySetDictionary

-_wxPyFixStockObjects = _core_._wxPyFixStockObjects

 cvar = _core_.cvar
 EmptyString = cvar.EmptyString
 
 cvar = _core_.cvar
 EmptyString = cvar.EmptyString
 


@@ -804,7 +796,7 @@ class Size(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Size sz) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.Size objects.
         """
 
         Test for equality of wx.Size objects.
         """


@@ -812,9 +804,9 @@ class Size(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Size sz) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality.
+        Test for inequality of wx.Size objects.

         """
         return _core_.Size___ne__(*args, **kwargs)
 
         """
         return _core_.Size___ne__(*args, **kwargs)
 


@@ -914,8 +906,7 @@ class Size(object):
     __safe_for_unpickling__ = True
     def __reduce__(self):                return (wx.Size, self.Get())
 
     __safe_for_unpickling__ = True
     def __reduce__(self):                return (wx.Size, self.Get())
 

-Size_swigregister = _core_.Size_swigregister
-Size_swigregister(Size)
+_core_.Size_swigregister(Size)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -940,7 +931,7 @@ class RealPoint(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, RealPoint pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.RealPoint objects.
         """
 
         Test for equality of wx.RealPoint objects.
         """


@@ -948,7 +939,7 @@ class RealPoint(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, RealPoint pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
         Test for inequality of wx.RealPoint objects.
         """
 
         Test for inequality of wx.RealPoint objects.
         """


@@ -999,8 +990,7 @@ class RealPoint(object):
     __safe_for_unpickling__ = True
     def __reduce__(self):                return (wx.RealPoint, self.Get())
 
     __safe_for_unpickling__ = True
     def __reduce__(self):                return (wx.RealPoint, self.Get())
 

-RealPoint_swigregister = _core_.RealPoint_swigregister
-RealPoint_swigregister(RealPoint)
+_core_.RealPoint_swigregister(RealPoint)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -1025,7 +1015,7 @@ class Point(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Point pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.Point objects.
         """
 
         Test for equality of wx.Point objects.
         """


@@ -1033,7 +1023,7 @@ class Point(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Point pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
         Test for inequality of wx.Point objects.
         """
 
         Test for inequality of wx.Point objects.
         """


@@ -1100,8 +1090,7 @@ class Point(object):
     __safe_for_unpickling__ = True
     def __reduce__(self):                return (wx.Point, self.Get())
 
     __safe_for_unpickling__ = True
     def __reduce__(self):                return (wx.Point, self.Get())
 

-Point_swigregister = _core_.Point_swigregister
-Point_swigregister(Point)
+_core_.Point_swigregister(Point)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -1316,17 +1305,17 @@ class Rect(object):
 
     def __eq__(*args, **kwargs):
         """
 
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Rect rect) -> bool
+        __eq__(self, PyObject other) -> bool

 
 

-        Test for equality.
+        Test for equality of wx.Rect objects.

         """
         return _core_.Rect___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """
         """
         return _core_.Rect___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Rect rect) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality.
+        Test for inequality of wx.Rect objects.

         """
         return _core_.Rect___ne__(*args, **kwargs)
 
         """
         return _core_.Rect___ne__(*args, **kwargs)
 


@@ -1399,8 +1388,7 @@ class Rect(object):
     __safe_for_unpickling__ = True
     def __reduce__(self):                return (wx.Rect, self.Get())
 
     __safe_for_unpickling__ = True
     def __reduce__(self):                return (wx.Rect, self.Get())
 

-Rect_swigregister = _core_.Rect_swigregister
-Rect_swigregister(Rect)
+_core_.Rect_swigregister(Rect)

 
 def RectPP(*args, **kwargs):
     """
 
 def RectPP(*args, **kwargs):
     """


@@ -1533,17 +1521,17 @@ class Point2D(object):
 
     def __eq__(*args, **kwargs):
         """
 
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Point2D pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
 

-        Test for equality
+        Test for equality of wx.Point2D objects.

         """
         return _core_.Point2D___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """
         """
         return _core_.Point2D___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Point2D pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality
+        Test for inequality of wx.Point2D objects.

         """
         return _core_.Point2D___ne__(*args, **kwargs)
 
         """
         return _core_.Point2D___ne__(*args, **kwargs)
 


@@ -1574,8 +1562,7 @@ class Point2D(object):
     __safe_for_unpickling__ = True
     def __reduce__(self):                return (wx.Point2D, self.Get())
 
     __safe_for_unpickling__ = True
     def __reduce__(self):                return (wx.Point2D, self.Get())
 

-Point2D_swigregister = _core_.Point2D_swigregister
-Point2D_swigregister(Point2D)
+_core_.Point2D_swigregister(Point2D)

 
 def Point2DCopy(*args, **kwargs):
     """
 
 def Point2DCopy(*args, **kwargs):
     """


@@ -1673,8 +1660,7 @@ class InputStream(object):
         """TellI(self) -> long"""
         return _core_.InputStream_TellI(*args, **kwargs)
 
         """TellI(self) -> long"""
         return _core_.InputStream_TellI(*args, **kwargs)
 

-InputStream_swigregister = _core_.InputStream_swigregister
-InputStream_swigregister(InputStream)
+_core_.InputStream_swigregister(InputStream)

 DefaultPosition = cvar.DefaultPosition
 DefaultSize = cvar.DefaultSize
 
 DefaultPosition = cvar.DefaultPosition
 DefaultSize = cvar.DefaultSize
 


@@ -1691,8 +1677,7 @@ class OutputStream(object):
         """LastWrite(self) -> size_t"""
         return _core_.OutputStream_LastWrite(*args, **kwargs)
 
         """LastWrite(self) -> size_t"""
         return _core_.OutputStream_LastWrite(*args, **kwargs)
 

-OutputStream_swigregister = _core_.OutputStream_swigregister
-OutputStream_swigregister(OutputStream)
+_core_.OutputStream_swigregister(OutputStream)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -1706,8 +1691,6 @@ class FSFile(Object):
             DateTime modif) -> FSFile
         """
         _core_.FSFile_swiginit(self,_core_.new_FSFile(*args, **kwargs))
             DateTime modif) -> FSFile
         """
         _core_.FSFile_swiginit(self,_core_.new_FSFile(*args, **kwargs))

-        self.thisown = 0   # It will normally be deleted by the user of the wx.FileSystem
-

     __swig_destroy__ = _core_.delete_FSFile
     __del__ = lambda self : None;
     def GetStream(*args, **kwargs):
     __swig_destroy__ = _core_.delete_FSFile
     __del__ = lambda self : None;
     def GetStream(*args, **kwargs):


@@ -1730,16 +1713,16 @@ class FSFile(Object):
         """GetModificationTime(self) -> DateTime"""
         return _core_.FSFile_GetModificationTime(*args, **kwargs)
 
         """GetModificationTime(self) -> DateTime"""
         return _core_.FSFile_GetModificationTime(*args, **kwargs)
 

-FSFile_swigregister = _core_.FSFile_swigregister
-FSFile_swigregister(FSFile)
+_core_.FSFile_swigregister(FSFile)

 
 class CPPFileSystemHandler(object):
     """Proxy of C++ CPPFileSystemHandler class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
 
 class CPPFileSystemHandler(object):
     """Proxy of C++ CPPFileSystemHandler class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr

-CPPFileSystemHandler_swigregister = _core_.CPPFileSystemHandler_swigregister
-CPPFileSystemHandler_swigregister(CPPFileSystemHandler)
+    __swig_destroy__ = _core_.delete_CPPFileSystemHandler
+    __del__ = lambda self : None;
+_core_.CPPFileSystemHandler_swigregister(CPPFileSystemHandler)

 
 class FileSystemHandler(CPPFileSystemHandler):
     """Proxy of C++ FileSystemHandler class"""
 
 class FileSystemHandler(CPPFileSystemHandler):
     """Proxy of C++ FileSystemHandler class"""


@@ -1790,8 +1773,7 @@ class FileSystemHandler(CPPFileSystemHandler):
         """GetMimeTypeFromExt(self, String location) -> String"""
         return _core_.FileSystemHandler_GetMimeTypeFromExt(*args, **kwargs)
 
         """GetMimeTypeFromExt(self, String location) -> String"""
         return _core_.FileSystemHandler_GetMimeTypeFromExt(*args, **kwargs)
 

-FileSystemHandler_swigregister = _core_.FileSystemHandler_swigregister
-FileSystemHandler_swigregister(FileSystemHandler)
+_core_.FileSystemHandler_swigregister(FileSystemHandler)

 
 class FileSystem(Object):
     """Proxy of C++ FileSystem class"""
 
 class FileSystem(Object):
     """Proxy of C++ FileSystem class"""


@@ -1842,8 +1824,7 @@ class FileSystem(Object):
         return _core_.FileSystem_URLToFileName(*args, **kwargs)
 
     URLToFileName = staticmethod(URLToFileName)
         return _core_.FileSystem_URLToFileName(*args, **kwargs)
 
     URLToFileName = staticmethod(URLToFileName)

-FileSystem_swigregister = _core_.FileSystem_swigregister
-FileSystem_swigregister(FileSystem)
+_core_.FileSystem_swigregister(FileSystem)

 
 def FileSystem_AddHandler(*args, **kwargs):
   """FileSystem_AddHandler(CPPFileSystemHandler handler)"""
 
 def FileSystem_AddHandler(*args, **kwargs):
   """FileSystem_AddHandler(CPPFileSystemHandler handler)"""


@@ -1876,8 +1857,7 @@ class InternetFSHandler(CPPFileSystemHandler):
         """OpenFile(self, FileSystem fs, String location) -> FSFile"""
         return _core_.InternetFSHandler_OpenFile(*args, **kwargs)
 
         """OpenFile(self, FileSystem fs, String location) -> FSFile"""
         return _core_.InternetFSHandler_OpenFile(*args, **kwargs)
 

-InternetFSHandler_swigregister = _core_.InternetFSHandler_swigregister
-InternetFSHandler_swigregister(InternetFSHandler)
+_core_.InternetFSHandler_swigregister(InternetFSHandler)

 
 class ZipFSHandler(CPPFileSystemHandler):
     """Proxy of C++ ZipFSHandler class"""
 
 class ZipFSHandler(CPPFileSystemHandler):
     """Proxy of C++ ZipFSHandler class"""


@@ -1902,8 +1882,7 @@ class ZipFSHandler(CPPFileSystemHandler):
         """FindNext(self) -> String"""
         return _core_.ZipFSHandler_FindNext(*args, **kwargs)
 
         """FindNext(self) -> String"""
         return _core_.ZipFSHandler_FindNext(*args, **kwargs)
 

-ZipFSHandler_swigregister = _core_.ZipFSHandler_swigregister
-ZipFSHandler_swigregister(ZipFSHandler)
+_core_.ZipFSHandler_swigregister(ZipFSHandler)

 
 
 def __wxMemoryFSHandler_AddFile_wxImage(*args, **kwargs):
 
 
 def __wxMemoryFSHandler_AddFile_wxImage(*args, **kwargs):


@@ -1963,8 +1942,7 @@ class MemoryFSHandler(CPPFileSystemHandler):
         """FindNext(self) -> String"""
         return _core_.MemoryFSHandler_FindNext(*args, **kwargs)
 
         """FindNext(self) -> String"""
         return _core_.MemoryFSHandler_FindNext(*args, **kwargs)
 

-MemoryFSHandler_swigregister = _core_.MemoryFSHandler_swigregister
-MemoryFSHandler_swigregister(MemoryFSHandler)
+_core_.MemoryFSHandler_swigregister(MemoryFSHandler)

 
 def MemoryFSHandler_RemoveFile(*args, **kwargs):
   """MemoryFSHandler_RemoveFile(String filename)"""
 
 def MemoryFSHandler_RemoveFile(*args, **kwargs):
   """MemoryFSHandler_RemoveFile(String filename)"""


@@ -2004,6 +1982,10 @@ class ImageHandler(Object):
         """CanRead(self, String name) -> bool"""
         return _core_.ImageHandler_CanRead(*args, **kwargs)
 
         """CanRead(self, String name) -> bool"""
         return _core_.ImageHandler_CanRead(*args, **kwargs)
 

+    def CanReadStream(*args, **kwargs):
+        """CanReadStream(self, InputStream stream) -> bool"""
+        return _core_.ImageHandler_CanReadStream(*args, **kwargs)
+

     def SetName(*args, **kwargs):
         """SetName(self, String name)"""
         return _core_.ImageHandler_SetName(*args, **kwargs)
     def SetName(*args, **kwargs):
         """SetName(self, String name)"""
         return _core_.ImageHandler_SetName(*args, **kwargs)


@@ -2020,8 +2002,7 @@ class ImageHandler(Object):
         """SetMimeType(self, String mimetype)"""
         return _core_.ImageHandler_SetMimeType(*args, **kwargs)
 
         """SetMimeType(self, String mimetype)"""
         return _core_.ImageHandler_SetMimeType(*args, **kwargs)
 

-ImageHandler_swigregister = _core_.ImageHandler_swigregister
-ImageHandler_swigregister(ImageHandler)
+_core_.ImageHandler_swigregister(ImageHandler)

 
 class PyImageHandler(ImageHandler):
     """
 
 class PyImageHandler(ImageHandler):
     """


@@ -2086,8 +2067,7 @@ class PyImageHandler(ImageHandler):
         """_SetSelf(self, PyObject self)"""
         return _core_.PyImageHandler__SetSelf(*args, **kwargs)
 
         """_SetSelf(self, PyObject self)"""
         return _core_.PyImageHandler__SetSelf(*args, **kwargs)
 

-PyImageHandler_swigregister = _core_.PyImageHandler_swigregister
-PyImageHandler_swigregister(PyImageHandler)
+_core_.PyImageHandler_swigregister(PyImageHandler)

 
 class ImageHistogram(object):
     """Proxy of C++ ImageHistogram class"""
 
 class ImageHistogram(object):
     """Proxy of C++ ImageHistogram class"""


@@ -2140,8 +2120,7 @@ class ImageHistogram(object):
         """
         return _core_.ImageHistogram_GetCountColour(*args, **kwargs)
 
         """
         return _core_.ImageHistogram_GetCountColour(*args, **kwargs)
 

-ImageHistogram_swigregister = _core_.ImageHistogram_swigregister
-ImageHistogram_swigregister(ImageHistogram)
+_core_.ImageHistogram_swigregister(ImageHistogram)

 
 def ImageHistogram_MakeKey(*args, **kwargs):
   """
 
 def ImageHistogram_MakeKey(*args, **kwargs):
   """


@@ -2170,8 +2149,7 @@ class Image_RGBValue(object):
     red = property(_core_.Image_RGBValue_red_get, _core_.Image_RGBValue_red_set)
     green = property(_core_.Image_RGBValue_green_get, _core_.Image_RGBValue_green_set)
     blue = property(_core_.Image_RGBValue_blue_get, _core_.Image_RGBValue_blue_set)
     red = property(_core_.Image_RGBValue_red_get, _core_.Image_RGBValue_red_set)
     green = property(_core_.Image_RGBValue_green_get, _core_.Image_RGBValue_green_set)
     blue = property(_core_.Image_RGBValue_blue_get, _core_.Image_RGBValue_blue_set)

-Image_RGBValue_swigregister = _core_.Image_RGBValue_swigregister
-Image_RGBValue_swigregister(Image_RGBValue)
+_core_.Image_RGBValue_swigregister(Image_RGBValue)

 
 class Image_HSVValue(object):
     """
 
 class Image_HSVValue(object):
     """


@@ -2192,8 +2170,7 @@ class Image_HSVValue(object):
     hue = property(_core_.Image_HSVValue_hue_get, _core_.Image_HSVValue_hue_set)
     saturation = property(_core_.Image_HSVValue_saturation_get, _core_.Image_HSVValue_saturation_set)
     value = property(_core_.Image_HSVValue_value_get, _core_.Image_HSVValue_value_set)
     hue = property(_core_.Image_HSVValue_hue_get, _core_.Image_HSVValue_hue_set)
     saturation = property(_core_.Image_HSVValue_saturation_get, _core_.Image_HSVValue_saturation_set)
     value = property(_core_.Image_HSVValue_value_get, _core_.Image_HSVValue_value_set)

-Image_HSVValue_swigregister = _core_.Image_HSVValue_swigregister
-Image_HSVValue_swigregister(Image_HSVValue)
+_core_.Image_HSVValue_swigregister(Image_HSVValue)

 
 class Image(Object):
     """
 
 class Image(Object):
     """


@@ -2910,8 +2887,7 @@ class Image(Object):
 
     HSVtoRGB = staticmethod(HSVtoRGB)
     def __nonzero__(self): return self.Ok() 
 
     HSVtoRGB = staticmethod(HSVtoRGB)
     def __nonzero__(self): return self.Ok() 

-Image_swigregister = _core_.Image_swigregister
-Image_swigregister(Image)
+_core_.Image_swigregister(Image)

 
 def ImageFromMime(*args, **kwargs):
     """
 
 def ImageFromMime(*args, **kwargs):
     """


@@ -3087,8 +3063,7 @@ class BMPHandler(ImageHandler):
         A `wx.ImageHandler` for \*.bmp bitmap files.
         """
         _core_.BMPHandler_swiginit(self,_core_.new_BMPHandler(*args, **kwargs))
         A `wx.ImageHandler` for \*.bmp bitmap files.
         """
         _core_.BMPHandler_swiginit(self,_core_.new_BMPHandler(*args, **kwargs))

-BMPHandler_swigregister = _core_.BMPHandler_swigregister
-BMPHandler_swigregister(BMPHandler)
+_core_.BMPHandler_swigregister(BMPHandler)

 NullImage = cvar.NullImage
 IMAGE_OPTION_FILENAME = cvar.IMAGE_OPTION_FILENAME
 IMAGE_OPTION_BMP_FORMAT = cvar.IMAGE_OPTION_BMP_FORMAT
 NullImage = cvar.NullImage
 IMAGE_OPTION_FILENAME = cvar.IMAGE_OPTION_FILENAME
 IMAGE_OPTION_BMP_FORMAT = cvar.IMAGE_OPTION_BMP_FORMAT


@@ -3117,8 +3092,7 @@ class ICOHandler(BMPHandler):
         A `wx.ImageHandler` for \*.ico icon files.
         """
         _core_.ICOHandler_swiginit(self,_core_.new_ICOHandler(*args, **kwargs))
         A `wx.ImageHandler` for \*.ico icon files.
         """
         _core_.ICOHandler_swiginit(self,_core_.new_ICOHandler(*args, **kwargs))

-ICOHandler_swigregister = _core_.ICOHandler_swigregister
-ICOHandler_swigregister(ICOHandler)
+_core_.ICOHandler_swigregister(ICOHandler)

 
 class CURHandler(ICOHandler):
     """A `wx.ImageHandler` for \*.cur cursor files."""
 
 class CURHandler(ICOHandler):
     """A `wx.ImageHandler` for \*.cur cursor files."""


@@ -3131,8 +3105,7 @@ class CURHandler(ICOHandler):
         A `wx.ImageHandler` for \*.cur cursor files.
         """
         _core_.CURHandler_swiginit(self,_core_.new_CURHandler(*args, **kwargs))
         A `wx.ImageHandler` for \*.cur cursor files.
         """
         _core_.CURHandler_swiginit(self,_core_.new_CURHandler(*args, **kwargs))

-CURHandler_swigregister = _core_.CURHandler_swigregister
-CURHandler_swigregister(CURHandler)
+_core_.CURHandler_swigregister(CURHandler)

 
 class ANIHandler(CURHandler):
     """A `wx.ImageHandler` for \*.ani animated cursor files."""
 
 class ANIHandler(CURHandler):
     """A `wx.ImageHandler` for \*.ani animated cursor files."""


@@ -3145,8 +3118,7 @@ class ANIHandler(CURHandler):
         A `wx.ImageHandler` for \*.ani animated cursor files.
         """
         _core_.ANIHandler_swiginit(self,_core_.new_ANIHandler(*args, **kwargs))
         A `wx.ImageHandler` for \*.ani animated cursor files.
         """
         _core_.ANIHandler_swiginit(self,_core_.new_ANIHandler(*args, **kwargs))

-ANIHandler_swigregister = _core_.ANIHandler_swigregister
-ANIHandler_swigregister(ANIHandler)
+_core_.ANIHandler_swigregister(ANIHandler)

 
 class PNGHandler(ImageHandler):
     """A `wx.ImageHandler` for PNG image files."""
 
 class PNGHandler(ImageHandler):
     """A `wx.ImageHandler` for PNG image files."""


@@ -3159,8 +3131,7 @@ class PNGHandler(ImageHandler):
         A `wx.ImageHandler` for PNG image files.
         """
         _core_.PNGHandler_swiginit(self,_core_.new_PNGHandler(*args, **kwargs))
         A `wx.ImageHandler` for PNG image files.
         """
         _core_.PNGHandler_swiginit(self,_core_.new_PNGHandler(*args, **kwargs))

-PNGHandler_swigregister = _core_.PNGHandler_swigregister
-PNGHandler_swigregister(PNGHandler)
+_core_.PNGHandler_swigregister(PNGHandler)

 
 class GIFHandler(ImageHandler):
     """A `wx.ImageHandler` for GIF image files."""
 
 class GIFHandler(ImageHandler):
     """A `wx.ImageHandler` for GIF image files."""


@@ -3173,8 +3144,7 @@ class GIFHandler(ImageHandler):
         A `wx.ImageHandler` for GIF image files.
         """
         _core_.GIFHandler_swiginit(self,_core_.new_GIFHandler(*args, **kwargs))
         A `wx.ImageHandler` for GIF image files.
         """
         _core_.GIFHandler_swiginit(self,_core_.new_GIFHandler(*args, **kwargs))

-GIFHandler_swigregister = _core_.GIFHandler_swigregister
-GIFHandler_swigregister(GIFHandler)
+_core_.GIFHandler_swigregister(GIFHandler)

 
 class PCXHandler(ImageHandler):
     """A `wx.ImageHandler` for PCX imager files."""
 
 class PCXHandler(ImageHandler):
     """A `wx.ImageHandler` for PCX imager files."""


@@ -3187,8 +3157,7 @@ class PCXHandler(ImageHandler):
         A `wx.ImageHandler` for PCX imager files.
         """
         _core_.PCXHandler_swiginit(self,_core_.new_PCXHandler(*args, **kwargs))
         A `wx.ImageHandler` for PCX imager files.
         """
         _core_.PCXHandler_swiginit(self,_core_.new_PCXHandler(*args, **kwargs))

-PCXHandler_swigregister = _core_.PCXHandler_swigregister
-PCXHandler_swigregister(PCXHandler)
+_core_.PCXHandler_swigregister(PCXHandler)

 
 class JPEGHandler(ImageHandler):
     """A `wx.ImageHandler` for JPEG/JPG image files."""
 
 class JPEGHandler(ImageHandler):
     """A `wx.ImageHandler` for JPEG/JPG image files."""


@@ -3201,8 +3170,7 @@ class JPEGHandler(ImageHandler):
         A `wx.ImageHandler` for JPEG/JPG image files.
         """
         _core_.JPEGHandler_swiginit(self,_core_.new_JPEGHandler(*args, **kwargs))
         A `wx.ImageHandler` for JPEG/JPG image files.
         """
         _core_.JPEGHandler_swiginit(self,_core_.new_JPEGHandler(*args, **kwargs))

-JPEGHandler_swigregister = _core_.JPEGHandler_swigregister
-JPEGHandler_swigregister(JPEGHandler)
+_core_.JPEGHandler_swigregister(JPEGHandler)

 
 class PNMHandler(ImageHandler):
     """A `wx.ImageHandler` for PNM image files."""
 
 class PNMHandler(ImageHandler):
     """A `wx.ImageHandler` for PNM image files."""


@@ -3215,8 +3183,7 @@ class PNMHandler(ImageHandler):
         A `wx.ImageHandler` for PNM image files.
         """
         _core_.PNMHandler_swiginit(self,_core_.new_PNMHandler(*args, **kwargs))
         A `wx.ImageHandler` for PNM image files.
         """
         _core_.PNMHandler_swiginit(self,_core_.new_PNMHandler(*args, **kwargs))

-PNMHandler_swigregister = _core_.PNMHandler_swigregister
-PNMHandler_swigregister(PNMHandler)
+_core_.PNMHandler_swigregister(PNMHandler)

 
 class XPMHandler(ImageHandler):
     """A `wx.ImageHandler` for XPM image."""
 
 class XPMHandler(ImageHandler):
     """A `wx.ImageHandler` for XPM image."""


@@ -3229,8 +3196,7 @@ class XPMHandler(ImageHandler):
         A `wx.ImageHandler` for XPM image.
         """
         _core_.XPMHandler_swiginit(self,_core_.new_XPMHandler(*args, **kwargs))
         A `wx.ImageHandler` for XPM image.
         """
         _core_.XPMHandler_swiginit(self,_core_.new_XPMHandler(*args, **kwargs))

-XPMHandler_swigregister = _core_.XPMHandler_swigregister
-XPMHandler_swigregister(XPMHandler)
+_core_.XPMHandler_swigregister(XPMHandler)

 
 class TIFFHandler(ImageHandler):
     """A `wx.ImageHandler` for TIFF image files."""
 
 class TIFFHandler(ImageHandler):
     """A `wx.ImageHandler` for TIFF image files."""


@@ -3243,8 +3209,7 @@ class TIFFHandler(ImageHandler):
         A `wx.ImageHandler` for TIFF image files.
         """
         _core_.TIFFHandler_swiginit(self,_core_.new_TIFFHandler(*args, **kwargs))
         A `wx.ImageHandler` for TIFF image files.
         """
         _core_.TIFFHandler_swiginit(self,_core_.new_TIFFHandler(*args, **kwargs))

-TIFFHandler_swigregister = _core_.TIFFHandler_swigregister
-TIFFHandler_swigregister(TIFFHandler)
+_core_.TIFFHandler_swigregister(TIFFHandler)

 
 QUANTIZE_INCLUDE_WINDOWS_COLOURS = _core_.QUANTIZE_INCLUDE_WINDOWS_COLOURS
 QUANTIZE_FILL_DESTINATION_IMAGE = _core_.QUANTIZE_FILL_DESTINATION_IMAGE
 
 QUANTIZE_INCLUDE_WINDOWS_COLOURS = _core_.QUANTIZE_INCLUDE_WINDOWS_COLOURS
 QUANTIZE_FILL_DESTINATION_IMAGE = _core_.QUANTIZE_FILL_DESTINATION_IMAGE


@@ -3264,8 +3229,7 @@ class Quantize(object):
         return _core_.Quantize_Quantize(*args, **kwargs)
 
     Quantize = staticmethod(Quantize)
         return _core_.Quantize_Quantize(*args, **kwargs)
 
     Quantize = staticmethod(Quantize)

-Quantize_swigregister = _core_.Quantize_swigregister
-Quantize_swigregister(Quantize)
+_core_.Quantize_swigregister(Quantize)

 
 def Quantize_Quantize(*args, **kwargs):
   """
 
 def Quantize_Quantize(*args, **kwargs):
   """


@@ -3327,7 +3291,7 @@ class EvtHandler(Object):
         return _core_.EvtHandler_Connect(*args, **kwargs)
 
     def Disconnect(*args, **kwargs):
         return _core_.EvtHandler_Connect(*args, **kwargs)
 
     def Disconnect(*args, **kwargs):

-        """Disconnect(self, int id, int lastId=-1, wxEventType eventType=wxEVT_NULL) -> bool"""
+        """Disconnect(self, int id, int lastId=-1, EventType eventType=wxEVT_NULL) -> bool"""

         return _core_.EvtHandler_Disconnect(*args, **kwargs)
 
     def _setOORInfo(*args, **kwargs):
         return _core_.EvtHandler_Disconnect(*args, **kwargs)
 
     def _setOORInfo(*args, **kwargs):


@@ -3375,8 +3339,7 @@ class EvtHandler(Object):
             id  = source.GetId()
         return event.Unbind(self, id, id2)              
 
             id  = source.GetId()
         return event.Unbind(self, id, id2)              
 

-EvtHandler_swigregister = _core_.EvtHandler_swigregister
-EvtHandler_swigregister(EvtHandler)
+_core_.EvtHandler_swigregister(EvtHandler)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -3451,7 +3414,7 @@ EVENT_PROPAGATE_NONE = _core_.EVENT_PROPAGATE_NONE
 EVENT_PROPAGATE_MAX = _core_.EVENT_PROPAGATE_MAX
 
 def NewEventType(*args):
 EVENT_PROPAGATE_MAX = _core_.EVENT_PROPAGATE_MAX
 
 def NewEventType(*args):

-  """NewEventType() -> wxEventType"""
+  """NewEventType() -> EventType"""

   return _core_.NewEventType(*args)
 wxEVT_NULL = _core_.wxEVT_NULL
 wxEVT_FIRST = _core_.wxEVT_FIRST
   return _core_.NewEventType(*args)
 wxEVT_NULL = _core_.wxEVT_NULL
 wxEVT_FIRST = _core_.wxEVT_FIRST


@@ -3531,7 +3494,6 @@ wxEVT_CLOSE_WINDOW = _core_.wxEVT_CLOSE_WINDOW
 wxEVT_END_SESSION = _core_.wxEVT_END_SESSION
 wxEVT_QUERY_END_SESSION = _core_.wxEVT_QUERY_END_SESSION
 wxEVT_ACTIVATE_APP = _core_.wxEVT_ACTIVATE_APP
 wxEVT_END_SESSION = _core_.wxEVT_END_SESSION
 wxEVT_QUERY_END_SESSION = _core_.wxEVT_QUERY_END_SESSION
 wxEVT_ACTIVATE_APP = _core_.wxEVT_ACTIVATE_APP

-wxEVT_POWER = _core_.wxEVT_POWER

 wxEVT_ACTIVATE = _core_.wxEVT_ACTIVATE
 wxEVT_CREATE = _core_.wxEVT_CREATE
 wxEVT_DESTROY = _core_.wxEVT_DESTROY
 wxEVT_ACTIVATE = _core_.wxEVT_ACTIVATE
 wxEVT_CREATE = _core_.wxEVT_CREATE
 wxEVT_DESTROY = _core_.wxEVT_DESTROY


@@ -3562,6 +3524,9 @@ wxEVT_UPDATE_UI = _core_.wxEVT_UPDATE_UI
 wxEVT_SIZING = _core_.wxEVT_SIZING
 wxEVT_MOVING = _core_.wxEVT_MOVING
 wxEVT_HIBERNATE = _core_.wxEVT_HIBERNATE
 wxEVT_SIZING = _core_.wxEVT_SIZING
 wxEVT_MOVING = _core_.wxEVT_MOVING
 wxEVT_HIBERNATE = _core_.wxEVT_HIBERNATE

+wxEVT_COMMAND_TEXT_COPY = _core_.wxEVT_COMMAND_TEXT_COPY
+wxEVT_COMMAND_TEXT_CUT = _core_.wxEVT_COMMAND_TEXT_CUT
+wxEVT_COMMAND_TEXT_PASTE = _core_.wxEVT_COMMAND_TEXT_PASTE

 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
 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


@@ -3584,7 +3549,7 @@ EVT_ERASE_BACKGROUND = wx.PyEventBinder( wxEVT_ERASE_BACKGROUND )
 EVT_CHAR = wx.PyEventBinder( wxEVT_CHAR )
 EVT_KEY_DOWN = wx.PyEventBinder( wxEVT_KEY_DOWN )
 EVT_KEY_UP = wx.PyEventBinder( wxEVT_KEY_UP )
 EVT_CHAR = wx.PyEventBinder( wxEVT_CHAR )
 EVT_KEY_DOWN = wx.PyEventBinder( wxEVT_KEY_DOWN )
 EVT_KEY_UP = wx.PyEventBinder( wxEVT_KEY_UP )

-EVT_HOTKEY = wx.PyEventBinder( wxEVT_HOTKEY, 1) 
+EVT_HOTKEY = wx.PyEventBinder( wxEVT_HOTKEY, 1)

 EVT_CHAR_HOOK = wx.PyEventBinder( wxEVT_CHAR_HOOK )
 EVT_MENU_OPEN = wx.PyEventBinder( wxEVT_MENU_OPEN )
 EVT_MENU_CLOSE = wx.PyEventBinder( wxEVT_MENU_CLOSE )
 EVT_CHAR_HOOK = wx.PyEventBinder( wxEVT_CHAR_HOOK )
 EVT_MENU_OPEN = wx.PyEventBinder( wxEVT_MENU_OPEN )
 EVT_MENU_CLOSE = wx.PyEventBinder( wxEVT_MENU_CLOSE )


@@ -3595,7 +3560,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_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_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 )
 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 )


@@ -3644,11 +3609,11 @@ EVT_MOUSE_EVENTS = wx.PyEventBinder([ wxEVT_LEFT_DOWN,
 
 
 # Scrolling from wxWindow (sent to wxScrolledWindow)
 
 
 # Scrolling from wxWindow (sent to wxScrolledWindow)

-EVT_SCROLLWIN = wx.PyEventBinder([ wxEVT_SCROLLWIN_TOP, 
+EVT_SCROLLWIN = wx.PyEventBinder([ wxEVT_SCROLLWIN_TOP,

                                   wxEVT_SCROLLWIN_BOTTOM,
                                   wxEVT_SCROLLWIN_LINEUP,
                                   wxEVT_SCROLLWIN_LINEDOWN,
                                   wxEVT_SCROLLWIN_BOTTOM,
                                   wxEVT_SCROLLWIN_LINEUP,
                                   wxEVT_SCROLLWIN_LINEDOWN,

-                                  wxEVT_SCROLLWIN_PAGEUP, 
+                                  wxEVT_SCROLLWIN_PAGEUP,

                                   wxEVT_SCROLLWIN_PAGEDOWN,
                                   wxEVT_SCROLLWIN_THUMBTRACK,
                                   wxEVT_SCROLLWIN_THUMBRELEASE,
                                   wxEVT_SCROLLWIN_PAGEDOWN,
                                   wxEVT_SCROLLWIN_THUMBTRACK,
                                   wxEVT_SCROLLWIN_THUMBRELEASE,


@@ -3664,14 +3629,14 @@ EVT_SCROLLWIN_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLLWIN_THUMBTRACK )
 EVT_SCROLLWIN_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLLWIN_THUMBRELEASE )
 
 # Scrolling from wx.Slider and wx.ScrollBar
 EVT_SCROLLWIN_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLLWIN_THUMBRELEASE )
 
 # Scrolling from wx.Slider and wx.ScrollBar

-EVT_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP, 
-                               wxEVT_SCROLL_BOTTOM, 
-                               wxEVT_SCROLL_LINEUP, 
-                               wxEVT_SCROLL_LINEDOWN, 
-                               wxEVT_SCROLL_PAGEUP, 
-                               wxEVT_SCROLL_PAGEDOWN, 
-                               wxEVT_SCROLL_THUMBTRACK, 
-                               wxEVT_SCROLL_THUMBRELEASE, 
+EVT_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
+                               wxEVT_SCROLL_BOTTOM,
+                               wxEVT_SCROLL_LINEUP,
+                               wxEVT_SCROLL_LINEDOWN,
+                               wxEVT_SCROLL_PAGEUP,
+                               wxEVT_SCROLL_PAGEDOWN,
+                               wxEVT_SCROLL_THUMBTRACK,
+                               wxEVT_SCROLL_THUMBRELEASE,

                                wxEVT_SCROLL_CHANGED,
                                ])
 
                                wxEVT_SCROLL_CHANGED,
                                ])
 


@@ -3685,15 +3650,15 @@ EVT_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK )
 EVT_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE )
 EVT_SCROLL_CHANGED = wx.PyEventBinder( wxEVT_SCROLL_CHANGED )
 EVT_SCROLL_ENDSCROLL = EVT_SCROLL_CHANGED
 EVT_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE )
 EVT_SCROLL_CHANGED = wx.PyEventBinder( wxEVT_SCROLL_CHANGED )
 EVT_SCROLL_ENDSCROLL = EVT_SCROLL_CHANGED

-     
+

 # Scrolling from wx.Slider and wx.ScrollBar, with an id
 # Scrolling from wx.Slider and wx.ScrollBar, with an id

-EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP, 
-                                       wxEVT_SCROLL_BOTTOM, 
-                                       wxEVT_SCROLL_LINEUP, 
-                                       wxEVT_SCROLL_LINEDOWN, 
-                                       wxEVT_SCROLL_PAGEUP, 
-                                       wxEVT_SCROLL_PAGEDOWN, 
-                                       wxEVT_SCROLL_THUMBTRACK, 
+EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
+                                       wxEVT_SCROLL_BOTTOM,
+                                       wxEVT_SCROLL_LINEUP,
+                                       wxEVT_SCROLL_LINEDOWN,
+                                       wxEVT_SCROLL_PAGEUP,
+                                       wxEVT_SCROLL_PAGEDOWN,
+                                       wxEVT_SCROLL_THUMBTRACK,

                                        wxEVT_SCROLL_THUMBRELEASE,
                                        wxEVT_SCROLL_CHANGED,
                                        ], 1)
                                        wxEVT_SCROLL_THUMBRELEASE,
                                        wxEVT_SCROLL_CHANGED,
                                        ], 1)


@@ -3746,6 +3711,9 @@ EVT_UPDATE_UI_RANGE = wx.PyEventBinder( wxEVT_UPDATE_UI, 2)
 
 EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 
 
 EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 

+EVT_TEXT_CUT   =  wx.PyEventBinder( wxEVT_COMMAND_TEXT_CUT )
+EVT_TEXT_COPY  =  wx.PyEventBinder( wxEVT_COMMAND_TEXT_COPY )
+EVT_TEXT_PASTE =  wx.PyEventBinder( wxEVT_COMMAND_TEXT_PASTE )

 
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------


@@ -3763,7 +3731,7 @@ class Event(Object):
     __del__ = lambda self : None;
     def SetEventType(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def SetEventType(*args, **kwargs):
         """

-        SetEventType(self, wxEventType typ)
+        SetEventType(self, EventType typ)

 
         Sets the specific type of the event.
         """
 
         Sets the specific type of the event.
         """


@@ -3771,7 +3739,7 @@ class Event(Object):
 
     def GetEventType(*args, **kwargs):
         """
 
     def GetEventType(*args, **kwargs):
         """

-        GetEventType(self) -> wxEventType
+        GetEventType(self) -> EventType

 
         Returns the identifier of the given event type, such as
         ``wxEVT_COMMAND_BUTTON_CLICKED``.
 
         Returns the identifier of the given event type, such as
         ``wxEVT_COMMAND_BUTTON_CLICKED``.


@@ -3890,8 +3858,7 @@ class Event(Object):
         """Clone(self) -> Event"""
         return _core_.Event_Clone(*args, **kwargs)
 
         """Clone(self) -> Event"""
         return _core_.Event_Clone(*args, **kwargs)
 

-Event_swigregister = _core_.Event_swigregister
-Event_swigregister(Event)
+_core_.Event_swigregister(Event)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -3914,8 +3881,7 @@ class PropagationDisabler(object):
         _core_.PropagationDisabler_swiginit(self,_core_.new_PropagationDisabler(*args, **kwargs))
     __swig_destroy__ = _core_.delete_PropagationDisabler
     __del__ = lambda self : None;
         _core_.PropagationDisabler_swiginit(self,_core_.new_PropagationDisabler(*args, **kwargs))
     __swig_destroy__ = _core_.delete_PropagationDisabler
     __del__ = lambda self : None;

-PropagationDisabler_swigregister = _core_.PropagationDisabler_swigregister
-PropagationDisabler_swigregister(PropagationDisabler)
+_core_.PropagationDisabler_swigregister(PropagationDisabler)

 
 class PropagateOnce(object):
     """
 
 class PropagateOnce(object):
     """


@@ -3936,8 +3902,7 @@ class PropagateOnce(object):
         _core_.PropagateOnce_swiginit(self,_core_.new_PropagateOnce(*args, **kwargs))
     __swig_destroy__ = _core_.delete_PropagateOnce
     __del__ = lambda self : None;
         _core_.PropagateOnce_swiginit(self,_core_.new_PropagateOnce(*args, **kwargs))
     __swig_destroy__ = _core_.delete_PropagateOnce
     __del__ = lambda self : None;

-PropagateOnce_swigregister = _core_.PropagateOnce_swigregister
-PropagateOnce_swigregister(PropagateOnce)
+_core_.PropagateOnce_swigregister(PropagateOnce)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -3951,7 +3916,7 @@ class CommandEvent(Event):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, wxEventType commandType=wxEVT_NULL, int winid=0) -> CommandEvent
+        __init__(self, EventType commandType=wxEVT_NULL, int winid=0) -> CommandEvent

 
         This event class contains information about command events, which
         originate from a variety of simple controls, as well as menus and
 
         This event class contains information about command events, which
         originate from a variety of simple controls, as well as menus and


@@ -4025,7 +3990,7 @@ class CommandEvent(Event):
 
     def GetInt(*args, **kwargs):
         """
 
     def GetInt(*args, **kwargs):
         """

-        GetInt(self) -> long
+        GetInt(self) -> int

 
         Returns the integer identifier corresponding to a listbox, choice or
         radiobox selection (only if the event was a selection, not a
 
         Returns the integer identifier corresponding to a listbox, choice or
         radiobox selection (only if the event was a selection, not a


@@ -4056,8 +4021,7 @@ class CommandEvent(Event):
         """Clone(self) -> Event"""
         return _core_.CommandEvent_Clone(*args, **kwargs)
 
         """Clone(self) -> Event"""
         return _core_.CommandEvent_Clone(*args, **kwargs)
 

-CommandEvent_swigregister = _core_.CommandEvent_swigregister
-CommandEvent_swigregister(CommandEvent)
+_core_.CommandEvent_swigregister(CommandEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -4072,7 +4036,7 @@ class NotifyEvent(CommandEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, wxEventType commandType=wxEVT_NULL, int winid=0) -> NotifyEvent
+        __init__(self, EventType commandType=wxEVT_NULL, int winid=0) -> NotifyEvent

 
         An instance of this class (or one of its derived classes) is sent from
         a control when the control's state is being changed and the control
 
         An instance of this class (or one of its derived classes) is sent from
         a control when the control's state is being changed and the control


@@ -4112,8 +4076,7 @@ class NotifyEvent(CommandEvent):
         """
         return _core_.NotifyEvent_IsAllowed(*args, **kwargs)
 
         """
         return _core_.NotifyEvent_IsAllowed(*args, **kwargs)
 

-NotifyEvent_swigregister = _core_.NotifyEvent_swigregister
-NotifyEvent_swigregister(NotifyEvent)
+_core_.NotifyEvent_swigregister(NotifyEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -4128,7 +4091,7 @@ class ScrollEvent(CommandEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, wxEventType commandType=wxEVT_NULL, int winid=0, int pos=0, 
+        __init__(self, EventType commandType=wxEVT_NULL, int winid=0, int pos=0, 

             int orient=0) -> ScrollEvent
         """
         _core_.ScrollEvent_swiginit(self,_core_.new_ScrollEvent(*args, **kwargs))
             int orient=0) -> ScrollEvent
         """
         _core_.ScrollEvent_swiginit(self,_core_.new_ScrollEvent(*args, **kwargs))


@@ -4157,8 +4120,7 @@ class ScrollEvent(CommandEvent):
         """SetPosition(self, int pos)"""
         return _core_.ScrollEvent_SetPosition(*args, **kwargs)
 
         """SetPosition(self, int pos)"""
         return _core_.ScrollEvent_SetPosition(*args, **kwargs)
 

-ScrollEvent_swigregister = _core_.ScrollEvent_swigregister
-ScrollEvent_swigregister(ScrollEvent)
+_core_.ScrollEvent_swigregister(ScrollEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -4171,7 +4133,7 @@ class ScrollWinEvent(Event):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, wxEventType commandType=wxEVT_NULL, int pos=0, int orient=0) -> ScrollWinEvent
+        __init__(self, EventType commandType=wxEVT_NULL, int pos=0, int orient=0) -> ScrollWinEvent

 
         A wx.ScrollWinEvent holds information about scrolling and is sent from
         scrolling windows.
 
         A wx.ScrollWinEvent holds information about scrolling and is sent from
         scrolling windows.


@@ -4204,8 +4166,7 @@ class ScrollWinEvent(Event):
         """SetPosition(self, int pos)"""
         return _core_.ScrollWinEvent_SetPosition(*args, **kwargs)
 
         """SetPosition(self, int pos)"""
         return _core_.ScrollWinEvent_SetPosition(*args, **kwargs)
 

-ScrollWinEvent_swigregister = _core_.ScrollWinEvent_swigregister
-ScrollWinEvent_swigregister(ScrollWinEvent)
+_core_.ScrollWinEvent_swigregister(ScrollWinEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -4240,7 +4201,7 @@ class MouseEvent(Event):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, wxEventType mouseType=wxEVT_NULL) -> MouseEvent
+        __init__(self, EventType mouseType=wxEVT_NULL) -> MouseEvent

 
         Constructs a wx.MouseEvent.  Valid event types are:
 
 
         Constructs a wx.MouseEvent.  Valid event types are:
 


@@ -4620,8 +4581,7 @@ 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)
     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)

-MouseEvent_swigregister = _core_.MouseEvent_swigregister
-MouseEvent_swigregister(MouseEvent)
+_core_.MouseEvent_swigregister(MouseEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -4682,8 +4642,7 @@ class SetCursorEvent(Event):
         """
         return _core_.SetCursorEvent_HasCursor(*args, **kwargs)
 
         """
         return _core_.SetCursorEvent_HasCursor(*args, **kwargs)
 

-SetCursorEvent_swigregister = _core_.SetCursorEvent_swigregister
-SetCursorEvent_swigregister(SetCursorEvent)
+_core_.SetCursorEvent_swigregister(SetCursorEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -4754,7 +4713,7 @@ class KeyEvent(Event):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, wxEventType eventType=wxEVT_NULL) -> KeyEvent
+        __init__(self, EventType eventType=wxEVT_NULL) -> KeyEvent

 
         Construct a new `wx.KeyEvent`.  Valid event types are:
             * 
 
         Construct a new `wx.KeyEvent`.  Valid event types are:
             * 


@@ -4861,6 +4820,15 @@ class KeyEvent(Event):
         return _core_.KeyEvent_GetUnicodeKey(*args, **kwargs)
 
     GetUniChar = GetUnicodeKey 
         return _core_.KeyEvent_GetUnicodeKey(*args, **kwargs)
 
     GetUniChar = GetUnicodeKey 

+    def SetUnicodeKey(*args, **kwargs):
+        """
+        SetUnicodeKey(self, int uniChar)
+
+        Set the Unicode value of the key event, but only if this is a Unicode
+        build of wxPython.
+        """
+        return _core_.KeyEvent_SetUnicodeKey(*args, **kwargs)
+

     def GetRawKeyCode(*args, **kwargs):
         """
         GetRawKeyCode(self) -> unsigned int
     def GetRawKeyCode(*args, **kwargs):
         """
         GetRawKeyCode(self) -> unsigned int


@@ -4926,8 +4894,7 @@ 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)
     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)

-KeyEvent_swigregister = _core_.KeyEvent_swigregister
-KeyEvent_swigregister(KeyEvent)
+_core_.KeyEvent_swigregister(KeyEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -4981,8 +4948,7 @@ 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)
 
     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)

-SizeEvent_swigregister = _core_.SizeEvent_swigregister
-SizeEvent_swigregister(SizeEvent)
+_core_.SizeEvent_swigregister(SizeEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5023,8 +4989,7 @@ class MoveEvent(Event):
     m_pos =  property(GetPosition, SetPosition)
     m_rect = property(GetRect, SetRect)
 
     m_pos =  property(GetPosition, SetPosition)
     m_rect = property(GetRect, SetRect)
 

-MoveEvent_swigregister = _core_.MoveEvent_swigregister
-MoveEvent_swigregister(MoveEvent)
+_core_.MoveEvent_swigregister(MoveEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5049,8 +5014,7 @@ class PaintEvent(Event):
     def __init__(self, *args, **kwargs): 
         """__init__(self, int Id=0) -> PaintEvent"""
         _core_.PaintEvent_swiginit(self,_core_.new_PaintEvent(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self, int Id=0) -> PaintEvent"""
         _core_.PaintEvent_swiginit(self,_core_.new_PaintEvent(*args, **kwargs))

-PaintEvent_swigregister = _core_.PaintEvent_swigregister
-PaintEvent_swigregister(PaintEvent)
+_core_.PaintEvent_swigregister(PaintEvent)

 
 class NcPaintEvent(Event):
     """Proxy of C++ NcPaintEvent class"""
 
 class NcPaintEvent(Event):
     """Proxy of C++ NcPaintEvent class"""


@@ -5059,8 +5023,7 @@ class NcPaintEvent(Event):
     def __init__(self, *args, **kwargs): 
         """__init__(self, int winid=0) -> NcPaintEvent"""
         _core_.NcPaintEvent_swiginit(self,_core_.new_NcPaintEvent(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self, int winid=0) -> NcPaintEvent"""
         _core_.NcPaintEvent_swiginit(self,_core_.new_NcPaintEvent(*args, **kwargs))

-NcPaintEvent_swigregister = _core_.NcPaintEvent_swigregister
-NcPaintEvent_swigregister(NcPaintEvent)
+_core_.NcPaintEvent_swigregister(NcPaintEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5095,8 +5058,7 @@ class EraseEvent(Event):
         """
         return _core_.EraseEvent_GetDC(*args, **kwargs)
 
         """
         return _core_.EraseEvent_GetDC(*args, **kwargs)
 

-EraseEvent_swigregister = _core_.EraseEvent_swigregister
-EraseEvent_swigregister(EraseEvent)
+_core_.EraseEvent_swigregister(EraseEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5115,7 +5077,7 @@ class FocusEvent(Event):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, wxEventType type=wxEVT_NULL, int winid=0) -> FocusEvent
+        __init__(self, EventType type=wxEVT_NULL, int winid=0) -> FocusEvent

 
         Constructor
         """
 
         Constructor
         """


@@ -5136,8 +5098,7 @@ class FocusEvent(Event):
         """SetWindow(self, Window win)"""
         return _core_.FocusEvent_SetWindow(*args, **kwargs)
 
         """SetWindow(self, Window win)"""
         return _core_.FocusEvent_SetWindow(*args, **kwargs)
 

-FocusEvent_swigregister = _core_.FocusEvent_swigregister
-FocusEvent_swigregister(FocusEvent)
+_core_.FocusEvent_swigregister(FocusEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5164,8 +5125,7 @@ class ChildFocusEvent(CommandEvent):
         """
         return _core_.ChildFocusEvent_GetWindow(*args, **kwargs)
 
         """
         return _core_.ChildFocusEvent_GetWindow(*args, **kwargs)
 

-ChildFocusEvent_swigregister = _core_.ChildFocusEvent_swigregister
-ChildFocusEvent_swigregister(ChildFocusEvent)
+_core_.ChildFocusEvent_swigregister(ChildFocusEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5190,7 +5150,7 @@ class ActivateEvent(Event):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, wxEventType type=wxEVT_NULL, bool active=True, int Id=0) -> ActivateEvent
+        __init__(self, EventType type=wxEVT_NULL, bool active=True, int Id=0) -> ActivateEvent

 
         Constructor
         """
 
         Constructor
         """


@@ -5204,8 +5164,7 @@ class ActivateEvent(Event):
         """
         return _core_.ActivateEvent_GetActive(*args, **kwargs)
 
         """
         return _core_.ActivateEvent_GetActive(*args, **kwargs)
 

-ActivateEvent_swigregister = _core_.ActivateEvent_swigregister
-ActivateEvent_swigregister(ActivateEvent)
+_core_.ActivateEvent_swigregister(ActivateEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5226,8 +5185,7 @@ class InitDialogEvent(Event):
         Constructor
         """
         _core_.InitDialogEvent_swiginit(self,_core_.new_InitDialogEvent(*args, **kwargs))
         Constructor
         """
         _core_.InitDialogEvent_swiginit(self,_core_.new_InitDialogEvent(*args, **kwargs))

-InitDialogEvent_swigregister = _core_.InitDialogEvent_swigregister
-InitDialogEvent_swigregister(InitDialogEvent)
+_core_.InitDialogEvent_swigregister(InitDialogEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5244,7 +5202,7 @@ class MenuEvent(Event):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, wxEventType type=wxEVT_NULL, int winid=0, Menu menu=None) -> MenuEvent
+        __init__(self, EventType type=wxEVT_NULL, int winid=0, Menu menu=None) -> MenuEvent

 
         Constructor
         """
 
         Constructor
         """


@@ -5277,8 +5235,7 @@ class MenuEvent(Event):
         """
         return _core_.MenuEvent_GetMenu(*args, **kwargs)
 
         """
         return _core_.MenuEvent_GetMenu(*args, **kwargs)
 

-MenuEvent_swigregister = _core_.MenuEvent_swigregister
-MenuEvent_swigregister(MenuEvent)
+_core_.MenuEvent_swigregister(MenuEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5309,7 +5266,7 @@ class CloseEvent(Event):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, wxEventType type=wxEVT_NULL, int winid=0) -> CloseEvent
+        __init__(self, EventType type=wxEVT_NULL, int winid=0) -> CloseEvent

 
         Constructor.
         """
 
         Constructor.
         """


@@ -5367,8 +5324,7 @@ class CloseEvent(Event):
         """
         return _core_.CloseEvent_CanVeto(*args, **kwargs)
 
         """
         return _core_.CloseEvent_CanVeto(*args, **kwargs)
 

-CloseEvent_swigregister = _core_.CloseEvent_swigregister
-CloseEvent_swigregister(CloseEvent)
+_core_.CloseEvent_swigregister(CloseEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5391,8 +5347,7 @@ class ShowEvent(Event):
         """GetShow(self) -> bool"""
         return _core_.ShowEvent_GetShow(*args, **kwargs)
 
         """GetShow(self) -> bool"""
         return _core_.ShowEvent_GetShow(*args, **kwargs)
 

-ShowEvent_swigregister = _core_.ShowEvent_swigregister
-ShowEvent_swigregister(ShowEvent)
+_core_.ShowEvent_swigregister(ShowEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5420,8 +5375,7 @@ class IconizeEvent(Event):
         """
         return _core_.IconizeEvent_Iconized(*args, **kwargs)
 
         """
         return _core_.IconizeEvent_Iconized(*args, **kwargs)
 

-IconizeEvent_swigregister = _core_.IconizeEvent_swigregister
-IconizeEvent_swigregister(IconizeEvent)
+_core_.IconizeEvent_swigregister(IconizeEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5436,8 +5390,7 @@ class MaximizeEvent(Event):
         An EVT_MAXIMIZE event is sent when a frame is maximized or restored.
         """
         _core_.MaximizeEvent_swiginit(self,_core_.new_MaximizeEvent(*args, **kwargs))
         An EVT_MAXIMIZE event is sent when a frame is maximized or restored.
         """
         _core_.MaximizeEvent_swiginit(self,_core_.new_MaximizeEvent(*args, **kwargs))

-MaximizeEvent_swigregister = _core_.MaximizeEvent_swigregister
-MaximizeEvent_swigregister(MaximizeEvent)
+_core_.MaximizeEvent_swigregister(MaximizeEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5484,8 +5437,7 @@ class DropFilesEvent(Event):
         """
         return _core_.DropFilesEvent_GetFiles(*args, **kwargs)
 
         """
         return _core_.DropFilesEvent_GetFiles(*args, **kwargs)
 

-DropFilesEvent_swigregister = _core_.DropFilesEvent_swigregister
-DropFilesEvent_swigregister(DropFilesEvent)
+_core_.DropFilesEvent_swigregister(DropFilesEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5744,8 +5696,7 @@ class UpdateUIEvent(CommandEvent):
         return _core_.UpdateUIEvent_GetMode(*args, **kwargs)
 
     GetMode = staticmethod(GetMode)
         return _core_.UpdateUIEvent_GetMode(*args, **kwargs)
 
     GetMode = staticmethod(GetMode)

-UpdateUIEvent_swigregister = _core_.UpdateUIEvent_swigregister
-UpdateUIEvent_swigregister(UpdateUIEvent)
+_core_.UpdateUIEvent_swigregister(UpdateUIEvent)

 
 def UpdateUIEvent_SetUpdateInterval(*args, **kwargs):
   """
 
 def UpdateUIEvent_SetUpdateInterval(*args, **kwargs):
   """


@@ -5856,8 +5807,7 @@ class SysColourChangedEvent(Event):
         Constructor
         """
         _core_.SysColourChangedEvent_swiginit(self,_core_.new_SysColourChangedEvent(*args, **kwargs))
         Constructor
         """
         _core_.SysColourChangedEvent_swiginit(self,_core_.new_SysColourChangedEvent(*args, **kwargs))

-SysColourChangedEvent_swigregister = _core_.SysColourChangedEvent_swigregister
-SysColourChangedEvent_swigregister(SysColourChangedEvent)
+_core_.SysColourChangedEvent_swigregister(SysColourChangedEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5889,8 +5839,7 @@ class MouseCaptureChangedEvent(Event):
         """
         return _core_.MouseCaptureChangedEvent_GetCapturedWindow(*args, **kwargs)
 
         """
         return _core_.MouseCaptureChangedEvent_GetCapturedWindow(*args, **kwargs)
 

-MouseCaptureChangedEvent_swigregister = _core_.MouseCaptureChangedEvent_swigregister
-MouseCaptureChangedEvent_swigregister(MouseCaptureChangedEvent)
+_core_.MouseCaptureChangedEvent_swigregister(MouseCaptureChangedEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5906,8 +5855,7 @@ class DisplayChangedEvent(Event):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> DisplayChangedEvent"""
         _core_.DisplayChangedEvent_swiginit(self,_core_.new_DisplayChangedEvent(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> DisplayChangedEvent"""
         _core_.DisplayChangedEvent_swiginit(self,_core_.new_DisplayChangedEvent(*args, **kwargs))

-DisplayChangedEvent_swigregister = _core_.DisplayChangedEvent_swigregister
-DisplayChangedEvent_swigregister(DisplayChangedEvent)
+_core_.DisplayChangedEvent_swigregister(DisplayChangedEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5940,8 +5888,7 @@ class PaletteChangedEvent(Event):
         """GetChangedWindow(self) -> Window"""
         return _core_.PaletteChangedEvent_GetChangedWindow(*args, **kwargs)
 
         """GetChangedWindow(self) -> Window"""
         return _core_.PaletteChangedEvent_GetChangedWindow(*args, **kwargs)
 

-PaletteChangedEvent_swigregister = _core_.PaletteChangedEvent_swigregister
-PaletteChangedEvent_swigregister(PaletteChangedEvent)
+_core_.PaletteChangedEvent_swigregister(PaletteChangedEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5973,8 +5920,7 @@ class QueryNewPaletteEvent(Event):
         """GetPaletteRealized(self) -> bool"""
         return _core_.QueryNewPaletteEvent_GetPaletteRealized(*args, **kwargs)
 
         """GetPaletteRealized(self) -> bool"""
         return _core_.QueryNewPaletteEvent_GetPaletteRealized(*args, **kwargs)
 

-QueryNewPaletteEvent_swigregister = _core_.QueryNewPaletteEvent_swigregister
-QueryNewPaletteEvent_swigregister(QueryNewPaletteEvent)
+_core_.QueryNewPaletteEvent_swigregister(QueryNewPaletteEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -6081,8 +6027,7 @@ class NavigationKeyEvent(Event):
     IsForward = _core_.NavigationKeyEvent_IsForward
     WinChange = _core_.NavigationKeyEvent_WinChange
     FromTab = _core_.NavigationKeyEvent_FromTab
     IsForward = _core_.NavigationKeyEvent_IsForward
     WinChange = _core_.NavigationKeyEvent_WinChange
     FromTab = _core_.NavigationKeyEvent_FromTab

-NavigationKeyEvent_swigregister = _core_.NavigationKeyEvent_swigregister
-NavigationKeyEvent_swigregister(NavigationKeyEvent)
+_core_.NavigationKeyEvent_swigregister(NavigationKeyEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -6109,8 +6054,7 @@ class WindowCreateEvent(CommandEvent):
         """
         return _core_.WindowCreateEvent_GetWindow(*args, **kwargs)
 
         """
         return _core_.WindowCreateEvent_GetWindow(*args, **kwargs)
 

-WindowCreateEvent_swigregister = _core_.WindowCreateEvent_swigregister
-WindowCreateEvent_swigregister(WindowCreateEvent)
+_core_.WindowCreateEvent_swigregister(WindowCreateEvent)

 
 class WindowDestroyEvent(CommandEvent):
     """
 
 class WindowDestroyEvent(CommandEvent):
     """


@@ -6149,8 +6093,7 @@ class WindowDestroyEvent(CommandEvent):
         """
         return _core_.WindowDestroyEvent_GetWindow(*args, **kwargs)
 
         """
         return _core_.WindowDestroyEvent_GetWindow(*args, **kwargs)
 

-WindowDestroyEvent_swigregister = _core_.WindowDestroyEvent_swigregister
-WindowDestroyEvent_swigregister(WindowDestroyEvent)
+_core_.WindowDestroyEvent_swigregister(WindowDestroyEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -6163,7 +6106,7 @@ class ContextMenuEvent(CommandEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> ContextMenuEvent
+        __init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> ContextMenuEvent

 
         Constructor.
         """
 
         Constructor.
         """


@@ -6185,8 +6128,7 @@ class ContextMenuEvent(CommandEvent):
         """
         return _core_.ContextMenuEvent_SetPosition(*args, **kwargs)
 
         """
         return _core_.ContextMenuEvent_SetPosition(*args, **kwargs)
 

-ContextMenuEvent_swigregister = _core_.ContextMenuEvent_swigregister
-ContextMenuEvent_swigregister(ContextMenuEvent)
+_core_.ContextMenuEvent_swigregister(ContextMenuEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -6289,8 +6231,7 @@ class IdleEvent(Event):
         return _core_.IdleEvent_CanSend(*args, **kwargs)
 
     CanSend = staticmethod(CanSend)
         return _core_.IdleEvent_CanSend(*args, **kwargs)
 
     CanSend = staticmethod(CanSend)

-IdleEvent_swigregister = _core_.IdleEvent_swigregister
-IdleEvent_swigregister(IdleEvent)
+_core_.IdleEvent_swigregister(IdleEvent)

 
 def IdleEvent_SetMode(*args, **kwargs):
   """
 
 def IdleEvent_SetMode(*args, **kwargs):
   """


@@ -6340,6 +6281,31 @@ def IdleEvent_CanSend(*args, **kwargs):
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

+class ClipboardTextEvent(CommandEvent):
+    """
+    A Clipboard Text event is sent when a window intercepts a text
+    copy/cut/paste message, i.e. the user has cut/copied/pasted data
+    from/into a text control via ctrl-C/X/V, ctrl/shift-del/insert, a
+    popup menu command, etc.  NOTE : under windows these events are *NOT*
+    generated automatically for a Rich Edit text control.
+    """
+    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, EventType type=wxEVT_NULL, int winid=0) -> ClipboardTextEvent
+
+        A Clipboard Text event is sent when a window intercepts a text
+        copy/cut/paste message, i.e. the user has cut/copied/pasted data
+        from/into a text control via ctrl-C/X/V, ctrl/shift-del/insert, a
+        popup menu command, etc.  NOTE : under windows these events are *NOT*
+        generated automatically for a Rich Edit text control.
+        """
+        _core_.ClipboardTextEvent_swiginit(self,_core_.new_ClipboardTextEvent(*args, **kwargs))
+_core_.ClipboardTextEvent_swigregister(ClipboardTextEvent)
+
+#---------------------------------------------------------------------------
+

 class PyEvent(Event):
     """
     wx.PyEvent can be used as a base class for implementing custom event
 class PyEvent(Event):
     """
     wx.PyEvent can be used as a base class for implementing custom event


@@ -6354,7 +6320,7 @@ class PyEvent(Event):
     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): 
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 

-        """__init__(self, int winid=0, wxEventType eventType=wxEVT_NULL) -> PyEvent"""
+        """__init__(self, int winid=0, EventType eventType=wxEVT_NULL) -> PyEvent"""

         _core_.PyEvent_swiginit(self,_core_.new_PyEvent(*args, **kwargs))
         self._SetSelf(self)
 
         _core_.PyEvent_swiginit(self,_core_.new_PyEvent(*args, **kwargs))
         self._SetSelf(self)
 


@@ -6368,8 +6334,7 @@ class PyEvent(Event):
         """_GetSelf(self) -> PyObject"""
         return _core_.PyEvent__GetSelf(*args, **kwargs)
 
         """_GetSelf(self) -> PyObject"""
         return _core_.PyEvent__GetSelf(*args, **kwargs)
 

-PyEvent_swigregister = _core_.PyEvent_swigregister
-PyEvent_swigregister(PyEvent)
+_core_.PyEvent_swigregister(PyEvent)

 
 class PyCommandEvent(CommandEvent):
     """
 
 class PyCommandEvent(CommandEvent):
     """


@@ -6386,7 +6351,7 @@ class PyCommandEvent(CommandEvent):
     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): 
     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, wxEventType eventType=wxEVT_NULL, int id=0) -> PyCommandEvent"""
+        """__init__(self, EventType eventType=wxEVT_NULL, int id=0) -> PyCommandEvent"""

         _core_.PyCommandEvent_swiginit(self,_core_.new_PyCommandEvent(*args, **kwargs))
         self._SetSelf(self)
 
         _core_.PyCommandEvent_swiginit(self,_core_.new_PyCommandEvent(*args, **kwargs))
         self._SetSelf(self)
 


@@ -6400,8 +6365,7 @@ class PyCommandEvent(CommandEvent):
         """_GetSelf(self) -> PyObject"""
         return _core_.PyCommandEvent__GetSelf(*args, **kwargs)
 
         """_GetSelf(self) -> PyObject"""
         return _core_.PyCommandEvent__GetSelf(*args, **kwargs)
 

-PyCommandEvent_swigregister = _core_.PyCommandEvent_swigregister
-PyCommandEvent_swigregister(PyCommandEvent)
+_core_.PyCommandEvent_swigregister(PyCommandEvent)

 
 class DateEvent(CommandEvent):
     """
 
 class DateEvent(CommandEvent):
     """


@@ -6413,7 +6377,7 @@ class DateEvent(CommandEvent):
     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): 
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 

-        """__init__(self, Window win, DateTime dt, wxEventType type) -> DateEvent"""
+        """__init__(self, Window win, DateTime dt, EventType type) -> DateEvent"""

         _core_.DateEvent_swiginit(self,_core_.new_DateEvent(*args, **kwargs))
     def GetDate(*args, **kwargs):
         """
         _core_.DateEvent_swiginit(self,_core_.new_DateEvent(*args, **kwargs))
     def GetDate(*args, **kwargs):
         """


@@ -6432,8 +6396,7 @@ class DateEvent(CommandEvent):
         """
         return _core_.DateEvent_SetDate(*args, **kwargs)
 
         """
         return _core_.DateEvent_SetDate(*args, **kwargs)
 

-DateEvent_swigregister = _core_.DateEvent_swigregister
-DateEvent_swigregister(DateEvent)
+_core_.DateEvent_swigregister(DateEvent)

 
 wxEVT_DATE_CHANGED = _core_.wxEVT_DATE_CHANGED
 EVT_DATE_CHANGED = wx.PyEventBinder( wxEVT_DATE_CHANGED, 1 )
 
 wxEVT_DATE_CHANGED = _core_.wxEVT_DATE_CHANGED
 EVT_DATE_CHANGED = wx.PyEventBinder( wxEVT_DATE_CHANGED, 1 )


@@ -6800,8 +6763,7 @@ class PyApp(EvtHandler):
         return _core_.PyApp_GetComCtl32Version(*args, **kwargs)
 
     GetComCtl32Version = staticmethod(GetComCtl32Version)
         return _core_.PyApp_GetComCtl32Version(*args, **kwargs)
 
     GetComCtl32Version = staticmethod(GetComCtl32Version)

-PyApp_swigregister = _core_.PyApp_swigregister
-PyApp_swigregister(PyApp)
+_core_.PyApp_swigregister(PyApp)

 
 def PyApp_IsMainLoopRunning(*args):
   """
 
 def PyApp_IsMainLoopRunning(*args):
   """


@@ -6988,7 +6950,7 @@ class PyOnDemandOutputWindow:
                                  style=wx.TE_MULTILINE|wx.TE_READONLY)
         self.text.AppendText(st)
         self.frame.Show(True)
                                  style=wx.TE_MULTILINE|wx.TE_READONLY)
         self.text.AppendText(st)
         self.frame.Show(True)

-        EVT_CLOSE(self.frame, self.OnCloseWindow)
+        self.frame.Bind(wx.EVT_CLOSE, self.OnCloseWindow)

         
 
     def OnCloseWindow(self, event):
         
 
     def OnCloseWindow(self, event):


@@ -7134,6 +7096,15 @@ your Mac."""
         self._BootstrapApp()
 
 
         self._BootstrapApp()
 
 

+    def OnPreInit(self):
+        """
+        Things that must be done after _BootstrapApp has done its
+        thing, but would be nice if they were already done by the time
+        that OnInit is called.
+        """
+        wx.StockGDI._initStockObjects()
+        
+

     def __del__(self, destroy=wx.PyApp.__del__):
         self.RestoreStdio()  # Just in case the MainLoop was overridden
         destroy(self)
     def __del__(self, destroy=wx.PyApp.__del__):
         self.RestoreStdio()  # Just in case the MainLoop was overridden
         destroy(self)


@@ -7306,8 +7277,7 @@ class EventLoop(object):
         return _core_.EventLoop_SetActive(*args, **kwargs)
 
     SetActive = staticmethod(SetActive)
         return _core_.EventLoop_SetActive(*args, **kwargs)
 
     SetActive = staticmethod(SetActive)

-EventLoop_swigregister = _core_.EventLoop_swigregister
-EventLoop_swigregister(EventLoop)
+_core_.EventLoop_swigregister(EventLoop)

 
 def EventLoop_GetActive(*args):
   """EventLoop_GetActive() -> EventLoop"""
 
 def EventLoop_GetActive(*args):
   """EventLoop_GetActive() -> EventLoop"""


@@ -7326,8 +7296,7 @@ class EventLoopActivator(object):
         _core_.EventLoopActivator_swiginit(self,_core_.new_EventLoopActivator(*args, **kwargs))
     __swig_destroy__ = _core_.delete_EventLoopActivator
     __del__ = lambda self : None;
         _core_.EventLoopActivator_swiginit(self,_core_.new_EventLoopActivator(*args, **kwargs))
     __swig_destroy__ = _core_.delete_EventLoopActivator
     __del__ = lambda self : None;

-EventLoopActivator_swigregister = _core_.EventLoopActivator_swigregister
-EventLoopActivator_swigregister(EventLoopActivator)
+_core_.EventLoopActivator_swigregister(EventLoopActivator)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -7384,8 +7353,7 @@ class AcceleratorEntry(object):
         """
         return _core_.AcceleratorEntry_GetCommand(*args, **kwargs)
 
         """
         return _core_.AcceleratorEntry_GetCommand(*args, **kwargs)
 

-AcceleratorEntry_swigregister = _core_.AcceleratorEntry_swigregister
-AcceleratorEntry_swigregister(AcceleratorEntry)
+_core_.AcceleratorEntry_swigregister(AcceleratorEntry)

 
 class AcceleratorTable(Object):
     """
 
 class AcceleratorTable(Object):
     """


@@ -7412,8 +7380,7 @@ class AcceleratorTable(Object):
         """Ok(self) -> bool"""
         return _core_.AcceleratorTable_Ok(*args, **kwargs)
 
         """Ok(self) -> bool"""
         return _core_.AcceleratorTable_Ok(*args, **kwargs)
 

-AcceleratorTable_swigregister = _core_.AcceleratorTable_swigregister
-AcceleratorTable_swigregister(AcceleratorTable)
+_core_.AcceleratorTable_swigregister(AcceleratorTable)

 
 
 def GetAccelFromString(*args, **kwargs):
 
 
 def GetAccelFromString(*args, **kwargs):


@@ -7437,8 +7404,7 @@ class VisualAttributes(object):
     font = property(_core_.VisualAttributes_font_get, _core_.VisualAttributes_font_set)
     colFg = property(_core_.VisualAttributes_colFg_get, _core_.VisualAttributes_colFg_set)
     colBg = property(_core_.VisualAttributes_colBg_get, _core_.VisualAttributes_colBg_set)
     font = property(_core_.VisualAttributes_font_get, _core_.VisualAttributes_font_set)
     colFg = property(_core_.VisualAttributes_colFg_get, _core_.VisualAttributes_colFg_set)
     colBg = property(_core_.VisualAttributes_colBg_get, _core_.VisualAttributes_colBg_set)

-VisualAttributes_swigregister = _core_.VisualAttributes_swigregister
-VisualAttributes_swigregister(VisualAttributes)
+_core_.VisualAttributes_swigregister(VisualAttributes)

 NullAcceleratorTable = cvar.NullAcceleratorTable
 PanelNameStr = cvar.PanelNameStr
 
 NullAcceleratorTable = cvar.NullAcceleratorTable
 PanelNameStr = cvar.PanelNameStr
 


@@ -8438,6 +8404,14 @@ class Window(EvtHandler):
         """
         return _core_.Window_RemoveChild(*args, **kwargs)
 
         """
         return _core_.Window_RemoveChild(*args, **kwargs)
 

+    def SetDoubleBuffered(*args, **kwargs):
+        """
+        SetDoubleBuffered(self, bool on)
+
+        Currently wxGTK2 only.
+        """
+        return _core_.Window_SetDoubleBuffered(*args, **kwargs)
+

     def FindWindowById(*args, **kwargs):
         """
         FindWindowById(self, long winid) -> Window
     def FindWindowById(*args, **kwargs):
         """
         FindWindowById(self, long winid) -> Window


@@ -9350,6 +9324,18 @@ class Window(EvtHandler):
         """
         return _core_.Window_SetHelpTextForId(*args, **kwargs)
 
         """
         return _core_.Window_SetHelpTextForId(*args, **kwargs)
 

+    def GetHelpTextAtPoint(*args, **kwargs):
+        """
+        GetHelpTextAtPoint(self, Point pt, wxHelpEvent::Origin origin) -> String
+
+        Get the help string associated with the given position in this window.
+
+        Notice that pt may be invalid if event origin is keyboard or unknown
+        and this method should return the global window help text then
+
+        """
+        return _core_.Window_GetHelpTextAtPoint(*args, **kwargs)
+

     def GetHelpText(*args, **kwargs):
         """
         GetHelpText(self) -> String
     def GetHelpText(*args, **kwargs):
         """
         GetHelpText(self) -> String


@@ -9577,10 +9563,9 @@ class Window(EvtHandler):
             self._setCallbackInfo(self, self.__class__)
 
     def SendSizeEvent(self):
             self._setCallbackInfo(self, self.__class__)
 
     def SendSizeEvent(self):

-        self.GetEventhandler().ProcessEvent(wx.SizeEvent((-1,-1)))
+        self.GetEventHandler().ProcessEvent(wx.SizeEvent((-1,-1)))

 
 

-Window_swigregister = _core_.Window_swigregister
-Window_swigregister(Window)
+_core_.Window_swigregister(Window)

 
 def PreWindow(*args, **kwargs):
     """
 
 def PreWindow(*args, **kwargs):
     """


@@ -9769,8 +9754,7 @@ class Validator(EvtHandler):
         return _core_.Validator_SetBellOnError(*args, **kwargs)
 
     SetBellOnError = staticmethod(SetBellOnError)
         return _core_.Validator_SetBellOnError(*args, **kwargs)
 
     SetBellOnError = staticmethod(SetBellOnError)

-Validator_swigregister = _core_.Validator_swigregister
-Validator_swigregister(Validator)
+_core_.Validator_swigregister(Validator)

 
 def Validator_IsSilent(*args):
   """Validator_IsSilent() -> bool"""
 
 def Validator_IsSilent(*args):
   """Validator_IsSilent() -> bool"""


@@ -9795,8 +9779,7 @@ class PyValidator(Validator):
         """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=True)"""
         return _core_.PyValidator__setCallbackInfo(*args, **kwargs)
 
         """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=True)"""
         return _core_.PyValidator__setCallbackInfo(*args, **kwargs)
 

-PyValidator_swigregister = _core_.PyValidator_swigregister
-PyValidator_swigregister(PyValidator)
+_core_.PyValidator_swigregister(PyValidator)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -9829,6 +9812,10 @@ class Menu(EvtHandler):
         """AppendMenu(self, int id, String text, Menu submenu, String help=EmptyString) -> MenuItem"""
         return _core_.Menu_AppendMenu(*args, **kwargs)
 
         """AppendMenu(self, int id, String text, Menu submenu, String help=EmptyString) -> MenuItem"""
         return _core_.Menu_AppendMenu(*args, **kwargs)
 

+    def AppendSubMenu(*args, **kwargs):
+        """AppendSubMenu(self, Menu submenu, String text, String help=EmptyString) -> MenuItem"""
+        return _core_.Menu_AppendSubMenu(*args, **kwargs)
+

     def AppendItem(*args, **kwargs):
         """AppendItem(self, MenuItem item) -> MenuItem"""
         return _core_.Menu_AppendItem(*args, **kwargs)
     def AppendItem(*args, **kwargs):
         """AppendItem(self, MenuItem item) -> MenuItem"""
         return _core_.Menu_AppendItem(*args, **kwargs)


@@ -10042,8 +10029,7 @@ class Menu(EvtHandler):
         """GetParent(self) -> Menu"""
         return _core_.Menu_GetParent(*args, **kwargs)
 
         """GetParent(self) -> Menu"""
         return _core_.Menu_GetParent(*args, **kwargs)
 

-Menu_swigregister = _core_.Menu_swigregister
-Menu_swigregister(Menu)
+_core_.Menu_swigregister(Menu)

 DefaultValidator = cvar.DefaultValidator
 
 #---------------------------------------------------------------------------
 DefaultValidator = cvar.DefaultValidator
 
 #---------------------------------------------------------------------------


@@ -10167,8 +10153,7 @@ class MenuBar(Window):
         return _core_.MenuBar_GetAutoWindowMenu(*args, **kwargs)
 
     GetAutoWindowMenu = staticmethod(GetAutoWindowMenu)
         return _core_.MenuBar_GetAutoWindowMenu(*args, **kwargs)
 
     GetAutoWindowMenu = staticmethod(GetAutoWindowMenu)

-MenuBar_swigregister = _core_.MenuBar_swigregister
-MenuBar_swigregister(MenuBar)
+_core_.MenuBar_swigregister(MenuBar)

 
 def MenuBar_SetAutoWindowMenu(*args, **kwargs):
   """MenuBar_SetAutoWindowMenu(bool enable)"""
 
 def MenuBar_SetAutoWindowMenu(*args, **kwargs):
   """MenuBar_SetAutoWindowMenu(bool enable)"""


@@ -10363,8 +10348,7 @@ class MenuItem(Object):
         """ResetOwnerDrawn(self)"""
         return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs)
 
         """ResetOwnerDrawn(self)"""
         return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs)
 

-MenuItem_swigregister = _core_.MenuItem_swigregister
-MenuItem_swigregister(MenuItem)
+_core_.MenuItem_swigregister(MenuItem)

 
 def MenuItem_GetLabelFromText(*args, **kwargs):
   """MenuItem_GetLabelFromText(String text) -> String"""
 
 def MenuItem_GetLabelFromText(*args, **kwargs):
   """MenuItem_GetLabelFromText(String text) -> String"""


@@ -10444,8 +10428,7 @@ class Control(Window):
         return _core_.Control_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         return _core_.Control_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

-Control_swigregister = _core_.Control_swigregister
-Control_swigregister(Control)
+_core_.Control_swigregister(Control)

 ControlNameStr = cvar.ControlNameStr
 
 def PreControl(*args, **kwargs):
 ControlNameStr = cvar.ControlNameStr
 
 def PreControl(*args, **kwargs):


@@ -10518,7 +10501,7 @@ class ItemContainer(object):
 
     def Insert(*args, **kwargs):
         """
 
     def Insert(*args, **kwargs):
         """

-        Insert(self, String item, int pos, PyObject clientData=None) -> int
+        Insert(self, String item, unsigned 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.
 
         Insert an item into the control before the item at the ``pos`` index,
         optionally associating some data object with the item.


@@ -10535,7 +10518,7 @@ class ItemContainer(object):
 
     def Delete(*args, **kwargs):
         """
 
     def Delete(*args, **kwargs):
         """

-        Delete(self, int n)
+        Delete(self, unsigned 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
 
         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


@@ -10546,7 +10529,7 @@ class ItemContainer(object):
 
     def GetClientData(*args, **kwargs):
         """
 
     def GetClientData(*args, **kwargs):
         """

-        GetClientData(self, int n) -> PyObject
+        GetClientData(self, unsigned int n) -> PyObject

 
         Returns the client data associated with the given item, (if any.)
         """
 
         Returns the client data associated with the given item, (if any.)
         """


@@ -10554,7 +10537,7 @@ class ItemContainer(object):
 
     def SetClientData(*args, **kwargs):
         """
 
     def SetClientData(*args, **kwargs):
         """

-        SetClientData(self, int n, PyObject clientData)
+        SetClientData(self, unsigned int n, PyObject clientData)

 
         Associate the given client data with the item at position n.
         """
 
         Associate the given client data with the item at position n.
         """


@@ -10562,7 +10545,7 @@ class ItemContainer(object):
 
     def GetCount(*args, **kwargs):
         """
 
     def GetCount(*args, **kwargs):
         """

-        GetCount(self) -> size_t
+        GetCount(self) -> unsigned int

 
         Returns the number of items in the control.
         """
 
         Returns the number of items in the control.
         """


@@ -10578,7 +10561,7 @@ class ItemContainer(object):
 
     def GetString(*args, **kwargs):
         """
 
     def GetString(*args, **kwargs):
         """

-        GetString(self, int n) -> String
+        GetString(self, unsigned int n) -> String

 
         Returns the label of the item with the given index.
         """
 
         Returns the label of the item with the given index.
         """


@@ -10590,7 +10573,7 @@ class ItemContainer(object):
 
     def SetString(*args, **kwargs):
         """
 
     def SetString(*args, **kwargs):
         """

-        SetString(self, int n, String s)
+        SetString(self, unsigned int n, String s)

 
         Sets the label for the given item.
         """
 
         Sets the label for the given item.
         """


@@ -10645,8 +10628,7 @@ class ItemContainer(object):
         """
         return _core_.ItemContainer_Select(*args, **kwargs)
 
         """
         return _core_.ItemContainer_Select(*args, **kwargs)
 

-ItemContainer_swigregister = _core_.ItemContainer_swigregister
-ItemContainer_swigregister(ItemContainer)
+_core_.ItemContainer_swigregister(ItemContainer)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -10659,18 +10641,20 @@ class ControlWithItems(Control,ItemContainer):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr

-ControlWithItems_swigregister = _core_.ControlWithItems_swigregister
-ControlWithItems_swigregister(ControlWithItems)
+_core_.ControlWithItems_swigregister(ControlWithItems)

 
 #---------------------------------------------------------------------------
 
 class SizerItem(Object):
     """
     The wx.SizerItem class is used to track the position, size and other
 
 #---------------------------------------------------------------------------
 
 class SizerItem(Object):
     """
     The wx.SizerItem class is used to track the position, size and other

-    attributes of each item managed by a `wx.Sizer`. In normal usage user
-    code should never need to deal directly with a wx.SizerItem, but
-    custom classes derived from `wx.PySizer` will probably need to use the
-    collection of wx.SizerItems held by wx.Sizer when calculating layout.
+    attributes of each item managed by a `wx.Sizer`. It is not usually
+    necessary to use this class because the sizer elements can also be
+    identified by their positions or window or sizer references but
+    sometimes it may be more convenient to use wx.SizerItem directly.
+    Also, custom classes derived from `wx.PySizer` will probably need to
+    use the collection of wx.SizerItems held by wx.Sizer when calculating
+    layout.

 
     :see: `wx.Sizer`, `wx.GBSizerItem`
     """
 
     :see: `wx.Sizer`, `wx.GBSizerItem`
     """


@@ -10963,8 +10947,7 @@ class SizerItem(Object):
         """
         return _core_.SizerItem_SetUserData(*args, **kwargs)
 
         """
         return _core_.SizerItem_SetUserData(*args, **kwargs)
 

-SizerItem_swigregister = _core_.SizerItem_swigregister
-SizerItem_swigregister(SizerItem)
+_core_.SizerItem_swigregister(SizerItem)

 
 def SizerItemWindow(*args, **kwargs):
     """
 
 def SizerItemWindow(*args, **kwargs):
     """


@@ -11001,8 +10984,8 @@ class Sizer(Object):
     wx.Sizer is the abstract base class used for laying out subwindows in
     a window.  You cannot use wx.Sizer directly; instead, you will have to
     use one of the sizer classes derived from it such as `wx.BoxSizer`,
     wx.Sizer is the abstract base class used for laying out subwindows in
     a window.  You cannot use wx.Sizer directly; instead, you will have to
     use one of the sizer classes derived from it such as `wx.BoxSizer`,

-    `wx.StaticBoxSizer`, `wx.NotebookSizer`, `wx.GridSizer`,  `wx.FlexGridSizer`
-    and `wx.GridBagSizer`.
+    `wx.StaticBoxSizer`, `wx.GridSizer`, `wx.FlexGridSizer` and
+    `wx.GridBagSizer`.

 
     The concept implemented by sizers in wxWidgets is closely related to
     layout tools in other GUI toolkits, such as Java's AWT, the GTK
 
     The concept implemented by sizers in wxWidgets is closely related to
     layout tools in other GUI toolkits, such as Java's AWT, the GTK


@@ -11400,8 +11383,7 @@ class Sizer(Object):
         """
         return _core_.Sizer_ShowItems(*args, **kwargs)
 
         """
         return _core_.Sizer_ShowItems(*args, **kwargs)
 

-Sizer_swigregister = _core_.Sizer_swigregister
-Sizer_swigregister(Sizer)
+_core_.Sizer_swigregister(Sizer)

 
 class PySizer(Sizer):
     """
 
 class PySizer(Sizer):
     """


@@ -11461,8 +11443,7 @@ class PySizer(Sizer):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _core_.PySizer__setCallbackInfo(*args, **kwargs)
 
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _core_.PySizer__setCallbackInfo(*args, **kwargs)
 

-PySizer_swigregister = _core_.PySizer_swigregister
-PySizer_swigregister(PySizer)
+_core_.PySizer_swigregister(PySizer)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -11503,8 +11484,7 @@ class BoxSizer(Sizer):
         """
         return _core_.BoxSizer_SetOrientation(*args, **kwargs)
 
         """
         return _core_.BoxSizer_SetOrientation(*args, **kwargs)
 

-BoxSizer_swigregister = _core_.BoxSizer_swigregister
-BoxSizer_swigregister(BoxSizer)
+_core_.BoxSizer_swigregister(BoxSizer)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -11536,8 +11516,7 @@ class StaticBoxSizer(BoxSizer):
         """
         return _core_.StaticBoxSizer_GetStaticBox(*args, **kwargs)
 
         """
         return _core_.StaticBoxSizer_GetStaticBox(*args, **kwargs)
 

-StaticBoxSizer_swigregister = _core_.StaticBoxSizer_swigregister
-StaticBoxSizer_swigregister(StaticBoxSizer)
+_core_.StaticBoxSizer_swigregister(StaticBoxSizer)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -11655,8 +11634,7 @@ class GridSizer(Sizer):
             cols = (nitems + rows - 1) / rows
         return (rows, cols)
 
             cols = (nitems + rows - 1) / rows
         return (rows, cols)
 

-GridSizer_swigregister = _core_.GridSizer_swigregister
-GridSizer_swigregister(GridSizer)
+_core_.GridSizer_swigregister(GridSizer)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -11822,8 +11800,7 @@ class FlexGridSizer(GridSizer):
         """
         return _core_.FlexGridSizer_GetColWidths(*args, **kwargs)
 
         """
         return _core_.FlexGridSizer_GetColWidths(*args, **kwargs)
 

-FlexGridSizer_swigregister = _core_.FlexGridSizer_swigregister
-FlexGridSizer_swigregister(FlexGridSizer)
+_core_.FlexGridSizer_swigregister(FlexGridSizer)

 
 class StdDialogButtonSizer(BoxSizer):
     """
 
 class StdDialogButtonSizer(BoxSizer):
     """


@@ -11890,8 +11867,7 @@ class StdDialogButtonSizer(BoxSizer):
         """GetHelpButton(self) -> wxButton"""
         return _core_.StdDialogButtonSizer_GetHelpButton(*args, **kwargs)
 
         """GetHelpButton(self) -> wxButton"""
         return _core_.StdDialogButtonSizer_GetHelpButton(*args, **kwargs)
 

-StdDialogButtonSizer_swigregister = _core_.StdDialogButtonSizer_swigregister
-StdDialogButtonSizer_swigregister(StdDialogButtonSizer)
+_core_.StdDialogButtonSizer_swigregister(StdDialogButtonSizer)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -11935,11 +11911,19 @@ class GBPosition(object):
         return _core_.GBPosition_SetCol(*args, **kwargs)
 
     def __eq__(*args, **kwargs):
         return _core_.GBPosition_SetCol(*args, **kwargs)
 
     def __eq__(*args, **kwargs):

-        """__eq__(self, GBPosition other) -> bool"""
+        """
+        __eq__(self, PyObject other) -> bool
+
+        Compare GBPosition for equality.
+        """

         return _core_.GBPosition___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _core_.GBPosition___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(self, GBPosition other) -> bool"""
+        """
+        __ne__(self, PyObject other) -> bool
+
+        Compare GBPosition for inequality.
+        """

         return _core_.GBPosition___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):
         return _core_.GBPosition___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):


@@ -11966,8 +11950,7 @@ class GBPosition(object):
     row = property(GetRow, SetRow)
     col = property(GetCol, SetCol)
 
     row = property(GetRow, SetRow)
     col = property(GetCol, SetCol)
 

-GBPosition_swigregister = _core_.GBPosition_swigregister
-GBPosition_swigregister(GBPosition)
+_core_.GBPosition_swigregister(GBPosition)

 
 class GBSpan(object):
     """
 
 class GBSpan(object):
     """


@@ -12008,11 +11991,19 @@ class GBSpan(object):
         return _core_.GBSpan_SetColspan(*args, **kwargs)
 
     def __eq__(*args, **kwargs):
         return _core_.GBSpan_SetColspan(*args, **kwargs)
 
     def __eq__(*args, **kwargs):

-        """__eq__(self, GBSpan other) -> bool"""
+        """
+        __eq__(self, PyObject other) -> bool
+
+        Compare wxGBSpan for equality.
+        """

         return _core_.GBSpan___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _core_.GBSpan___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(self, GBSpan other) -> bool"""
+        """
+        __ne__(self, PyObject other) -> bool
+
+        Compare GBSpan for inequality.
+        """

         return _core_.GBSpan___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):
         return _core_.GBSpan___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):


@@ -12039,8 +12030,7 @@ class GBSpan(object):
     rowspan = property(GetRowspan, SetRowspan)
     colspan = property(GetColspan, SetColspan)
 
     rowspan = property(GetRowspan, SetRowspan)
     colspan = property(GetColspan, SetColspan)
 

-GBSpan_swigregister = _core_.GBSpan_swigregister
-GBSpan_swigregister(GBSpan)
+_core_.GBSpan_swigregister(GBSpan)

 
 class GBSizerItem(SizerItem):
     """
 
 class GBSizerItem(SizerItem):
     """


@@ -12146,8 +12136,7 @@ class GBSizerItem(SizerItem):
         """
         return _core_.GBSizerItem_SetGBSizer(*args, **kwargs)
 
         """
         return _core_.GBSizerItem_SetGBSizer(*args, **kwargs)
 

-GBSizerItem_swigregister = _core_.GBSizerItem_swigregister
-GBSizerItem_swigregister(GBSizerItem)
+_core_.GBSizerItem_swigregister(GBSizerItem)

 DefaultSpan = cvar.DefaultSpan
 
 def GBSizerItemWindow(*args, **kwargs):
 DefaultSpan = cvar.DefaultSpan
 
 def GBSizerItemWindow(*args, **kwargs):


@@ -12349,8 +12338,7 @@ class GridBagSizer(FlexGridSizer):
         """
         return _core_.GridBagSizer_CheckForIntersectionPos(*args, **kwargs)
 
         """
         return _core_.GridBagSizer_CheckForIntersectionPos(*args, **kwargs)
 

-GridBagSizer_swigregister = _core_.GridBagSizer_swigregister
-GridBagSizer_swigregister(GridBagSizer)
+_core_.GridBagSizer_swigregister(GridBagSizer)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -12559,8 +12547,7 @@ class IndividualLayoutConstraint(Object):
         """
         return _core_.IndividualLayoutConstraint_GetEdge(*args, **kwargs)
 
         """
         return _core_.IndividualLayoutConstraint_GetEdge(*args, **kwargs)
 

-IndividualLayoutConstraint_swigregister = _core_.IndividualLayoutConstraint_swigregister
-IndividualLayoutConstraint_swigregister(IndividualLayoutConstraint)
+_core_.IndividualLayoutConstraint_swigregister(IndividualLayoutConstraint)

 
 class LayoutConstraints(Object):
     """
 
 class LayoutConstraints(Object):
     """


@@ -12617,8 +12604,7 @@ class LayoutConstraints(Object):
         """AreSatisfied(self) -> bool"""
         return _core_.LayoutConstraints_AreSatisfied(*args, **kwargs)
 
         """AreSatisfied(self) -> bool"""
         return _core_.LayoutConstraints_AreSatisfied(*args, **kwargs)
 

-LayoutConstraints_swigregister = _core_.LayoutConstraints_swigregister
-LayoutConstraints_swigregister(LayoutConstraints)
+_core_.LayoutConstraints_swigregister(LayoutConstraints)

 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
 


@@ -12902,11 +12888,6 @@ from _windows import *
 from _controls import *
 from _misc import *
 
 from _controls import *
 from _misc import *
 

-
-# Fixup the stock objects since they can't be used yet.  (They will be
-# restored in wx.PyApp.OnInit.)
-_core_._wxPyFixStockObjects()
-

 #----------------------------------------------------------------------------
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
 #----------------------------------------------------------------------------