SetFont may temporarily rset the background to wxNullColour before

[wxWidgets.git] / wxPython / wxPython / core.py

diff --git a/wxPython/wxPython/core.py b/wxPython/wxPython/core.py
index d40cc45ec04ab3d4d5b8d2171cf2f20ad3c18ea4..7148cb9d946af82b20792bcbc9334c1ea46c8e59 100644 (file)
--- a/wxPython/wxPython/core.py
+++ b/wxPython/wxPython/core.py
@@ -31,37 +31,12 @@ wxSIMPLE_BORDER = wx.core.SIMPLE_BORDER
 wxSTATIC_BORDER = wx.core.STATIC_BORDER
 wxTRANSPARENT_WINDOW = wx.core.TRANSPARENT_WINDOW
 wxNO_BORDER = wx.core.NO_BORDER
 wxSTATIC_BORDER = wx.core.STATIC_BORDER
 wxTRANSPARENT_WINDOW = wx.core.TRANSPARENT_WINDOW
 wxNO_BORDER = wx.core.NO_BORDER

-wxUSER_COLOURS = wx.core.USER_COLOURS
-wxNO_3D = wx.core.NO_3D

 wxTAB_TRAVERSAL = wx.core.TAB_TRAVERSAL
 wxWANTS_CHARS = wx.core.WANTS_CHARS
 wxPOPUP_WINDOW = wx.core.POPUP_WINDOW
 wxCENTER_FRAME = wx.core.CENTER_FRAME
 wxCENTRE_ON_SCREEN = wx.core.CENTRE_ON_SCREEN
 wxCENTER_ON_SCREEN = wx.core.CENTER_ON_SCREEN
 wxTAB_TRAVERSAL = wx.core.TAB_TRAVERSAL
 wxWANTS_CHARS = wx.core.WANTS_CHARS
 wxPOPUP_WINDOW = wx.core.POPUP_WINDOW
 wxCENTER_FRAME = wx.core.CENTER_FRAME
 wxCENTRE_ON_SCREEN = wx.core.CENTRE_ON_SCREEN
 wxCENTER_ON_SCREEN = wx.core.CENTER_ON_SCREEN

-wxSTAY_ON_TOP = wx.core.STAY_ON_TOP
-wxICONIZE = wx.core.ICONIZE
-wxMINIMIZE = wx.core.MINIMIZE
-wxMAXIMIZE = wx.core.MAXIMIZE
-wxCLOSE_BOX = wx.core.CLOSE_BOX
-wxTHICK_FRAME = wx.core.THICK_FRAME
-wxSYSTEM_MENU = wx.core.SYSTEM_MENU
-wxMINIMIZE_BOX = wx.core.MINIMIZE_BOX
-wxMAXIMIZE_BOX = wx.core.MAXIMIZE_BOX
-wxTINY_CAPTION_HORIZ = wx.core.TINY_CAPTION_HORIZ
-wxTINY_CAPTION_VERT = wx.core.TINY_CAPTION_VERT
-wxRESIZE_BOX = wx.core.RESIZE_BOX
-wxRESIZE_BORDER = wx.core.RESIZE_BORDER
-wxDIALOG_MODAL = wx.core.DIALOG_MODAL
-wxDIALOG_MODELESS = wx.core.DIALOG_MODELESS
-wxDIALOG_NO_PARENT = wx.core.DIALOG_NO_PARENT
-wxDEFAULT_FRAME_STYLE = wx.core.DEFAULT_FRAME_STYLE
-wxDEFAULT_DIALOG_STYLE = wx.core.DEFAULT_DIALOG_STYLE
-wxFRAME_TOOL_WINDOW = wx.core.FRAME_TOOL_WINDOW
-wxFRAME_FLOAT_ON_PARENT = wx.core.FRAME_FLOAT_ON_PARENT
-wxFRAME_NO_WINDOW_MENU = wx.core.FRAME_NO_WINDOW_MENU
-wxFRAME_NO_TASKBAR = wx.core.FRAME_NO_TASKBAR
-wxFRAME_SHAPED = wx.core.FRAME_SHAPED

 wxED_CLIENT_MARGIN = wx.core.ED_CLIENT_MARGIN
 wxED_BUTTONS_BOTTOM = wx.core.ED_BUTTONS_BOTTOM
 wxED_BUTTONS_RIGHT = wx.core.ED_BUTTONS_RIGHT
 wxED_CLIENT_MARGIN = wx.core.ED_CLIENT_MARGIN
 wxED_BUTTONS_BOTTOM = wx.core.ED_BUTTONS_BOTTOM
 wxED_BUTTONS_RIGHT = wx.core.ED_BUTTONS_RIGHT


@@ -69,6 +44,7 @@ wxED_STATIC_LINE = wx.core.ED_STATIC_LINE
 wxEXT_DIALOG_STYLE = wx.core.EXT_DIALOG_STYLE
 wxCLIP_CHILDREN = wx.core.CLIP_CHILDREN
 wxCLIP_SIBLINGS = wx.core.CLIP_SIBLINGS
 wxEXT_DIALOG_STYLE = wx.core.EXT_DIALOG_STYLE
 wxCLIP_CHILDREN = wx.core.CLIP_CHILDREN
 wxCLIP_SIBLINGS = wx.core.CLIP_SIBLINGS

+wxALWAYS_SHOW_SB = wx.core.ALWAYS_SHOW_SB

 wxRETAINED = wx.core.RETAINED
 wxBACKINGSTORE = wx.core.BACKINGSTORE
 wxCOLOURED = wx.core.COLOURED
 wxRETAINED = wx.core.RETAINED
 wxBACKINGSTORE = wx.core.BACKINGSTORE
 wxCOLOURED = wx.core.COLOURED


@@ -240,6 +216,7 @@ wxDD_DEFAULT_STYLE = wx.core.DD_DEFAULT_STYLE
 wxMENU_TEAROFF = wx.core.MENU_TEAROFF
 wxMB_DOCKABLE = wx.core.MB_DOCKABLE
 wxNO_FULL_REPAINT_ON_RESIZE = wx.core.NO_FULL_REPAINT_ON_RESIZE
 wxMENU_TEAROFF = wx.core.MENU_TEAROFF
 wxMB_DOCKABLE = wx.core.MB_DOCKABLE
 wxNO_FULL_REPAINT_ON_RESIZE = wx.core.NO_FULL_REPAINT_ON_RESIZE

+wxFULL_REPAINT_ON_RESIZE = wx.core.FULL_REPAINT_ON_RESIZE

 wxLI_HORIZONTAL = wx.core.LI_HORIZONTAL
 wxLI_VERTICAL = wx.core.LI_VERTICAL
 wxWS_EX_VALIDATE_RECURSIVELY = wx.core.WS_EX_VALIDATE_RECURSIVELY
 wxLI_HORIZONTAL = wx.core.LI_HORIZONTAL
 wxLI_VERTICAL = wx.core.LI_VERTICAL
 wxWS_EX_VALIDATE_RECURSIVELY = wx.core.WS_EX_VALIDATE_RECURSIVELY


@@ -291,8 +268,9 @@ wxSHRINK = wx.core.SHRINK
 wxGROW = wx.core.GROW
 wxEXPAND = wx.core.EXPAND
 wxSHAPED = wx.core.SHAPED
 wxGROW = wx.core.GROW
 wxEXPAND = wx.core.EXPAND
 wxSHAPED = wx.core.SHAPED

-wxADJUST_MINSIZE = wx.core.ADJUST_MINSIZE
+wxFIXED_MINSIZE = wx.core.FIXED_MINSIZE

 wxTILE = wx.core.TILE
 wxTILE = wx.core.TILE

+wxADJUST_MINSIZE = wx.core.ADJUST_MINSIZE

 wxBORDER_DEFAULT = wx.core.BORDER_DEFAULT
 wxBORDER_NONE = wx.core.BORDER_NONE
 wxBORDER_STATIC = wx.core.BORDER_STATIC
 wxBORDER_DEFAULT = wx.core.BORDER_DEFAULT
 wxBORDER_NONE = wx.core.BORDER_NONE
 wxBORDER_STATIC = wx.core.BORDER_STATIC


@@ -556,39 +534,28 @@ wxMOD_WIN = wx.core.MOD_WIN
 wxUPDATE_UI_NONE = wx.core.UPDATE_UI_NONE
 wxUPDATE_UI_RECURSE = wx.core.UPDATE_UI_RECURSE
 wxUPDATE_UI_FROMIDLE = wx.core.UPDATE_UI_FROMIDLE
 wxUPDATE_UI_NONE = wx.core.UPDATE_UI_NONE
 wxUPDATE_UI_RECURSE = wx.core.UPDATE_UI_RECURSE
 wxUPDATE_UI_FROMIDLE = wx.core.UPDATE_UI_FROMIDLE

+wxEmptyString = wx.core.EmptyString

 wxObject = wx.core.Object
 wxObject = wx.core.Object

+wxObjectPtr = wx.core.ObjectPtr

 wxBITMAP_TYPE_INVALID = wx.core.BITMAP_TYPE_INVALID
 wxBITMAP_TYPE_BMP = wx.core.BITMAP_TYPE_BMP
 wxBITMAP_TYPE_INVALID = wx.core.BITMAP_TYPE_INVALID
 wxBITMAP_TYPE_BMP = wx.core.BITMAP_TYPE_BMP

-wxBITMAP_TYPE_BMP_RESOURCE = wx.core.BITMAP_TYPE_BMP_RESOURCE
-wxBITMAP_TYPE_RESOURCE = wx.core.BITMAP_TYPE_RESOURCE

 wxBITMAP_TYPE_ICO = wx.core.BITMAP_TYPE_ICO
 wxBITMAP_TYPE_ICO = wx.core.BITMAP_TYPE_ICO

-wxBITMAP_TYPE_ICO_RESOURCE = wx.core.BITMAP_TYPE_ICO_RESOURCE

 wxBITMAP_TYPE_CUR = wx.core.BITMAP_TYPE_CUR
 wxBITMAP_TYPE_CUR = wx.core.BITMAP_TYPE_CUR

-wxBITMAP_TYPE_CUR_RESOURCE = wx.core.BITMAP_TYPE_CUR_RESOURCE

 wxBITMAP_TYPE_XBM = wx.core.BITMAP_TYPE_XBM
 wxBITMAP_TYPE_XBM_DATA = wx.core.BITMAP_TYPE_XBM_DATA
 wxBITMAP_TYPE_XPM = wx.core.BITMAP_TYPE_XPM
 wxBITMAP_TYPE_XPM_DATA = wx.core.BITMAP_TYPE_XPM_DATA
 wxBITMAP_TYPE_TIF = wx.core.BITMAP_TYPE_TIF
 wxBITMAP_TYPE_XBM = wx.core.BITMAP_TYPE_XBM
 wxBITMAP_TYPE_XBM_DATA = wx.core.BITMAP_TYPE_XBM_DATA
 wxBITMAP_TYPE_XPM = wx.core.BITMAP_TYPE_XPM
 wxBITMAP_TYPE_XPM_DATA = wx.core.BITMAP_TYPE_XPM_DATA
 wxBITMAP_TYPE_TIF = wx.core.BITMAP_TYPE_TIF

-wxBITMAP_TYPE_TIF_RESOURCE = wx.core.BITMAP_TYPE_TIF_RESOURCE

 wxBITMAP_TYPE_GIF = wx.core.BITMAP_TYPE_GIF
 wxBITMAP_TYPE_GIF = wx.core.BITMAP_TYPE_GIF

-wxBITMAP_TYPE_GIF_RESOURCE = wx.core.BITMAP_TYPE_GIF_RESOURCE

 wxBITMAP_TYPE_PNG = wx.core.BITMAP_TYPE_PNG
 wxBITMAP_TYPE_PNG = wx.core.BITMAP_TYPE_PNG

-wxBITMAP_TYPE_PNG_RESOURCE = wx.core.BITMAP_TYPE_PNG_RESOURCE

 wxBITMAP_TYPE_JPEG = wx.core.BITMAP_TYPE_JPEG
 wxBITMAP_TYPE_JPEG = wx.core.BITMAP_TYPE_JPEG

-wxBITMAP_TYPE_JPEG_RESOURCE = wx.core.BITMAP_TYPE_JPEG_RESOURCE

 wxBITMAP_TYPE_PNM = wx.core.BITMAP_TYPE_PNM
 wxBITMAP_TYPE_PNM = wx.core.BITMAP_TYPE_PNM

-wxBITMAP_TYPE_PNM_RESOURCE = wx.core.BITMAP_TYPE_PNM_RESOURCE

 wxBITMAP_TYPE_PCX = wx.core.BITMAP_TYPE_PCX
 wxBITMAP_TYPE_PCX = wx.core.BITMAP_TYPE_PCX

-wxBITMAP_TYPE_PCX_RESOURCE = wx.core.BITMAP_TYPE_PCX_RESOURCE

 wxBITMAP_TYPE_PICT = wx.core.BITMAP_TYPE_PICT
 wxBITMAP_TYPE_PICT = wx.core.BITMAP_TYPE_PICT

-wxBITMAP_TYPE_PICT_RESOURCE = wx.core.BITMAP_TYPE_PICT_RESOURCE

 wxBITMAP_TYPE_ICON = wx.core.BITMAP_TYPE_ICON
 wxBITMAP_TYPE_ICON = wx.core.BITMAP_TYPE_ICON

-wxBITMAP_TYPE_ICON_RESOURCE = wx.core.BITMAP_TYPE_ICON_RESOURCE

 wxBITMAP_TYPE_ANI = wx.core.BITMAP_TYPE_ANI
 wxBITMAP_TYPE_IFF = wx.core.BITMAP_TYPE_IFF
 wxBITMAP_TYPE_MACCURSOR = wx.core.BITMAP_TYPE_MACCURSOR
 wxBITMAP_TYPE_ANI = wx.core.BITMAP_TYPE_ANI
 wxBITMAP_TYPE_IFF = wx.core.BITMAP_TYPE_IFF
 wxBITMAP_TYPE_MACCURSOR = wx.core.BITMAP_TYPE_MACCURSOR

-wxBITMAP_TYPE_MACCURSOR_RESOURCE = wx.core.BITMAP_TYPE_MACCURSOR_RESOURCE

 wxBITMAP_TYPE_ANY = wx.core.BITMAP_TYPE_ANY
 wxCURSOR_NONE = wx.core.CURSOR_NONE
 wxCURSOR_ARROW = wx.core.CURSOR_ARROW
 wxBITMAP_TYPE_ANY = wx.core.BITMAP_TYPE_ANY
 wxCURSOR_NONE = wx.core.CURSOR_NONE
 wxCURSOR_ARROW = wx.core.CURSOR_ARROW


@@ -622,44 +589,63 @@ wxCURSOR_COPY_ARROW = wx.core.CURSOR_COPY_ARROW
 wxCURSOR_ARROWWAIT = wx.core.CURSOR_ARROWWAIT
 wxCURSOR_MAX = wx.core.CURSOR_MAX
 wxSize = wx.core.Size
 wxCURSOR_ARROWWAIT = wx.core.CURSOR_ARROWWAIT
 wxCURSOR_MAX = wx.core.CURSOR_MAX
 wxSize = wx.core.Size

+wxSizePtr = wx.core.SizePtr

 wxRealPoint = wx.core.RealPoint
 wxRealPoint = wx.core.RealPoint

+wxRealPointPtr = wx.core.RealPointPtr

 wxPoint = wx.core.Point
 wxPoint = wx.core.Point

+wxPointPtr = wx.core.PointPtr
+wxRect = wx.core.Rect
+wxRectPtr = wx.core.RectPtr

 wxRectPP = wx.core.RectPP
 wxRectPS = wx.core.RectPS
 wxRectPP = wx.core.RectPP
 wxRectPS = wx.core.RectPS

-wxRect = wx.core.Rect

 wxIntersectRect = wx.core.IntersectRect
 wxIntersectRect = wx.core.IntersectRect

+wxPoint2D = wx.core.Point2D
+wxPoint2DPtr = wx.core.Point2DPtr

 wxPoint2DCopy = wx.core.Point2DCopy
 wxPoint2DFromPoint = wx.core.Point2DFromPoint
 wxPoint2DCopy = wx.core.Point2DCopy
 wxPoint2DFromPoint = wx.core.Point2DFromPoint

-wxPoint2D = wx.core.Point2D

 wxDefaultPosition = wx.core.DefaultPosition
 wxDefaultSize = wx.core.DefaultSize
 wxFromStart = wx.core.FromStart
 wxFromCurrent = wx.core.FromCurrent
 wxFromEnd = wx.core.FromEnd
 wxInputStream = wx.core.InputStream
 wxDefaultPosition = wx.core.DefaultPosition
 wxDefaultSize = wx.core.DefaultSize
 wxFromStart = wx.core.FromStart
 wxFromCurrent = wx.core.FromCurrent
 wxFromEnd = wx.core.FromEnd
 wxInputStream = wx.core.InputStream

+wxInputStreamPtr = wx.core.InputStreamPtr

 wxOutputStream = wx.core.OutputStream
 wxOutputStream = wx.core.OutputStream

+wxOutputStreamPtr = wx.core.OutputStreamPtr

 wxFSFile = wx.core.FSFile
 wxFSFile = wx.core.FSFile

+wxFSFilePtr = wx.core.FSFilePtr

 wxCPPFileSystemHandler = wx.core.CPPFileSystemHandler
 wxCPPFileSystemHandler = wx.core.CPPFileSystemHandler

+wxCPPFileSystemHandlerPtr = wx.core.CPPFileSystemHandlerPtr

 wxFileSystemHandler = wx.core.FileSystemHandler
 wxFileSystemHandler = wx.core.FileSystemHandler

+wxFileSystemHandlerPtr = wx.core.FileSystemHandlerPtr
+wxFileSystem = wx.core.FileSystem
+wxFileSystemPtr = wx.core.FileSystemPtr

 wxFileSystem_AddHandler = wx.core.FileSystem_AddHandler
 wxFileSystem_CleanUpHandlers = wx.core.FileSystem_CleanUpHandlers
 wxFileSystem_FileNameToURL = wx.core.FileSystem_FileNameToURL
 wxFileSystem_AddHandler = wx.core.FileSystem_AddHandler
 wxFileSystem_CleanUpHandlers = wx.core.FileSystem_CleanUpHandlers
 wxFileSystem_FileNameToURL = wx.core.FileSystem_FileNameToURL

-wxFileSystem = wx.core.FileSystem

 wxFileSystem_URLToFileName = wx.core.FileSystem_URLToFileName
 wxInternetFSHandler = wx.core.InternetFSHandler
 wxFileSystem_URLToFileName = wx.core.FileSystem_URLToFileName
 wxInternetFSHandler = wx.core.InternetFSHandler

+wxInternetFSHandlerPtr = wx.core.InternetFSHandlerPtr

 wxZipFSHandler = wx.core.ZipFSHandler
 wxZipFSHandler = wx.core.ZipFSHandler

+wxZipFSHandlerPtr = wx.core.ZipFSHandlerPtr

 __wxMemoryFSHandler_AddFile_wxImage = wx.core.__wxMemoryFSHandler_AddFile_wxImage
 __wxMemoryFSHandler_AddFile_wxBitmap = wx.core.__wxMemoryFSHandler_AddFile_wxBitmap
 __wxMemoryFSHandler_AddFile_Data = wx.core.__wxMemoryFSHandler_AddFile_Data
 __wxMemoryFSHandler_AddFile_wxImage = wx.core.__wxMemoryFSHandler_AddFile_wxImage
 __wxMemoryFSHandler_AddFile_wxBitmap = wx.core.__wxMemoryFSHandler_AddFile_wxBitmap
 __wxMemoryFSHandler_AddFile_Data = wx.core.__wxMemoryFSHandler_AddFile_Data

-wxMemoryFSHandler_RemoveFile = wx.core.MemoryFSHandler_RemoveFile

 wxMemoryFSHandler = wx.core.MemoryFSHandler
 wxMemoryFSHandler = wx.core.MemoryFSHandler

+wxMemoryFSHandlerPtr = wx.core.MemoryFSHandlerPtr
+wxMemoryFSHandler_RemoveFile = wx.core.MemoryFSHandler_RemoveFile

 wxImageHandler = wx.core.ImageHandler
 wxImageHandler = wx.core.ImageHandler

-wxImageHistogram_MakeKey = wx.core.ImageHistogram_MakeKey
+wxImageHandlerPtr = wx.core.ImageHandlerPtr

 wxImageHistogram = wx.core.ImageHistogram
 wxImageHistogram = wx.core.ImageHistogram

+wxImageHistogramPtr = wx.core.ImageHistogramPtr
+wxImageHistogram_MakeKey = wx.core.ImageHistogram_MakeKey
+wxImage = wx.core.Image
+wxImagePtr = wx.core.ImagePtr

 wxImageFromMime = wx.core.ImageFromMime
 wxImageFromStream = wx.core.ImageFromStream
 wxImageFromStreamMime = wx.core.ImageFromStreamMime
 wxEmptyImage = wx.core.EmptyImage
 wxImageFromMime = wx.core.ImageFromMime
 wxImageFromStream = wx.core.ImageFromStream
 wxImageFromStreamMime = wx.core.ImageFromStreamMime
 wxEmptyImage = wx.core.EmptyImage

+wxEmptyImage = wx.core.EmptyImage

 wxImageFromBitmap = wx.core.ImageFromBitmap
 wxImageFromData = wx.core.ImageFromData
 wxImage_CanRead = wx.core.Image_CanRead
 wxImageFromBitmap = wx.core.ImageFromBitmap
 wxImageFromData = wx.core.ImageFromData
 wxImage_CanRead = wx.core.Image_CanRead


@@ -669,7 +655,6 @@ wxImage_AddHandler = wx.core.Image_AddHandler
 wxImage_InsertHandler = wx.core.Image_InsertHandler
 wxImage_RemoveHandler = wx.core.Image_RemoveHandler
 wxImage_GetImageExtWildcard = wx.core.Image_GetImageExtWildcard
 wxImage_InsertHandler = wx.core.Image_InsertHandler
 wxImage_RemoveHandler = wx.core.Image_RemoveHandler
 wxImage_GetImageExtWildcard = wx.core.Image_GetImageExtWildcard

-wxImage = wx.core.Image

 wxInitAllImageHandlers = wx.core.InitAllImageHandlers
 wxNullImage = wx.core.NullImage
 wxIMAGE_OPTION_BMP_FORMAT = wx.core.IMAGE_OPTION_BMP_FORMAT
 wxInitAllImageHandlers = wx.core.InitAllImageHandlers
 wxNullImage = wx.core.NullImage
 wxIMAGE_OPTION_BMP_FORMAT = wx.core.IMAGE_OPTION_BMP_FORMAT


@@ -689,17 +674,29 @@ wxBMP_4BPP = wx.core.BMP_4BPP
 wxBMP_1BPP = wx.core.BMP_1BPP
 wxBMP_1BPP_BW = wx.core.BMP_1BPP_BW
 wxBMPHandler = wx.core.BMPHandler
 wxBMP_1BPP = wx.core.BMP_1BPP
 wxBMP_1BPP_BW = wx.core.BMP_1BPP_BW
 wxBMPHandler = wx.core.BMPHandler

+wxBMPHandlerPtr = wx.core.BMPHandlerPtr

 wxICOHandler = wx.core.ICOHandler
 wxICOHandler = wx.core.ICOHandler

+wxICOHandlerPtr = wx.core.ICOHandlerPtr

 wxCURHandler = wx.core.CURHandler
 wxCURHandler = wx.core.CURHandler

+wxCURHandlerPtr = wx.core.CURHandlerPtr

 wxANIHandler = wx.core.ANIHandler
 wxANIHandler = wx.core.ANIHandler

+wxANIHandlerPtr = wx.core.ANIHandlerPtr

 wxPNGHandler = wx.core.PNGHandler
 wxPNGHandler = wx.core.PNGHandler

+wxPNGHandlerPtr = wx.core.PNGHandlerPtr

 wxGIFHandler = wx.core.GIFHandler
 wxGIFHandler = wx.core.GIFHandler

+wxGIFHandlerPtr = wx.core.GIFHandlerPtr

 wxPCXHandler = wx.core.PCXHandler
 wxPCXHandler = wx.core.PCXHandler

+wxPCXHandlerPtr = wx.core.PCXHandlerPtr

 wxJPEGHandler = wx.core.JPEGHandler
 wxJPEGHandler = wx.core.JPEGHandler

+wxJPEGHandlerPtr = wx.core.JPEGHandlerPtr

 wxPNMHandler = wx.core.PNMHandler
 wxPNMHandler = wx.core.PNMHandler

+wxPNMHandlerPtr = wx.core.PNMHandlerPtr

 wxXPMHandler = wx.core.XPMHandler
 wxXPMHandler = wx.core.XPMHandler

+wxXPMHandlerPtr = wx.core.XPMHandlerPtr

 wxTIFFHandler = wx.core.TIFFHandler
 wxTIFFHandler = wx.core.TIFFHandler

+wxTIFFHandlerPtr = wx.core.TIFFHandlerPtr

 wxEvtHandler = wx.core.EvtHandler
 wxEvtHandler = wx.core.EvtHandler

+wxEvtHandlerPtr = wx.core.EvtHandlerPtr

 wxEVENT_PROPAGATE_NONE = wx.core.EVENT_PROPAGATE_NONE
 wxEVENT_PROPAGATE_MAX = wx.core.EVENT_PROPAGATE_MAX
 wxNewEventType = wx.core.NewEventType
 wxEVENT_PROPAGATE_NONE = wx.core.EVENT_PROPAGATE_NONE
 wxEVENT_PROPAGATE_MAX = wx.core.EVENT_PROPAGATE_MAX
 wxNewEventType = wx.core.NewEventType


@@ -818,67 +815,107 @@ wxEVT_COMMAND_SET_FOCUS = wx.core.wxEVT_COMMAND_SET_FOCUS
 wxEVT_COMMAND_KILL_FOCUS = wx.core.wxEVT_COMMAND_KILL_FOCUS
 wxEVT_COMMAND_ENTER = wx.core.wxEVT_COMMAND_ENTER
 wxEvent = wx.core.Event
 wxEVT_COMMAND_KILL_FOCUS = wx.core.wxEVT_COMMAND_KILL_FOCUS
 wxEVT_COMMAND_ENTER = wx.core.wxEVT_COMMAND_ENTER
 wxEvent = wx.core.Event

+wxEventPtr = wx.core.EventPtr

 wxPropagationDisabler = wx.core.PropagationDisabler
 wxPropagationDisabler = wx.core.PropagationDisabler

+wxPropagationDisablerPtr = wx.core.PropagationDisablerPtr

 wxPropagateOnce = wx.core.PropagateOnce
 wxPropagateOnce = wx.core.PropagateOnce

+wxPropagateOncePtr = wx.core.PropagateOncePtr

 wxCommandEvent = wx.core.CommandEvent
 wxCommandEvent = wx.core.CommandEvent

+wxCommandEventPtr = wx.core.CommandEventPtr

 wxNotifyEvent = wx.core.NotifyEvent
 wxNotifyEvent = wx.core.NotifyEvent

+wxNotifyEventPtr = wx.core.NotifyEventPtr

 wxScrollEvent = wx.core.ScrollEvent
 wxScrollEvent = wx.core.ScrollEvent

+wxScrollEventPtr = wx.core.ScrollEventPtr

 wxScrollWinEvent = wx.core.ScrollWinEvent
 wxScrollWinEvent = wx.core.ScrollWinEvent

+wxScrollWinEventPtr = wx.core.ScrollWinEventPtr

 wxMOUSE_BTN_ANY = wx.core.MOUSE_BTN_ANY
 wxMOUSE_BTN_NONE = wx.core.MOUSE_BTN_NONE
 wxMOUSE_BTN_LEFT = wx.core.MOUSE_BTN_LEFT
 wxMOUSE_BTN_MIDDLE = wx.core.MOUSE_BTN_MIDDLE
 wxMOUSE_BTN_RIGHT = wx.core.MOUSE_BTN_RIGHT
 wxMouseEvent = wx.core.MouseEvent
 wxMOUSE_BTN_ANY = wx.core.MOUSE_BTN_ANY
 wxMOUSE_BTN_NONE = wx.core.MOUSE_BTN_NONE
 wxMOUSE_BTN_LEFT = wx.core.MOUSE_BTN_LEFT
 wxMOUSE_BTN_MIDDLE = wx.core.MOUSE_BTN_MIDDLE
 wxMOUSE_BTN_RIGHT = wx.core.MOUSE_BTN_RIGHT
 wxMouseEvent = wx.core.MouseEvent

+wxMouseEventPtr = wx.core.MouseEventPtr

 wxSetCursorEvent = wx.core.SetCursorEvent
 wxSetCursorEvent = wx.core.SetCursorEvent

+wxSetCursorEventPtr = wx.core.SetCursorEventPtr

 wxKeyEvent = wx.core.KeyEvent
 wxKeyEvent = wx.core.KeyEvent

+wxKeyEventPtr = wx.core.KeyEventPtr

 wxSizeEvent = wx.core.SizeEvent
 wxSizeEvent = wx.core.SizeEvent

+wxSizeEventPtr = wx.core.SizeEventPtr

 wxMoveEvent = wx.core.MoveEvent
 wxMoveEvent = wx.core.MoveEvent

+wxMoveEventPtr = wx.core.MoveEventPtr

 wxPaintEvent = wx.core.PaintEvent
 wxPaintEvent = wx.core.PaintEvent

+wxPaintEventPtr = wx.core.PaintEventPtr

 wxNcPaintEvent = wx.core.NcPaintEvent
 wxNcPaintEvent = wx.core.NcPaintEvent

+wxNcPaintEventPtr = wx.core.NcPaintEventPtr

 wxEraseEvent = wx.core.EraseEvent
 wxEraseEvent = wx.core.EraseEvent

+wxEraseEventPtr = wx.core.EraseEventPtr

 wxFocusEvent = wx.core.FocusEvent
 wxFocusEvent = wx.core.FocusEvent

+wxFocusEventPtr = wx.core.FocusEventPtr

 wxChildFocusEvent = wx.core.ChildFocusEvent
 wxChildFocusEvent = wx.core.ChildFocusEvent

+wxChildFocusEventPtr = wx.core.ChildFocusEventPtr

 wxActivateEvent = wx.core.ActivateEvent
 wxActivateEvent = wx.core.ActivateEvent

+wxActivateEventPtr = wx.core.ActivateEventPtr

 wxInitDialogEvent = wx.core.InitDialogEvent
 wxInitDialogEvent = wx.core.InitDialogEvent

+wxInitDialogEventPtr = wx.core.InitDialogEventPtr

 wxMenuEvent = wx.core.MenuEvent
 wxMenuEvent = wx.core.MenuEvent

+wxMenuEventPtr = wx.core.MenuEventPtr

 wxCloseEvent = wx.core.CloseEvent
 wxCloseEvent = wx.core.CloseEvent

+wxCloseEventPtr = wx.core.CloseEventPtr

 wxShowEvent = wx.core.ShowEvent
 wxShowEvent = wx.core.ShowEvent

+wxShowEventPtr = wx.core.ShowEventPtr

 wxIconizeEvent = wx.core.IconizeEvent
 wxIconizeEvent = wx.core.IconizeEvent

+wxIconizeEventPtr = wx.core.IconizeEventPtr

 wxMaximizeEvent = wx.core.MaximizeEvent
 wxMaximizeEvent = wx.core.MaximizeEvent

+wxMaximizeEventPtr = wx.core.MaximizeEventPtr

 wxDropFilesEvent = wx.core.DropFilesEvent
 wxDropFilesEvent = wx.core.DropFilesEvent

+wxDropFilesEventPtr = wx.core.DropFilesEventPtr

 wxUPDATE_UI_PROCESS_ALL = wx.core.UPDATE_UI_PROCESS_ALL
 wxUPDATE_UI_PROCESS_SPECIFIED = wx.core.UPDATE_UI_PROCESS_SPECIFIED
 wxUPDATE_UI_PROCESS_ALL = wx.core.UPDATE_UI_PROCESS_ALL
 wxUPDATE_UI_PROCESS_SPECIFIED = wx.core.UPDATE_UI_PROCESS_SPECIFIED

+wxUpdateUIEvent = wx.core.UpdateUIEvent
+wxUpdateUIEventPtr = wx.core.UpdateUIEventPtr

 wxUpdateUIEvent_SetUpdateInterval = wx.core.UpdateUIEvent_SetUpdateInterval
 wxUpdateUIEvent_GetUpdateInterval = wx.core.UpdateUIEvent_GetUpdateInterval
 wxUpdateUIEvent_CanUpdate = wx.core.UpdateUIEvent_CanUpdate
 wxUpdateUIEvent_ResetUpdateTime = wx.core.UpdateUIEvent_ResetUpdateTime
 wxUpdateUIEvent_SetMode = wx.core.UpdateUIEvent_SetMode
 wxUpdateUIEvent_GetMode = wx.core.UpdateUIEvent_GetMode
 wxUpdateUIEvent_SetUpdateInterval = wx.core.UpdateUIEvent_SetUpdateInterval
 wxUpdateUIEvent_GetUpdateInterval = wx.core.UpdateUIEvent_GetUpdateInterval
 wxUpdateUIEvent_CanUpdate = wx.core.UpdateUIEvent_CanUpdate
 wxUpdateUIEvent_ResetUpdateTime = wx.core.UpdateUIEvent_ResetUpdateTime
 wxUpdateUIEvent_SetMode = wx.core.UpdateUIEvent_SetMode
 wxUpdateUIEvent_GetMode = wx.core.UpdateUIEvent_GetMode

-wxUpdateUIEvent = wx.core.UpdateUIEvent

 wxSysColourChangedEvent = wx.core.SysColourChangedEvent
 wxSysColourChangedEvent = wx.core.SysColourChangedEvent

+wxSysColourChangedEventPtr = wx.core.SysColourChangedEventPtr

 wxMouseCaptureChangedEvent = wx.core.MouseCaptureChangedEvent
 wxMouseCaptureChangedEvent = wx.core.MouseCaptureChangedEvent

+wxMouseCaptureChangedEventPtr = wx.core.MouseCaptureChangedEventPtr

 wxDisplayChangedEvent = wx.core.DisplayChangedEvent
 wxDisplayChangedEvent = wx.core.DisplayChangedEvent

+wxDisplayChangedEventPtr = wx.core.DisplayChangedEventPtr

 wxPaletteChangedEvent = wx.core.PaletteChangedEvent
 wxPaletteChangedEvent = wx.core.PaletteChangedEvent

+wxPaletteChangedEventPtr = wx.core.PaletteChangedEventPtr

 wxQueryNewPaletteEvent = wx.core.QueryNewPaletteEvent
 wxQueryNewPaletteEvent = wx.core.QueryNewPaletteEvent

+wxQueryNewPaletteEventPtr = wx.core.QueryNewPaletteEventPtr

 wxNavigationKeyEvent = wx.core.NavigationKeyEvent
 wxNavigationKeyEvent = wx.core.NavigationKeyEvent

+wxNavigationKeyEventPtr = wx.core.NavigationKeyEventPtr

 wxWindowCreateEvent = wx.core.WindowCreateEvent
 wxWindowCreateEvent = wx.core.WindowCreateEvent

+wxWindowCreateEventPtr = wx.core.WindowCreateEventPtr

 wxWindowDestroyEvent = wx.core.WindowDestroyEvent
 wxWindowDestroyEvent = wx.core.WindowDestroyEvent

+wxWindowDestroyEventPtr = wx.core.WindowDestroyEventPtr

 wxContextMenuEvent = wx.core.ContextMenuEvent
 wxContextMenuEvent = wx.core.ContextMenuEvent

+wxContextMenuEventPtr = wx.core.ContextMenuEventPtr

 wxIDLE_PROCESS_ALL = wx.core.IDLE_PROCESS_ALL
 wxIDLE_PROCESS_SPECIFIED = wx.core.IDLE_PROCESS_SPECIFIED
 wxIDLE_PROCESS_ALL = wx.core.IDLE_PROCESS_ALL
 wxIDLE_PROCESS_SPECIFIED = wx.core.IDLE_PROCESS_SPECIFIED

+wxIdleEvent = wx.core.IdleEvent
+wxIdleEventPtr = wx.core.IdleEventPtr

 wxIdleEvent_SetMode = wx.core.IdleEvent_SetMode
 wxIdleEvent_GetMode = wx.core.IdleEvent_GetMode
 wxIdleEvent_CanSend = wx.core.IdleEvent_CanSend
 wxIdleEvent_SetMode = wx.core.IdleEvent_SetMode
 wxIdleEvent_GetMode = wx.core.IdleEvent_GetMode
 wxIdleEvent_CanSend = wx.core.IdleEvent_CanSend

-wxIdleEvent = wx.core.IdleEvent

 wxPyEvent = wx.core.PyEvent
 wxPyEvent = wx.core.PyEvent

+wxPyEventPtr = wx.core.PyEventPtr

 wxPyCommandEvent = wx.core.PyCommandEvent
 wxPyCommandEvent = wx.core.PyCommandEvent

+wxPyCommandEventPtr = wx.core.PyCommandEventPtr

 wxPYAPP_ASSERT_SUPPRESS = wx.core.PYAPP_ASSERT_SUPPRESS
 wxPYAPP_ASSERT_EXCEPTION = wx.core.PYAPP_ASSERT_EXCEPTION
 wxPYAPP_ASSERT_DIALOG = wx.core.PYAPP_ASSERT_DIALOG
 wxPYAPP_ASSERT_LOG = wx.core.PYAPP_ASSERT_LOG
 wxPRINT_WINDOWS = wx.core.PRINT_WINDOWS
 wxPRINT_POSTSCRIPT = wx.core.PRINT_POSTSCRIPT
 wxPYAPP_ASSERT_SUPPRESS = wx.core.PYAPP_ASSERT_SUPPRESS
 wxPYAPP_ASSERT_EXCEPTION = wx.core.PYAPP_ASSERT_EXCEPTION
 wxPYAPP_ASSERT_DIALOG = wx.core.PYAPP_ASSERT_DIALOG
 wxPYAPP_ASSERT_LOG = wx.core.PYAPP_ASSERT_LOG
 wxPRINT_WINDOWS = wx.core.PRINT_WINDOWS
 wxPRINT_POSTSCRIPT = wx.core.PRINT_POSTSCRIPT

+wxPyApp = wx.core.PyApp
+wxPyAppPtr = wx.core.PyAppPtr

 wxPyApp_GetMacSupportPCMenuShortcuts = wx.core.PyApp_GetMacSupportPCMenuShortcuts
 wxPyApp_GetMacAboutMenuItemId = wx.core.PyApp_GetMacAboutMenuItemId
 wxPyApp_GetMacPreferencesMenuItemId = wx.core.PyApp_GetMacPreferencesMenuItemId
 wxPyApp_GetMacSupportPCMenuShortcuts = wx.core.PyApp_GetMacSupportPCMenuShortcuts
 wxPyApp_GetMacAboutMenuItemId = wx.core.PyApp_GetMacAboutMenuItemId
 wxPyApp_GetMacPreferencesMenuItemId = wx.core.PyApp_GetMacPreferencesMenuItemId


@@ -890,7 +927,6 @@ wxPyApp_SetMacPreferencesMenuItemId = wx.core.PyApp_SetMacPreferencesMenuItemId
 wxPyApp_SetMacExitMenuItemId = wx.core.PyApp_SetMacExitMenuItemId
 wxPyApp_SetMacHelpMenuTitleName = wx.core.PyApp_SetMacHelpMenuTitleName
 wxPyApp_GetComCtl32Version = wx.core.PyApp_GetComCtl32Version
 wxPyApp_SetMacExitMenuItemId = wx.core.PyApp_SetMacExitMenuItemId
 wxPyApp_SetMacHelpMenuTitleName = wx.core.PyApp_SetMacHelpMenuTitleName
 wxPyApp_GetComCtl32Version = wx.core.PyApp_GetComCtl32Version

-wxPyApp = wx.core.PyApp

 wxExit = wx.core.Exit
 wxYield = wx.core.Yield
 wxYieldIfNeeded = wx.core.YieldIfNeeded
 wxExit = wx.core.Exit
 wxYield = wx.core.Yield
 wxYieldIfNeeded = wx.core.YieldIfNeeded


@@ -899,53 +935,89 @@ wxWakeUpIdle = wx.core.WakeUpIdle
 wxPostEvent = wx.core.PostEvent
 wxApp_CleanUp = wx.core.App_CleanUp
 wxGetApp = wx.core.GetApp
 wxPostEvent = wx.core.PostEvent
 wxApp_CleanUp = wx.core.App_CleanUp
 wxGetApp = wx.core.GetApp

+wxAcceleratorEntry = wx.core.AcceleratorEntry
+wxAcceleratorEntryPtr = wx.core.AcceleratorEntryPtr
+wxAcceleratorTable = wx.core.AcceleratorTable
+wxAcceleratorTablePtr = wx.core.AcceleratorTablePtr
+wxNullAcceleratorTable = wx.core.NullAcceleratorTable
+wxGetAccelFromString = wx.core.GetAccelFromString

 wxPanelNameStr = wx.core.PanelNameStr
 wxPanelNameStr = wx.core.PanelNameStr

+wxVisualAttributes = wx.core.VisualAttributes
+wxVisualAttributesPtr = wx.core.VisualAttributesPtr
+wxWINDOW_VARIANT_NORMAL = wx.core.WINDOW_VARIANT_NORMAL
+wxWINDOW_VARIANT_SMALL = wx.core.WINDOW_VARIANT_SMALL
+wxWINDOW_VARIANT_MINI = wx.core.WINDOW_VARIANT_MINI
+wxWINDOW_VARIANT_LARGE = wx.core.WINDOW_VARIANT_LARGE
+wxWINDOW_VARIANT_MAX = wx.core.WINDOW_VARIANT_MAX
+wxWindow = wx.core.Window
+wxWindowPtr = wx.core.WindowPtr

 wxPreWindow = wx.core.PreWindow
 wxWindow_NewControlId = wx.core.Window_NewControlId
 wxWindow_NextControlId = wx.core.Window_NextControlId
 wxWindow_PrevControlId = wx.core.Window_PrevControlId
 wxWindow_FindFocus = wx.core.Window_FindFocus
 wxWindow_GetCapture = wx.core.Window_GetCapture
 wxPreWindow = wx.core.PreWindow
 wxWindow_NewControlId = wx.core.Window_NewControlId
 wxWindow_NextControlId = wx.core.Window_NextControlId
 wxWindow_PrevControlId = wx.core.Window_PrevControlId
 wxWindow_FindFocus = wx.core.Window_FindFocus
 wxWindow_GetCapture = wx.core.Window_GetCapture

-wxWindow = wx.core.Window
+wxWindow_GetClassDefaultAttributes = wx.core.Window_GetClassDefaultAttributes

 wxFindWindowById = wx.core.FindWindowById
 wxFindWindowByName = wx.core.FindWindowByName
 wxFindWindowByLabel = wx.core.FindWindowByLabel
 wxWindow_FromHWND = wx.core.Window_FromHWND
 wxFindWindowById = wx.core.FindWindowById
 wxFindWindowByName = wx.core.FindWindowByName
 wxFindWindowByLabel = wx.core.FindWindowByLabel
 wxWindow_FromHWND = wx.core.Window_FromHWND

+wxValidator = wx.core.Validator
+wxValidatorPtr = wx.core.ValidatorPtr

 wxValidator_IsSilent = wx.core.Validator_IsSilent
 wxValidator_SetBellOnError = wx.core.Validator_SetBellOnError
 wxValidator_IsSilent = wx.core.Validator_IsSilent
 wxValidator_SetBellOnError = wx.core.Validator_SetBellOnError

-wxValidator = wx.core.Validator

 wxPyValidator = wx.core.PyValidator
 wxPyValidator = wx.core.PyValidator

+wxPyValidatorPtr = wx.core.PyValidatorPtr

 wxDefaultValidator = wx.core.DefaultValidator
 wxMenu = wx.core.Menu
 wxDefaultValidator = wx.core.DefaultValidator
 wxMenu = wx.core.Menu

+wxMenuPtr = wx.core.MenuPtr

 wxMenuBar = wx.core.MenuBar
 wxMenuBar = wx.core.MenuBar

+wxMenuBarPtr = wx.core.MenuBarPtr
+wxMenuItem = wx.core.MenuItem
+wxMenuItemPtr = wx.core.MenuItemPtr

 wxMenuItem_GetLabelFromText = wx.core.MenuItem_GetLabelFromText
 wxMenuItem_GetDefaultMarginWidth = wx.core.MenuItem_GetDefaultMarginWidth
 wxMenuItem_GetLabelFromText = wx.core.MenuItem_GetLabelFromText
 wxMenuItem_GetDefaultMarginWidth = wx.core.MenuItem_GetDefaultMarginWidth

-wxMenuItem = wx.core.MenuItem
-wxPreControl = wx.core.PreControl
+wxControlNameStr = wx.core.ControlNameStr

 wxControl = wx.core.Control
 wxControl = wx.core.Control

+wxControlPtr = wx.core.ControlPtr
+wxPreControl = wx.core.PreControl
+wxControl_GetClassDefaultAttributes = wx.core.Control_GetClassDefaultAttributes

 wxItemContainer = wx.core.ItemContainer
 wxItemContainer = wx.core.ItemContainer

+wxItemContainerPtr = wx.core.ItemContainerPtr

 wxControlWithItems = wx.core.ControlWithItems
 wxControlWithItems = wx.core.ControlWithItems

+wxControlWithItemsPtr = wx.core.ControlWithItemsPtr
+wxSizerItem = wx.core.SizerItem
+wxSizerItemPtr = wx.core.SizerItemPtr

 wxSizerItemSpacer = wx.core.SizerItemSpacer
 wxSizerItemWindow = wx.core.SizerItemWindow
 wxSizerItemSizer = wx.core.SizerItemSizer
 wxSizerItemSpacer = wx.core.SizerItemSpacer
 wxSizerItemWindow = wx.core.SizerItemWindow
 wxSizerItemSizer = wx.core.SizerItemSizer

-wxSizerItem = wx.core.SizerItem

 wxSizer = wx.core.Sizer
 wxSizer = wx.core.Sizer

+wxSizerPtr = wx.core.SizerPtr

 wxPySizer = wx.core.PySizer
 wxPySizer = wx.core.PySizer

+wxPySizerPtr = wx.core.PySizerPtr

 wxBoxSizer = wx.core.BoxSizer
 wxBoxSizer = wx.core.BoxSizer

+wxBoxSizerPtr = wx.core.BoxSizerPtr

 wxStaticBoxSizer = wx.core.StaticBoxSizer
 wxStaticBoxSizer = wx.core.StaticBoxSizer

+wxStaticBoxSizerPtr = wx.core.StaticBoxSizerPtr

 wxGridSizer = wx.core.GridSizer
 wxGridSizer = wx.core.GridSizer

+wxGridSizerPtr = wx.core.GridSizerPtr

 wxFLEX_GROWMODE_NONE = wx.core.FLEX_GROWMODE_NONE
 wxFLEX_GROWMODE_SPECIFIED = wx.core.FLEX_GROWMODE_SPECIFIED
 wxFLEX_GROWMODE_ALL = wx.core.FLEX_GROWMODE_ALL
 wxFlexGridSizer = wx.core.FlexGridSizer
 wxFLEX_GROWMODE_NONE = wx.core.FLEX_GROWMODE_NONE
 wxFLEX_GROWMODE_SPECIFIED = wx.core.FLEX_GROWMODE_SPECIFIED
 wxFLEX_GROWMODE_ALL = wx.core.FLEX_GROWMODE_ALL
 wxFlexGridSizer = wx.core.FlexGridSizer

+wxFlexGridSizerPtr = wx.core.FlexGridSizerPtr

 wxGBPosition = wx.core.GBPosition
 wxGBPosition = wx.core.GBPosition

+wxGBPositionPtr = wx.core.GBPositionPtr

 wxGBSpan = wx.core.GBSpan
 wxGBSpan = wx.core.GBSpan

+wxGBSpanPtr = wx.core.GBSpanPtr

 wxDefaultSpan = wx.core.DefaultSpan
 wxDefaultSpan = wx.core.DefaultSpan

+wxGBSizerItem = wx.core.GBSizerItem
+wxGBSizerItemPtr = wx.core.GBSizerItemPtr

 wxGBSizerItemWindow = wx.core.GBSizerItemWindow
 wxGBSizerItemSizer = wx.core.GBSizerItemSizer
 wxGBSizerItemSpacer = wx.core.GBSizerItemSpacer
 wxGBSizerItemWindow = wx.core.GBSizerItemWindow
 wxGBSizerItemSizer = wx.core.GBSizerItemSizer
 wxGBSizerItemSpacer = wx.core.GBSizerItemSpacer

-wxGBSizerItem = wx.core.GBSizerItem

 wxGridBagSizer = wx.core.GridBagSizer
 wxGridBagSizer = wx.core.GridBagSizer

+wxGridBagSizerPtr = wx.core.GridBagSizerPtr

 wxLeft = wx.core.Left
 wxTop = wx.core.Top
 wxRight = wx.core.Right
 wxLeft = wx.core.Left
 wxTop = wx.core.Top
 wxRight = wx.core.Right


@@ -966,7 +1038,9 @@ wxRightOf = wx.core.RightOf
 wxSameAs = wx.core.SameAs
 wxAbsolute = wx.core.Absolute
 wxIndividualLayoutConstraint = wx.core.IndividualLayoutConstraint
 wxSameAs = wx.core.SameAs
 wxAbsolute = wx.core.Absolute
 wxIndividualLayoutConstraint = wx.core.IndividualLayoutConstraint

+wxIndividualLayoutConstraintPtr = wx.core.IndividualLayoutConstraintPtr

 wxLayoutConstraints = wx.core.LayoutConstraints
 wxLayoutConstraints = wx.core.LayoutConstraints

+wxLayoutConstraintsPtr = wx.core.LayoutConstraintsPtr

 wxPyOnDemandOutputWindow = wx.core.PyOnDemandOutputWindow
 wxApp = wx.core.App
 wxPySimpleApp = wx.core.PySimpleApp
 wxPyOnDemandOutputWindow = wx.core.PyOnDemandOutputWindow
 wxApp = wx.core.App
 wxPySimpleApp = wx.core.PySimpleApp


@@ -991,6 +1065,7 @@ wxRELEASE_VERSION = wx.core.RELEASE_VERSION
 wxSUBREL_VERSION = wx.core.SUBREL_VERSION
 wxVERSION = wx.core.VERSION
 wxRELEASE_NUMBER = wx.core.RELEASE_NUMBER
 wxSUBREL_VERSION = wx.core.SUBREL_VERSION
 wxVERSION = wx.core.VERSION
 wxRELEASE_NUMBER = wx.core.RELEASE_NUMBER

+wxPyUnbornObjectError = wx.core.PyUnbornObjectError

 wxPyDeadObjectError = wx.core.PyDeadObjectError
 wxCallAfter = wx.core.CallAfter
 wxFutureCall = wx.core.FutureCall
 wxPyDeadObjectError = wx.core.PyDeadObjectError
 wxCallAfter = wx.core.CallAfter
 wxFutureCall = wx.core.FutureCall


@@ -1008,6 +1083,8 @@ for k, v in wx.core.__dict__.iteritems():
         d[k] = v
     elif k.startswith('WXK'):
         d[k] = v
         d[k] = v
     elif k.startswith('WXK'):
         d[k] = v

+    elif k.startswith('__version__'):
+        d[k] = v

 del d, k, v
 
 
 del d, k, v