Add wxST_DOTS_MIDDLE and wxST_DOTS_END constants

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

diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py
index d9111019895f5d4a5788868ddb2e9048ed49ec42..a988c19671c3f0d62288db1772907c3a9e638f74 100644 (file)
--- a/wxPython/wxPython/_core.py
+++ b/wxPython/wxPython/_core.py
@@ -32,6 +32,7 @@ wxSTATIC_BORDER = wx._core.STATIC_BORDER
 wxTRANSPARENT_WINDOW = wx._core.TRANSPARENT_WINDOW
 wxNO_BORDER = wx._core.NO_BORDER
 wxDEFAULT_CONTROL_BORDER = wx._core.DEFAULT_CONTROL_BORDER
 wxTRANSPARENT_WINDOW = wx._core.TRANSPARENT_WINDOW
 wxNO_BORDER = wx._core.NO_BORDER
 wxDEFAULT_CONTROL_BORDER = wx._core.DEFAULT_CONTROL_BORDER

+wxDEFAULT_STATUSBAR_STYLE = wx._core.DEFAULT_STATUSBAR_STYLE

 wxTAB_TRAVERSAL = wx._core.TAB_TRAVERSAL
 wxWANTS_CHARS = wx._core.WANTS_CHARS
 wxPOPUP_WINDOW = wx._core.POPUP_WINDOW
 wxTAB_TRAVERSAL = wx._core.TAB_TRAVERSAL
 wxWANTS_CHARS = wx._core.WANTS_CHARS
 wxPOPUP_WINDOW = wx._core.POPUP_WINDOW


@@ -71,6 +72,8 @@ wxSB_VERTICAL = wx._core.SB_VERTICAL
 wxRB_USE_CHECKBOX = wx._core.RB_USE_CHECKBOX
 wxST_SIZEGRIP = wx._core.ST_SIZEGRIP
 wxST_NO_AUTORESIZE = wx._core.ST_NO_AUTORESIZE
 wxRB_USE_CHECKBOX = wx._core.RB_USE_CHECKBOX
 wxST_SIZEGRIP = wx._core.ST_SIZEGRIP
 wxST_NO_AUTORESIZE = wx._core.ST_NO_AUTORESIZE

+wxST_DOTS_MIDDLE = wx._core.ST_DOTS_MIDDLE
+wxST_DOTS_END = wx._core.ST_DOTS_END

 wxFLOOD_SURFACE = wx._core.FLOOD_SURFACE
 wxFLOOD_BORDER = wx._core.FLOOD_BORDER
 wxODDEVEN_RULE = wx._core.ODDEVEN_RULE
 wxFLOOD_SURFACE = wx._core.FLOOD_SURFACE
 wxFLOOD_BORDER = wx._core.FLOOD_BORDER
 wxODDEVEN_RULE = wx._core.ODDEVEN_RULE


@@ -106,6 +109,7 @@ wxSIZE_AUTO_HEIGHT = wx._core.SIZE_AUTO_HEIGHT
 wxSIZE_AUTO = wx._core.SIZE_AUTO
 wxSIZE_USE_EXISTING = wx._core.SIZE_USE_EXISTING
 wxSIZE_ALLOW_MINUS_ONE = wx._core.SIZE_ALLOW_MINUS_ONE
 wxSIZE_AUTO = wx._core.SIZE_AUTO
 wxSIZE_USE_EXISTING = wx._core.SIZE_USE_EXISTING
 wxSIZE_ALLOW_MINUS_ONE = wx._core.SIZE_ALLOW_MINUS_ONE

+wxSIZE_FORCE = wx._core.SIZE_FORCE

 wxPORTRAIT = wx._core.PORTRAIT
 wxLANDSCAPE = wx._core.LANDSCAPE
 wxPRINT_QUALITY_HIGH = wx._core.PRINT_QUALITY_HIGH
 wxPORTRAIT = wx._core.PORTRAIT
 wxLANDSCAPE = wx._core.LANDSCAPE
 wxPRINT_QUALITY_HIGH = wx._core.PRINT_QUALITY_HIGH


@@ -114,6 +118,7 @@ wxPRINT_QUALITY_LOW = wx._core.PRINT_QUALITY_LOW
 wxPRINT_QUALITY_DRAFT = wx._core.PRINT_QUALITY_DRAFT
 wxID_ANY = wx._core.ID_ANY
 wxID_SEPARATOR = wx._core.ID_SEPARATOR
 wxPRINT_QUALITY_DRAFT = wx._core.PRINT_QUALITY_DRAFT
 wxID_ANY = wx._core.ID_ANY
 wxID_SEPARATOR = wx._core.ID_SEPARATOR

+wxID_NONE = wx._core.ID_NONE

 wxID_LOWEST = wx._core.ID_LOWEST
 wxID_OPEN = wx._core.ID_OPEN
 wxID_CLOSE = wx._core.ID_CLOSE
 wxID_LOWEST = wx._core.ID_LOWEST
 wxID_OPEN = wx._core.ID_OPEN
 wxID_CLOSE = wx._core.ID_CLOSE


@@ -317,6 +322,8 @@ wxDOT_DASH = wx._core.DOT_DASH
 wxUSER_DASH = wx._core.USER_DASH
 wxTRANSPARENT = wx._core.TRANSPARENT
 wxSTIPPLE = wx._core.STIPPLE
 wxUSER_DASH = wx._core.USER_DASH
 wxTRANSPARENT = wx._core.TRANSPARENT
 wxSTIPPLE = wx._core.STIPPLE

+wxSTIPPLE_MASK = wx._core.STIPPLE_MASK
+wxSTIPPLE_MASK_OPAQUE = wx._core.STIPPLE_MASK_OPAQUE

 wxBDIAGONAL_HATCH = wx._core.BDIAGONAL_HATCH
 wxCROSSDIAG_HATCH = wx._core.CROSSDIAG_HATCH
 wxFDIAGONAL_HATCH = wx._core.FDIAGONAL_HATCH
 wxBDIAGONAL_HATCH = wx._core.BDIAGONAL_HATCH
 wxCROSSDIAG_HATCH = wx._core.CROSSDIAG_HATCH
 wxFDIAGONAL_HATCH = wx._core.FDIAGONAL_HATCH


@@ -539,6 +546,56 @@ wxPAPER_B5_EXTRA = wx._core.PAPER_B5_EXTRA
 wxPAPER_A2 = wx._core.PAPER_A2
 wxPAPER_A3_TRANSVERSE = wx._core.PAPER_A3_TRANSVERSE
 wxPAPER_A3_EXTRA_TRANSVERSE = wx._core.PAPER_A3_EXTRA_TRANSVERSE
 wxPAPER_A2 = wx._core.PAPER_A2
 wxPAPER_A3_TRANSVERSE = wx._core.PAPER_A3_TRANSVERSE
 wxPAPER_A3_EXTRA_TRANSVERSE = wx._core.PAPER_A3_EXTRA_TRANSVERSE

+wxPAPER_DBL_JAPANESE_POSTCARD = wx._core.PAPER_DBL_JAPANESE_POSTCARD
+wxPAPER_A6 = wx._core.PAPER_A6
+wxPAPER_JENV_KAKU2 = wx._core.PAPER_JENV_KAKU2
+wxPAPER_JENV_KAKU3 = wx._core.PAPER_JENV_KAKU3
+wxPAPER_JENV_CHOU3 = wx._core.PAPER_JENV_CHOU3
+wxPAPER_JENV_CHOU4 = wx._core.PAPER_JENV_CHOU4
+wxPAPER_LETTER_ROTATED = wx._core.PAPER_LETTER_ROTATED
+wxPAPER_A3_ROTATED = wx._core.PAPER_A3_ROTATED
+wxPAPER_A4_ROTATED = wx._core.PAPER_A4_ROTATED
+wxPAPER_A5_ROTATED = wx._core.PAPER_A5_ROTATED
+wxPAPER_B4_JIS_ROTATED = wx._core.PAPER_B4_JIS_ROTATED
+wxPAPER_B5_JIS_ROTATED = wx._core.PAPER_B5_JIS_ROTATED
+wxPAPER_JAPANESE_POSTCARD_ROTATED = wx._core.PAPER_JAPANESE_POSTCARD_ROTATED
+wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED = wx._core.PAPER_DBL_JAPANESE_POSTCARD_ROTATED
+wxPAPER_A6_ROTATED = wx._core.PAPER_A6_ROTATED
+wxPAPER_JENV_KAKU2_ROTATED = wx._core.PAPER_JENV_KAKU2_ROTATED
+wxPAPER_JENV_KAKU3_ROTATED = wx._core.PAPER_JENV_KAKU3_ROTATED
+wxPAPER_JENV_CHOU3_ROTATED = wx._core.PAPER_JENV_CHOU3_ROTATED
+wxPAPER_JENV_CHOU4_ROTATED = wx._core.PAPER_JENV_CHOU4_ROTATED
+wxPAPER_B6_JIS = wx._core.PAPER_B6_JIS
+wxPAPER_B6_JIS_ROTATED = wx._core.PAPER_B6_JIS_ROTATED
+wxPAPER_12X11 = wx._core.PAPER_12X11
+wxPAPER_JENV_YOU4 = wx._core.PAPER_JENV_YOU4
+wxPAPER_JENV_YOU4_ROTATED = wx._core.PAPER_JENV_YOU4_ROTATED
+wxPAPER_P16K = wx._core.PAPER_P16K
+wxPAPER_P32K = wx._core.PAPER_P32K
+wxPAPER_P32KBIG = wx._core.PAPER_P32KBIG
+wxPAPER_PENV_1 = wx._core.PAPER_PENV_1
+wxPAPER_PENV_2 = wx._core.PAPER_PENV_2
+wxPAPER_PENV_3 = wx._core.PAPER_PENV_3
+wxPAPER_PENV_4 = wx._core.PAPER_PENV_4
+wxPAPER_PENV_5 = wx._core.PAPER_PENV_5
+wxPAPER_PENV_6 = wx._core.PAPER_PENV_6
+wxPAPER_PENV_7 = wx._core.PAPER_PENV_7
+wxPAPER_PENV_8 = wx._core.PAPER_PENV_8
+wxPAPER_PENV_9 = wx._core.PAPER_PENV_9
+wxPAPER_PENV_10 = wx._core.PAPER_PENV_10
+wxPAPER_P16K_ROTATED = wx._core.PAPER_P16K_ROTATED
+wxPAPER_P32K_ROTATED = wx._core.PAPER_P32K_ROTATED
+wxPAPER_P32KBIG_ROTATED = wx._core.PAPER_P32KBIG_ROTATED
+wxPAPER_PENV_1_ROTATED = wx._core.PAPER_PENV_1_ROTATED
+wxPAPER_PENV_2_ROTATED = wx._core.PAPER_PENV_2_ROTATED
+wxPAPER_PENV_3_ROTATED = wx._core.PAPER_PENV_3_ROTATED
+wxPAPER_PENV_4_ROTATED = wx._core.PAPER_PENV_4_ROTATED
+wxPAPER_PENV_5_ROTATED = wx._core.PAPER_PENV_5_ROTATED
+wxPAPER_PENV_6_ROTATED = wx._core.PAPER_PENV_6_ROTATED
+wxPAPER_PENV_7_ROTATED = wx._core.PAPER_PENV_7_ROTATED
+wxPAPER_PENV_8_ROTATED = wx._core.PAPER_PENV_8_ROTATED
+wxPAPER_PENV_9_ROTATED = wx._core.PAPER_PENV_9_ROTATED
+wxPAPER_PENV_10_ROTATED = wx._core.PAPER_PENV_10_ROTATED

 wxDUPLEX_SIMPLEX = wx._core.DUPLEX_SIMPLEX
 wxDUPLEX_HORIZONTAL = wx._core.DUPLEX_HORIZONTAL
 wxDUPLEX_VERTICAL = wx._core.DUPLEX_VERTICAL
 wxDUPLEX_SIMPLEX = wx._core.DUPLEX_SIMPLEX
 wxDUPLEX_HORIZONTAL = wx._core.DUPLEX_HORIZONTAL
 wxDUPLEX_VERTICAL = wx._core.DUPLEX_VERTICAL


@@ -566,14 +623,17 @@ wxHT_MAX = wx._core.HT_MAX
 wxMOD_NONE = wx._core.MOD_NONE
 wxMOD_ALT = wx._core.MOD_ALT
 wxMOD_CONTROL = wx._core.MOD_CONTROL
 wxMOD_NONE = wx._core.MOD_NONE
 wxMOD_ALT = wx._core.MOD_ALT
 wxMOD_CONTROL = wx._core.MOD_CONTROL

+wxMOD_ALTGR = wx._core.MOD_ALTGR

 wxMOD_SHIFT = wx._core.MOD_SHIFT
 wxMOD_SHIFT = wx._core.MOD_SHIFT

+wxMOD_META = wx._core.MOD_META

 wxMOD_WIN = wx._core.MOD_WIN
 wxMOD_WIN = wx._core.MOD_WIN

+wxMOD_CMD = wx._core.MOD_CMD
+wxMOD_ALL = wx._core.MOD_ALL

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

-wxObjectPtr = wx._core.ObjectPtr

 wxBITMAP_TYPE_INVALID = wx._core.BITMAP_TYPE_INVALID
 wxBITMAP_TYPE_BMP = wx._core.BITMAP_TYPE_BMP
 wxBITMAP_TYPE_ICO = wx._core.BITMAP_TYPE_ICO
 wxBITMAP_TYPE_INVALID = wx._core.BITMAP_TYPE_INVALID
 wxBITMAP_TYPE_BMP = wx._core.BITMAP_TYPE_BMP
 wxBITMAP_TYPE_ICO = wx._core.BITMAP_TYPE_ICO


@@ -626,19 +686,14 @@ 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
 wxRect = wx._core.Rect

-wxRectPtr = wx._core.RectPtr

 wxRectPP = wx._core.RectPP
 wxRectPS = wx._core.RectPS
 wxRectS = wx._core.RectS
 wxIntersectRect = wx._core.IntersectRect
 wxPoint2D = wx._core.Point2D
 wxRectPP = wx._core.RectPP
 wxRectPS = wx._core.RectPS
 wxRectS = wx._core.RectS
 wxIntersectRect = wx._core.IntersectRect
 wxPoint2D = wx._core.Point2D

-wxPoint2DPtr = wx._core.Point2DPtr

 wxPoint2DCopy = wx._core.Point2DCopy
 wxPoint2DFromPoint = wx._core.Point2DFromPoint
 wxDefaultPosition = wx._core.DefaultPosition
 wxPoint2DCopy = wx._core.Point2DCopy
 wxPoint2DFromPoint = wx._core.Point2DFromPoint
 wxDefaultPosition = wx._core.DefaultPosition


@@ -647,43 +702,34 @@ wxFromStart = wx._core.FromStart
 wxFromCurrent = wx._core.FromCurrent
 wxFromEnd = wx._core.FromEnd
 wxInputStream = wx._core.InputStream
 wxFromCurrent = wx._core.FromCurrent
 wxFromEnd = wx._core.FromEnd
 wxInputStream = wx._core.InputStream

-wxInputStreamPtr = wx._core.InputStreamPtr

 wxInputStream = wx._core.InputStream
 wxOutputStream = wx._core.OutputStream
 wxInputStream = wx._core.InputStream
 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

 wxFileSystemHandler = wx._core.FileSystemHandler
 wxFileSystem = wx._core.FileSystem
 wxFileSystemHandler = wx._core.FileSystemHandler
 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_URLToFileName = wx._core.FileSystem_URLToFileName
 wxInternetFSHandler = wx._core.InternetFSHandler
 wxFileSystem_AddHandler = wx._core.FileSystem_AddHandler
 wxFileSystem_CleanUpHandlers = wx._core.FileSystem_CleanUpHandlers
 wxFileSystem_FileNameToURL = wx._core.FileSystem_FileNameToURL
 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 = wx._core.MemoryFSHandler
 __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 = wx._core.MemoryFSHandler

-wxMemoryFSHandlerPtr = wx._core.MemoryFSHandlerPtr

 wxMemoryFSHandler_RemoveFile = wx._core.MemoryFSHandler_RemoveFile
 wxIMAGE_ALPHA_TRANSPARENT = wx._core.IMAGE_ALPHA_TRANSPARENT
 wxIMAGE_ALPHA_THRESHOLD = wx._core.IMAGE_ALPHA_THRESHOLD
 wxIMAGE_ALPHA_OPAQUE = wx._core.IMAGE_ALPHA_OPAQUE
 wxImageHandler = wx._core.ImageHandler
 wxMemoryFSHandler_RemoveFile = wx._core.MemoryFSHandler_RemoveFile
 wxIMAGE_ALPHA_TRANSPARENT = wx._core.IMAGE_ALPHA_TRANSPARENT
 wxIMAGE_ALPHA_THRESHOLD = wx._core.IMAGE_ALPHA_THRESHOLD
 wxIMAGE_ALPHA_OPAQUE = wx._core.IMAGE_ALPHA_OPAQUE
 wxImageHandler = wx._core.ImageHandler

-wxImageHandlerPtr = wx._core.ImageHandlerPtr
+wxPyImageHandler = wx._core.PyImageHandler

 wxImageHistogram = wx._core.ImageHistogram
 wxImageHistogram = wx._core.ImageHistogram

-wxImageHistogramPtr = wx._core.ImageHistogramPtr

 wxImageHistogram_MakeKey = wx._core.ImageHistogram_MakeKey
 wxImageHistogram_MakeKey = wx._core.ImageHistogram_MakeKey

+wxImage_RGBValue = wx._core.Image_RGBValue
+wxImage_HSVValue = wx._core.Image_HSVValue

 wxImage = wx._core.Image
 wxImage = wx._core.Image

-wxImagePtr = wx._core.ImagePtr

 wxImageFromMime = wx._core.ImageFromMime
 wxImageFromStream = wx._core.ImageFromStream
 wxImageFromStreamMime = wx._core.ImageFromStreamMime
 wxImageFromMime = wx._core.ImageFromMime
 wxImageFromStream = wx._core.ImageFromStream
 wxImageFromStreamMime = wx._core.ImageFromStreamMime


@@ -697,7 +743,10 @@ wxImage_CanReadStream = wx._core.Image_CanReadStream
 wxImage_AddHandler = wx._core.Image_AddHandler
 wxImage_InsertHandler = wx._core.Image_InsertHandler
 wxImage_RemoveHandler = wx._core.Image_RemoveHandler
 wxImage_AddHandler = wx._core.Image_AddHandler
 wxImage_InsertHandler = wx._core.Image_InsertHandler
 wxImage_RemoveHandler = wx._core.Image_RemoveHandler

+wxImage_GetHandlers = wx._core.Image_GetHandlers

 wxImage_GetImageExtWildcard = wx._core.Image_GetImageExtWildcard
 wxImage_GetImageExtWildcard = wx._core.Image_GetImageExtWildcard

+wxImage_RGBtoHSV = wx._core.Image_RGBtoHSV
+wxImage_HSVtoRGB = wx._core.Image_HSVtoRGB

 wxNullImage = wx._core.NullImage
 wxIMAGE_OPTION_FILENAME = wx._core.IMAGE_OPTION_FILENAME
 wxIMAGE_OPTION_BMP_FORMAT = wx._core.IMAGE_OPTION_BMP_FORMAT
 wxNullImage = wx._core.NullImage
 wxIMAGE_OPTION_FILENAME = wx._core.IMAGE_OPTION_FILENAME
 wxIMAGE_OPTION_BMP_FORMAT = wx._core.IMAGE_OPTION_BMP_FORMAT


@@ -729,34 +778,21 @@ 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

 wxQUANTIZE_INCLUDE_WINDOWS_COLOURS = wx._core.QUANTIZE_INCLUDE_WINDOWS_COLOURS
 wxQUANTIZE_FILL_DESTINATION_IMAGE = wx._core.QUANTIZE_FILL_DESTINATION_IMAGE
 wxQuantize = wx._core.Quantize
 wxQUANTIZE_INCLUDE_WINDOWS_COLOURS = wx._core.QUANTIZE_INCLUDE_WINDOWS_COLOURS
 wxQUANTIZE_FILL_DESTINATION_IMAGE = wx._core.QUANTIZE_FILL_DESTINATION_IMAGE
 wxQuantize = wx._core.Quantize

-wxQuantizePtr = wx._core.QuantizePtr

 wxQuantize_Quantize = wx._core.Quantize_Quantize
 wxEvtHandler = wx._core.EvtHandler
 wxQuantize_Quantize = wx._core.Quantize_Quantize
 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


@@ -822,7 +858,7 @@ wxEVT_SCROLL_PAGEUP = wx._core.wxEVT_SCROLL_PAGEUP
 wxEVT_SCROLL_PAGEDOWN = wx._core.wxEVT_SCROLL_PAGEDOWN
 wxEVT_SCROLL_THUMBTRACK = wx._core.wxEVT_SCROLL_THUMBTRACK
 wxEVT_SCROLL_THUMBRELEASE = wx._core.wxEVT_SCROLL_THUMBRELEASE
 wxEVT_SCROLL_PAGEDOWN = wx._core.wxEVT_SCROLL_PAGEDOWN
 wxEVT_SCROLL_THUMBTRACK = wx._core.wxEVT_SCROLL_THUMBTRACK
 wxEVT_SCROLL_THUMBRELEASE = wx._core.wxEVT_SCROLL_THUMBRELEASE

-wxEVT_SCROLL_ENDSCROLL = wx._core.wxEVT_SCROLL_ENDSCROLL
+wxEVT_SCROLL_CHANGED = wx._core.wxEVT_SCROLL_CHANGED

 wxEVT_SCROLLWIN_TOP = wx._core.wxEVT_SCROLLWIN_TOP
 wxEVT_SCROLLWIN_BOTTOM = wx._core.wxEVT_SCROLLWIN_BOTTOM
 wxEVT_SCROLLWIN_LINEUP = wx._core.wxEVT_SCROLLWIN_LINEUP
 wxEVT_SCROLLWIN_TOP = wx._core.wxEVT_SCROLLWIN_TOP
 wxEVT_SCROLLWIN_BOTTOM = wx._core.wxEVT_SCROLLWIN_BOTTOM
 wxEVT_SCROLLWIN_LINEUP = wx._core.wxEVT_SCROLLWIN_LINEUP


@@ -876,64 +912,38 @@ 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
 wxUpdateUIEvent = wx._core.UpdateUIEvent
 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_SetUpdateInterval = wx._core.UpdateUIEvent_SetUpdateInterval
 wxUpdateUIEvent_GetUpdateInterval = wx._core.UpdateUIEvent_GetUpdateInterval
 wxUpdateUIEvent_CanUpdate = wx._core.UpdateUIEvent_CanUpdate


@@ -941,36 +951,23 @@ wxUpdateUIEvent_ResetUpdateTime = wx._core.UpdateUIEvent_ResetUpdateTime
 wxUpdateUIEvent_SetMode = wx._core.UpdateUIEvent_SetMode
 wxUpdateUIEvent_GetMode = wx._core.UpdateUIEvent_GetMode
 wxSysColourChangedEvent = wx._core.SysColourChangedEvent
 wxUpdateUIEvent_SetMode = wx._core.UpdateUIEvent_SetMode
 wxUpdateUIEvent_GetMode = wx._core.UpdateUIEvent_GetMode
 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
 wxIdleEvent = wx._core.IdleEvent
 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
 wxPyEvent = wx._core.PyEvent
 wxIdleEvent_SetMode = wx._core.IdleEvent_SetMode
 wxIdleEvent_GetMode = wx._core.IdleEvent_GetMode
 wxIdleEvent_CanSend = wx._core.IdleEvent_CanSend
 wxPyEvent = wx._core.PyEvent

-wxPyEventPtr = wx._core.PyEventPtr

 wxPyCommandEvent = wx._core.PyCommandEvent
 wxPyCommandEvent = wx._core.PyCommandEvent

-wxPyCommandEventPtr = wx._core.PyCommandEventPtr

 wxDateEvent = wx._core.DateEvent
 wxDateEvent = wx._core.DateEvent

-wxDateEventPtr = wx._core.DateEventPtr

 wxEVT_DATE_CHANGED = wx._core.wxEVT_DATE_CHANGED
 wxPYAPP_ASSERT_SUPPRESS = wx._core.PYAPP_ASSERT_SUPPRESS
 wxPYAPP_ASSERT_EXCEPTION = wx._core.PYAPP_ASSERT_EXCEPTION
 wxEVT_DATE_CHANGED = wx._core.wxEVT_DATE_CHANGED
 wxPYAPP_ASSERT_SUPPRESS = wx._core.PYAPP_ASSERT_SUPPRESS
 wxPYAPP_ASSERT_EXCEPTION = wx._core.PYAPP_ASSERT_EXCEPTION


@@ -979,7 +976,6 @@ wxPYAPP_ASSERT_LOG = wx._core.PYAPP_ASSERT_LOG
 wxPRINT_WINDOWS = wx._core.PRINT_WINDOWS
 wxPRINT_POSTSCRIPT = wx._core.PRINT_POSTSCRIPT
 wxPyApp = wx._core.PyApp
 wxPRINT_WINDOWS = wx._core.PRINT_WINDOWS
 wxPRINT_POSTSCRIPT = wx._core.PRINT_POSTSCRIPT
 wxPyApp = wx._core.PyApp

-wxPyAppPtr = wx._core.PyAppPtr

 wxPyApp_IsMainLoopRunning = wx._core.PyApp_IsMainLoopRunning
 wxPyApp_GetMacSupportPCMenuShortcuts = wx._core.PyApp_GetMacSupportPCMenuShortcuts
 wxPyApp_GetMacAboutMenuItemId = wx._core.PyApp_GetMacAboutMenuItemId
 wxPyApp_IsMainLoopRunning = wx._core.PyApp_IsMainLoopRunning
 wxPyApp_GetMacSupportPCMenuShortcuts = wx._core.PyApp_GetMacSupportPCMenuShortcuts
 wxPyApp_GetMacAboutMenuItemId = wx._core.PyApp_GetMacAboutMenuItemId


@@ -1003,25 +999,21 @@ wxGetApp = wx._core.GetApp
 wxSetDefaultPyEncoding = wx._core.SetDefaultPyEncoding
 wxGetDefaultPyEncoding = wx._core.GetDefaultPyEncoding
 wxEventLoop = wx._core.EventLoop
 wxSetDefaultPyEncoding = wx._core.SetDefaultPyEncoding
 wxGetDefaultPyEncoding = wx._core.GetDefaultPyEncoding
 wxEventLoop = wx._core.EventLoop

-wxEventLoopPtr = wx._core.EventLoopPtr

 wxEventLoop_GetActive = wx._core.EventLoop_GetActive
 wxEventLoop_SetActive = wx._core.EventLoop_SetActive
 wxEventLoop_GetActive = wx._core.EventLoop_GetActive
 wxEventLoop_SetActive = wx._core.EventLoop_SetActive

+wxEventLoopActivator = wx._core.EventLoopActivator

 wxAcceleratorEntry = wx._core.AcceleratorEntry
 wxAcceleratorEntry = wx._core.AcceleratorEntry

-wxAcceleratorEntryPtr = wx._core.AcceleratorEntryPtr

 wxAcceleratorTable = wx._core.AcceleratorTable
 wxAcceleratorTable = wx._core.AcceleratorTable

-wxAcceleratorTablePtr = wx._core.AcceleratorTablePtr

 wxNullAcceleratorTable = wx._core.NullAcceleratorTable
 wxGetAccelFromString = wx._core.GetAccelFromString
 wxPanelNameStr = wx._core.PanelNameStr
 wxVisualAttributes = wx._core.VisualAttributes
 wxNullAcceleratorTable = wx._core.NullAcceleratorTable
 wxGetAccelFromString = wx._core.GetAccelFromString
 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
 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
 wxPreWindow = wx._core.PreWindow
 wxWindow_NewControlId = wx._core.Window_NewControlId
 wxWindow_NextControlId = wx._core.Window_NextControlId


@@ -1033,64 +1025,47 @@ wxFindWindowById = wx._core.FindWindowById
 wxFindWindowByName = wx._core.FindWindowByName
 wxFindWindowByLabel = wx._core.FindWindowByLabel
 wxWindow_FromHWND = wx._core.Window_FromHWND
 wxFindWindowByName = wx._core.FindWindowByName
 wxFindWindowByLabel = wx._core.FindWindowByLabel
 wxWindow_FromHWND = wx._core.Window_FromHWND

+GetTopLevelWindows = wx._core.GetTopLevelWindows

 wxValidator = wx._core.Validator
 wxValidator = wx._core.Validator

-wxValidatorPtr = wx._core.ValidatorPtr

 wxValidator_IsSilent = wx._core.Validator_IsSilent
 wxValidator_SetBellOnError = wx._core.Validator_SetBellOnError
 wxPyValidator = wx._core.PyValidator
 wxValidator_IsSilent = wx._core.Validator_IsSilent
 wxValidator_SetBellOnError = wx._core.Validator_SetBellOnError
 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
+wxMenuBar_SetAutoWindowMenu = wx._core.MenuBar_SetAutoWindowMenu
+wxMenuBar_GetAutoWindowMenu = wx._core.MenuBar_GetAutoWindowMenu

 wxMenuItem = wx._core.MenuItem
 wxMenuItem = wx._core.MenuItem

-wxMenuItemPtr = wx._core.MenuItemPtr

 wxMenuItem_GetLabelFromText = wx._core.MenuItem_GetLabelFromText
 wxMenuItem_GetDefaultMarginWidth = wx._core.MenuItem_GetDefaultMarginWidth
 wxControlNameStr = wx._core.ControlNameStr
 wxControl = wx._core.Control
 wxMenuItem_GetLabelFromText = wx._core.MenuItem_GetLabelFromText
 wxMenuItem_GetDefaultMarginWidth = wx._core.MenuItem_GetDefaultMarginWidth
 wxControlNameStr = wx._core.ControlNameStr
 wxControl = wx._core.Control

-wxControlPtr = wx._core.ControlPtr

 wxPreControl = wx._core.PreControl
 wxControl_GetClassDefaultAttributes = wx._core.Control_GetClassDefaultAttributes
 wxItemContainer = wx._core.ItemContainer
 wxPreControl = wx._core.PreControl
 wxControl_GetClassDefaultAttributes = wx._core.Control_GetClassDefaultAttributes
 wxItemContainer = wx._core.ItemContainer

-wxItemContainerPtr = wx._core.ItemContainerPtr

 wxControlWithItems = wx._core.ControlWithItems
 wxControlWithItems = wx._core.ControlWithItems

-wxControlWithItemsPtr = wx._core.ControlWithItemsPtr

 wxSizerItem = wx._core.SizerItem
 wxSizerItem = wx._core.SizerItem

-wxSizerItemPtr = wx._core.SizerItemPtr

 wxSizerItemWindow = wx._core.SizerItemWindow
 wxSizerItemSpacer = wx._core.SizerItemSpacer
 wxSizerItemSizer = wx._core.SizerItemSizer
 wxSizer = wx._core.Sizer
 wxSizerItemWindow = wx._core.SizerItemWindow
 wxSizerItemSpacer = wx._core.SizerItemSpacer
 wxSizerItemSizer = wx._core.SizerItemSizer
 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

 wxStdDialogButtonSizer = wx._core.StdDialogButtonSizer
 wxStdDialogButtonSizer = wx._core.StdDialogButtonSizer

-wxStdDialogButtonSizerPtr = wx._core.StdDialogButtonSizerPtr

 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
 wxGBSizerItem = wx._core.GBSizerItem
 wxDefaultSpan = wx._core.DefaultSpan
 wxGBSizerItem = wx._core.GBSizerItem

-wxGBSizerItemPtr = wx._core.GBSizerItemPtr

 wxGBSizerItemWindow = wx._core.GBSizerItemWindow
 wxGBSizerItemSizer = wx._core.GBSizerItemSizer
 wxGBSizerItemSpacer = wx._core.GBSizerItemSpacer
 wxGridBagSizer = wx._core.GridBagSizer
 wxGBSizerItemWindow = wx._core.GBSizerItemWindow
 wxGBSizerItemSizer = wx._core.GBSizerItemSizer
 wxGBSizerItemSpacer = wx._core.GBSizerItemSpacer
 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


@@ -1111,9 +1086,7 @@ 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
 wxGetApp = wx._core.GetApp
 wxPyOnDemandOutputWindow = wx._core.PyOnDemandOutputWindow
 wxApp = wx._core.App
 wxGetApp = wx._core.GetApp


@@ -1151,6 +1124,7 @@ wxDLG_SZE = wx._core.DLG_SZE
 wxPyAssertionError = wx._core.PyAssertionError
 wxMemoryFSHandler_AddFile = wx._core.MemoryFSHandler_AddFile
 wxInitAllImageHandlers = wx._core.InitAllImageHandlers
 wxPyAssertionError = wx._core.PyAssertionError
 wxMemoryFSHandler_AddFile = wx._core.MemoryFSHandler_AddFile
 wxInitAllImageHandlers = wx._core.InitAllImageHandlers

+wxEVT_SCROLL_ENDSCROLL = wx._core.wxEVT_SCROLL_ENDSCROLL

 
 
 d = globals()
 
 
 d = globals()