reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/src/__controls_rename.i

@@ -109,6 +109,14 @@
 %rename(LB_ALIGN_MASK)                      wxLB_ALIGN_MASK;
 %rename(Listbook)                           wxListbook;
 %rename(ListbookEvent)                      wxListbookEvent;
+%rename(CHB_DEFAULT)                        wxCHB_DEFAULT;
+%rename(CHB_TOP)                            wxCHB_TOP;
+%rename(CHB_BOTTOM)                         wxCHB_BOTTOM;
+%rename(CHB_LEFT)                           wxCHB_LEFT;
+%rename(CHB_RIGHT)                          wxCHB_RIGHT;
+%rename(CHB_ALIGN_MASK)                     wxCHB_ALIGN_MASK;
+%rename(Choicebook)                         wxChoicebook;
+%rename(ChoicebookEvent)                    wxChoicebookEvent;
 %rename(BookCtrlSizer)                      wxBookCtrlSizer;
 %rename(NotebookSizer)                      wxNotebookSizer;
 %rename(TOOL_STYLE_BUTTON)                  wxTOOL_STYLE_BUTTON;

wxPython/src/__core_rename.i

@@ -504,7 +504,6 @@
 %rename(OutputStream)                       wxOutputStream;
 %rename(FSFile)                             wxFSFile;
 %rename(FileSystem)                         wxFileSystem;
-%rename(FileSystem_URLToFileName)           wxFileSystem_URLToFileName;
 %rename(InternetFSHandler)                  wxInternetFSHandler;
 %rename(ZipFSHandler)                       wxZipFSHandler;
 %rename(MemoryFSHandler)                    wxMemoryFSHandler;
@@ -602,6 +601,7 @@
 %rename(WakeUpIdle)                         wxWakeUpIdle;
 %rename(PostEvent)                          wxPostEvent;
 %rename(App_CleanUp)                        wxApp_CleanUp;
+%rename(EventLoop)                          wxEventLoop;
 %rename(AcceleratorEntry)                   wxAcceleratorEntry;
 %rename(AcceleratorTable)                   wxAcceleratorTable;
 %rename(NullAcceleratorTable)               wxNullAcceleratorTable;

wxPython/src/__windows_rename.i

@@ -141,6 +141,21 @@
 %rename(PRINT_MODE_FILE)                    wxPRINT_MODE_FILE;
 %rename(PRINT_MODE_PRINTER)                 wxPRINT_MODE_PRINTER;
 %rename(PRINT_MODE_STREAM)                  wxPRINT_MODE_STREAM;
+%rename(PRINTBIN_DEFAULT)                   wxPRINTBIN_DEFAULT;
+%rename(PRINTBIN_ONLYONE)                   wxPRINTBIN_ONLYONE;
+%rename(PRINTBIN_LOWER)                     wxPRINTBIN_LOWER;
+%rename(PRINTBIN_MIDDLE)                    wxPRINTBIN_MIDDLE;
+%rename(PRINTBIN_MANUAL)                    wxPRINTBIN_MANUAL;
+%rename(PRINTBIN_ENVELOPE)                  wxPRINTBIN_ENVELOPE;
+%rename(PRINTBIN_ENVMANUAL)                 wxPRINTBIN_ENVMANUAL;
+%rename(PRINTBIN_AUTO)                      wxPRINTBIN_AUTO;
+%rename(PRINTBIN_TRACTOR)                   wxPRINTBIN_TRACTOR;
+%rename(PRINTBIN_SMALLFMT)                  wxPRINTBIN_SMALLFMT;
+%rename(PRINTBIN_LARGEFMT)                  wxPRINTBIN_LARGEFMT;
+%rename(PRINTBIN_LARGECAPACITY)             wxPRINTBIN_LARGECAPACITY;
+%rename(PRINTBIN_CASSETTE)                  wxPRINTBIN_CASSETTE;
+%rename(PRINTBIN_FORMSOURCE)                wxPRINTBIN_FORMSOURCE;
+%rename(PRINTBIN_USER)                      wxPRINTBIN_USER;
 %rename(PrintData)                          wxPrintData;
 %rename(PageSetupDialogData)                wxPageSetupDialogData;
 %rename(PageSetupDialog)                    wxPageSetupDialog;

wxPython/src/gtk/_controls.py

@@ -3181,6 +3181,80 @@ wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_LISTBOOK_PAGE_CH
 EVT_LISTBOOK_PAGE_CHANGED  = wx.PyEventBinder( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, 1 )
 EVT_LISTBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, 1 )
 
+CHB_DEFAULT = _controls_.CHB_DEFAULT
+CHB_TOP = _controls_.CHB_TOP
+CHB_BOTTOM = _controls_.CHB_BOTTOM
+CHB_LEFT = _controls_.CHB_LEFT
+CHB_RIGHT = _controls_.CHB_RIGHT
+CHB_ALIGN_MASK = _controls_.CHB_ALIGN_MASK
+class Choicebook(BookCtrl):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxChoicebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=0, String name=EmptyString) -> Choicebook
+        """
+        newobj = _controls_.new_Choicebook(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=0, String name=EmptyString) -> bool
+        """
+        return _controls_.Choicebook_Create(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical(self) -> bool"""
+        return _controls_.Choicebook_IsVertical(*args, **kwargs)
+
+    def DeleteAllPages(*args, **kwargs):
+        """DeleteAllPages(self) -> bool"""
+        return _controls_.Choicebook_DeleteAllPages(*args, **kwargs)
+
+
+class ChoicebookPtr(Choicebook):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = Choicebook
+_controls_.Choicebook_swigregister(ChoicebookPtr)
+
+def PreChoicebook(*args, **kwargs):
+    """PreChoicebook() -> Choicebook"""
+    val = _controls_.new_PreChoicebook(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+class ChoicebookEvent(BookCtrlEvent):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxChoicebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
+            int nOldSel=-1) -> ChoicebookEvent
+        """
+        newobj = _controls_.new_ChoicebookEvent(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+
+class ChoicebookEventPtr(ChoicebookEvent):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = ChoicebookEvent
+_controls_.ChoicebookEvent_swigregister(ChoicebookEventPtr)
+
+wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED
+wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING
+EVT_CHOICEBOOK_PAGE_CHANGED  = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, 1 )
+EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, 1 )
+
 #---------------------------------------------------------------------------
 
 class BookCtrlSizer(_core.Sizer):

wxPython/src/gtk/_core.py

@@ -1771,6 +1771,11 @@ class FileSystem(Object):
         return _core_.FileSystem_FileNameToURL(*args, **kwargs)
 
     FileNameToURL = staticmethod(FileNameToURL)
+    def URLToFileName(*args, **kwargs):
+        """URLToFileName(String url) -> String"""
+        return _core_.FileSystem_URLToFileName(*args, **kwargs)
+
+    URLToFileName = staticmethod(URLToFileName)
 
 class FileSystemPtr(FileSystem):
     def __init__(self, this):
@@ -1791,10 +1796,10 @@ def FileSystem_FileNameToURL(*args, **kwargs):
     """FileSystem_FileNameToURL(String filename) -> String"""
     return _core_.FileSystem_FileNameToURL(*args, **kwargs)
 
-
 def FileSystem_URLToFileName(*args, **kwargs):
     """FileSystem_URLToFileName(String url) -> String"""
     return _core_.FileSystem_URLToFileName(*args, **kwargs)
+
 class InternetFSHandler(CPPFileSystemHandler):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxInternetFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -1865,14 +1870,22 @@ def __wxMemoryFSHandler_AddFile_wxBitmap(*args, **kwargs):
 def __wxMemoryFSHandler_AddFile_Data(*args, **kwargs):
     """__wxMemoryFSHandler_AddFile_Data(String filename, PyObject data)"""
     return _core_.__wxMemoryFSHandler_AddFile_Data(*args, **kwargs)
-def MemoryFSHandler_AddFile(filename, a, b=''):
+def MemoryFSHandler_AddFile(filename, dataItem, imgType=-1):
-    if isinstance(a, wx.Image):
+    """
-        __wxMemoryFSHandler_AddFile_wxImage(filename, a, b)
+    Add 'file' to the memory filesystem.  The dataItem parameter can
-    elif isinstance(a, wx.Bitmap):
+    either be a `wx.Bitmap`, `wx.Image` or a string that can contain
-        __wxMemoryFSHandler_AddFile_wxBitmap(filename, a, b)
+    arbitrary data.  If a bitmap or image is used then the imgType
-    elif type(a) == str:
+    parameter should specify what kind of image file it should be
-        __wxMemoryFSHandler_AddFile_Data(filename, a)
+    written as, wx.BITMAP_TYPE_PNG, etc.
-    else: raise TypeError, 'wx.Image, wx.Bitmap or string expected'
+    """
+    if isinstance(dataItem, wx.Image):
+        __wxMemoryFSHandler_AddFile_wxImage(filename, dataItem, imgType)
+    elif isinstance(dataItem, wx.Bitmap):
+        __wxMemoryFSHandler_AddFile_wxBitmap(filename, dataItem, imgType)
+    elif type(dataItem) == str:
+        __wxMemoryFSHandler_AddFile_Data(filename, dataItem)
+    else:
+        raise TypeError, 'wx.Image, wx.Bitmap or string expected'
 
 class MemoryFSHandler(CPPFileSystemHandler):
     def __repr__(self):
@@ -5398,6 +5411,69 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
 
 #---------------------------------------------------------------------------
 
+class EventLoop(object):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxEventLoop instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(self) -> EventLoop"""
+        newobj = _core_.new_EventLoop(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_core_.delete_EventLoop):
+        """__del__(self)"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+
+    def Run(*args, **kwargs):
+        """Run(self) -> int"""
+        return _core_.EventLoop_Run(*args, **kwargs)
+
+    def Exit(*args, **kwargs):
+        """Exit(self, int rc=0)"""
+        return _core_.EventLoop_Exit(*args, **kwargs)
+
+    def Pending(*args, **kwargs):
+        """Pending(self) -> bool"""
+        return _core_.EventLoop_Pending(*args, **kwargs)
+
+    def Dispatch(*args, **kwargs):
+        """Dispatch(self) -> bool"""
+        return _core_.EventLoop_Dispatch(*args, **kwargs)
+
+    def IsRunning(*args, **kwargs):
+        """IsRunning(self) -> bool"""
+        return _core_.EventLoop_IsRunning(*args, **kwargs)
+
+    def GetActive(*args, **kwargs):
+        """GetActive() -> EventLoop"""
+        return _core_.EventLoop_GetActive(*args, **kwargs)
+
+    GetActive = staticmethod(GetActive)
+    def SetActive(*args, **kwargs):
+        """SetActive(EventLoop loop)"""
+        return _core_.EventLoop_SetActive(*args, **kwargs)
+
+    SetActive = staticmethod(SetActive)
+
+class EventLoopPtr(EventLoop):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = EventLoop
+_core_.EventLoop_swigregister(EventLoopPtr)
+
+def EventLoop_GetActive(*args, **kwargs):
+    """EventLoop_GetActive() -> EventLoop"""
+    return _core_.EventLoop_GetActive(*args, **kwargs)
+
+def EventLoop_SetActive(*args, **kwargs):
+    """EventLoop_SetActive(EventLoop loop)"""
+    return _core_.EventLoop_SetActive(*args, **kwargs)
+
+#---------------------------------------------------------------------------
+
 class AcceleratorEntry(object):
     """
     A class used to define items in an `wx.AcceleratorTable`.  wxPython

wxPython/src/gtk/_core_wrap.cpp

@@ -213,118 +213,119 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #define  SWIGTYPE_p_wxSizerItem swig_types[2] 
 #define  SWIGTYPE_p_wxGBSizerItem swig_types[3] 
 #define  SWIGTYPE_p_wxScrollEvent swig_types[4] 
-#define  SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[5] 
+#define  SWIGTYPE_p_wxEventLoop swig_types[5] 
-#define  SWIGTYPE_p_wxSizer swig_types[6] 
+#define  SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[6] 
-#define  SWIGTYPE_p_wxBoxSizer swig_types[7] 
+#define  SWIGTYPE_p_wxSizer swig_types[7] 
-#define  SWIGTYPE_p_wxStaticBoxSizer swig_types[8] 
+#define  SWIGTYPE_p_wxBoxSizer swig_types[8] 
-#define  SWIGTYPE_p_wxGridBagSizer swig_types[9] 
+#define  SWIGTYPE_p_wxStaticBoxSizer swig_types[9] 
-#define  SWIGTYPE_p_wxAcceleratorEntry swig_types[10] 
+#define  SWIGTYPE_p_wxGridBagSizer swig_types[10] 
-#define  SWIGTYPE_p_wxUpdateUIEvent swig_types[11] 
+#define  SWIGTYPE_p_wxAcceleratorEntry swig_types[11] 
-#define  SWIGTYPE_p_wxMenu swig_types[12] 
+#define  SWIGTYPE_p_wxUpdateUIEvent swig_types[12] 
-#define  SWIGTYPE_p_wxEvent swig_types[13] 
+#define  SWIGTYPE_p_wxMenu swig_types[13] 
-#define  SWIGTYPE_p_wxGridSizer swig_types[14] 
+#define  SWIGTYPE_p_wxEvent swig_types[14] 
-#define  SWIGTYPE_p_wxFlexGridSizer swig_types[15] 
+#define  SWIGTYPE_p_wxGridSizer swig_types[15] 
-#define  SWIGTYPE_p_wxInitDialogEvent swig_types[16] 
+#define  SWIGTYPE_p_wxFlexGridSizer swig_types[16] 
-#define  SWIGTYPE_p_wxItemContainer swig_types[17] 
+#define  SWIGTYPE_p_wxInitDialogEvent swig_types[17] 
-#define  SWIGTYPE_p_wxNcPaintEvent swig_types[18] 
+#define  SWIGTYPE_p_wxItemContainer swig_types[18] 
-#define  SWIGTYPE_p_wxPaintEvent swig_types[19] 
+#define  SWIGTYPE_p_wxNcPaintEvent swig_types[19] 
-#define  SWIGTYPE_p_wxSysColourChangedEvent swig_types[20] 
+#define  SWIGTYPE_p_wxPaintEvent swig_types[20] 
-#define  SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[21] 
+#define  SWIGTYPE_p_wxSysColourChangedEvent swig_types[21] 
-#define  SWIGTYPE_p_wxDisplayChangedEvent swig_types[22] 
+#define  SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[22] 
-#define  SWIGTYPE_p_wxPaletteChangedEvent swig_types[23] 
+#define  SWIGTYPE_p_wxDisplayChangedEvent swig_types[23] 
-#define  SWIGTYPE_p_wxControl swig_types[24] 
+#define  SWIGTYPE_p_wxPaletteChangedEvent swig_types[24] 
-#define  SWIGTYPE_p_wxFont swig_types[25] 
+#define  SWIGTYPE_p_wxControl swig_types[25] 
-#define  SWIGTYPE_p_wxMenuBarBase swig_types[26] 
+#define  SWIGTYPE_p_wxFont swig_types[26] 
-#define  SWIGTYPE_p_wxSetCursorEvent swig_types[27] 
+#define  SWIGTYPE_p_wxMenuBarBase swig_types[27] 
-#define  SWIGTYPE_p_wxFSFile swig_types[28] 
+#define  SWIGTYPE_p_wxSetCursorEvent swig_types[28] 
-#define  SWIGTYPE_p_wxCaret swig_types[29] 
+#define  SWIGTYPE_p_wxFSFile swig_types[29] 
-#define  SWIGTYPE_p_wxRegion swig_types[30] 
+#define  SWIGTYPE_p_wxCaret swig_types[30] 
-#define  SWIGTYPE_p_wxPoint2D swig_types[31] 
+#define  SWIGTYPE_p_wxRegion swig_types[31] 
-#define  SWIGTYPE_p_int swig_types[32] 
+#define  SWIGTYPE_p_wxPoint2D swig_types[32] 
-#define  SWIGTYPE_p_wxSize swig_types[33] 
+#define  SWIGTYPE_p_int swig_types[33] 
-#define  SWIGTYPE_p_wxDC swig_types[34] 
+#define  SWIGTYPE_p_wxSize swig_types[34] 
-#define  SWIGTYPE_p_wxPySizer swig_types[35] 
+#define  SWIGTYPE_p_wxDC swig_types[35] 
-#define  SWIGTYPE_p_wxVisualAttributes swig_types[36] 
+#define  SWIGTYPE_p_wxPySizer swig_types[36] 
-#define  SWIGTYPE_p_wxNotifyEvent swig_types[37] 
+#define  SWIGTYPE_p_wxVisualAttributes swig_types[37] 
-#define  SWIGTYPE_p_wxPyEvent swig_types[38] 
+#define  SWIGTYPE_p_wxNotifyEvent swig_types[38] 
-#define  SWIGTYPE_p_wxPropagationDisabler swig_types[39] 
+#define  SWIGTYPE_p_wxPyEvent swig_types[39] 
-#define  SWIGTYPE_p_wxAppTraits swig_types[40] 
+#define  SWIGTYPE_p_wxPropagationDisabler swig_types[40] 
-#define  SWIGTYPE_p_wxArrayString swig_types[41] 
+#define  SWIGTYPE_p_wxAppTraits swig_types[41] 
-#define  SWIGTYPE_p_wxShowEvent swig_types[42] 
+#define  SWIGTYPE_p_wxArrayString swig_types[42] 
-#define  SWIGTYPE_p_wxToolTip swig_types[43] 
+#define  SWIGTYPE_p_wxShowEvent swig_types[43] 
-#define  SWIGTYPE_p_wxIconizeEvent swig_types[44] 
+#define  SWIGTYPE_p_wxToolTip swig_types[44] 
-#define  SWIGTYPE_p_wxActivateEvent swig_types[45] 
+#define  SWIGTYPE_p_wxIconizeEvent swig_types[45] 
-#define  SWIGTYPE_p_wxMoveEvent swig_types[46] 
+#define  SWIGTYPE_p_wxActivateEvent swig_types[46] 
-#define  SWIGTYPE_p_wxSizeEvent swig_types[47] 
+#define  SWIGTYPE_p_wxMoveEvent swig_types[47] 
-#define  SWIGTYPE_p_wxMaximizeEvent swig_types[48] 
+#define  SWIGTYPE_p_wxSizeEvent swig_types[48] 
-#define  SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[49] 
+#define  SWIGTYPE_p_wxMaximizeEvent swig_types[49] 
-#define  SWIGTYPE_p_wxWindowCreateEvent swig_types[50] 
+#define  SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[50] 
-#define  SWIGTYPE_p_wxIdleEvent swig_types[51] 
+#define  SWIGTYPE_p_wxWindowCreateEvent swig_types[51] 
-#define  SWIGTYPE_p_wxMenuItem swig_types[52] 
+#define  SWIGTYPE_p_wxIdleEvent swig_types[52] 
-#define  SWIGTYPE_p_wxStaticBox swig_types[53] 
+#define  SWIGTYPE_p_wxMenuItem swig_types[53] 
-#define  SWIGTYPE_p_long swig_types[54] 
+#define  SWIGTYPE_p_wxStaticBox swig_types[54] 
-#define  SWIGTYPE_p_wxTIFFHandler swig_types[55] 
+#define  SWIGTYPE_p_long swig_types[55] 
-#define  SWIGTYPE_p_wxXPMHandler swig_types[56] 
+#define  SWIGTYPE_p_wxTIFFHandler swig_types[56] 
-#define  SWIGTYPE_p_wxPNMHandler swig_types[57] 
+#define  SWIGTYPE_p_wxXPMHandler swig_types[57] 
-#define  SWIGTYPE_p_wxJPEGHandler swig_types[58] 
+#define  SWIGTYPE_p_wxPNMHandler swig_types[58] 
-#define  SWIGTYPE_p_wxPCXHandler swig_types[59] 
+#define  SWIGTYPE_p_wxJPEGHandler swig_types[59] 
-#define  SWIGTYPE_p_wxGIFHandler swig_types[60] 
+#define  SWIGTYPE_p_wxPCXHandler swig_types[60] 
-#define  SWIGTYPE_p_wxPNGHandler swig_types[61] 
+#define  SWIGTYPE_p_wxGIFHandler swig_types[61] 
-#define  SWIGTYPE_p_wxANIHandler swig_types[62] 
+#define  SWIGTYPE_p_wxPNGHandler swig_types[62] 
-#define  SWIGTYPE_p_wxMemoryFSHandler swig_types[63] 
+#define  SWIGTYPE_p_wxANIHandler swig_types[63] 
-#define  SWIGTYPE_p_wxEvtHandler swig_types[64] 
+#define  SWIGTYPE_p_wxMemoryFSHandler swig_types[64] 
-#define  SWIGTYPE_p_wxCURHandler swig_types[65] 
+#define  SWIGTYPE_p_wxEvtHandler swig_types[65] 
-#define  SWIGTYPE_p_wxICOHandler swig_types[66] 
+#define  SWIGTYPE_p_wxCURHandler swig_types[66] 
-#define  SWIGTYPE_p_wxBMPHandler swig_types[67] 
+#define  SWIGTYPE_p_wxICOHandler swig_types[67] 
-#define  SWIGTYPE_p_wxImageHandler swig_types[68] 
+#define  SWIGTYPE_p_wxBMPHandler swig_types[68] 
-#define  SWIGTYPE_p_wxFileSystemHandler swig_types[69] 
+#define  SWIGTYPE_p_wxImageHandler swig_types[69] 
-#define  SWIGTYPE_p_wxPyFileSystemHandler swig_types[70] 
+#define  SWIGTYPE_p_wxFileSystemHandler swig_types[70] 
-#define  SWIGTYPE_p_wxInternetFSHandler swig_types[71] 
+#define  SWIGTYPE_p_wxPyFileSystemHandler swig_types[71] 
-#define  SWIGTYPE_p_wxZipFSHandler swig_types[72] 
+#define  SWIGTYPE_p_wxInternetFSHandler swig_types[72] 
-#define  SWIGTYPE_p_wxRect swig_types[73] 
+#define  SWIGTYPE_p_wxZipFSHandler swig_types[73] 
-#define  SWIGTYPE_p_wxGBSpan swig_types[74] 
+#define  SWIGTYPE_p_wxRect swig_types[74] 
-#define  SWIGTYPE_p_wxPropagateOnce swig_types[75] 
+#define  SWIGTYPE_p_wxGBSpan swig_types[75] 
-#define  SWIGTYPE_p_wxAcceleratorTable swig_types[76] 
+#define  SWIGTYPE_p_wxPropagateOnce swig_types[76] 
-#define  SWIGTYPE_p_char swig_types[77] 
+#define  SWIGTYPE_p_wxAcceleratorTable swig_types[77] 
-#define  SWIGTYPE_p_wxGBPosition swig_types[78] 
+#define  SWIGTYPE_p_char swig_types[78] 
-#define  SWIGTYPE_p_wxImage swig_types[79] 
+#define  SWIGTYPE_p_wxGBPosition swig_types[79] 
-#define  SWIGTYPE_p_wxFrame swig_types[80] 
+#define  SWIGTYPE_p_wxImage swig_types[80] 
-#define  SWIGTYPE_p_wxScrollWinEvent swig_types[81] 
+#define  SWIGTYPE_p_wxFrame swig_types[81] 
-#define  SWIGTYPE_p_wxImageHistogram swig_types[82] 
+#define  SWIGTYPE_p_wxScrollWinEvent swig_types[82] 
-#define  SWIGTYPE_p_byte swig_types[83] 
+#define  SWIGTYPE_p_wxImageHistogram swig_types[83] 
-#define  SWIGTYPE_p_wxPoint swig_types[84] 
+#define  SWIGTYPE_p_byte swig_types[84] 
-#define  SWIGTYPE_p_wxCursor swig_types[85] 
+#define  SWIGTYPE_p_wxPoint swig_types[85] 
-#define  SWIGTYPE_p_wxObject swig_types[86] 
+#define  SWIGTYPE_p_wxCursor swig_types[86] 
-#define  SWIGTYPE_p_wxPyInputStream swig_types[87] 
+#define  SWIGTYPE_p_wxObject swig_types[87] 
-#define  SWIGTYPE_p_wxOutputStream swig_types[88] 
+#define  SWIGTYPE_p_wxPyInputStream swig_types[88] 
-#define  SWIGTYPE_p_wxInputStream swig_types[89] 
+#define  SWIGTYPE_p_wxOutputStream swig_types[89] 
-#define  SWIGTYPE_p_wxDateTime swig_types[90] 
+#define  SWIGTYPE_p_wxInputStream swig_types[90] 
-#define  SWIGTYPE_p_wxKeyEvent swig_types[91] 
+#define  SWIGTYPE_p_wxDateTime swig_types[91] 
-#define  SWIGTYPE_p_wxNavigationKeyEvent swig_types[92] 
+#define  SWIGTYPE_p_wxKeyEvent swig_types[92] 
-#define  SWIGTYPE_p_wxWindowDestroyEvent swig_types[93] 
+#define  SWIGTYPE_p_wxNavigationKeyEvent swig_types[93] 
-#define  SWIGTYPE_p_wxWindow swig_types[94] 
+#define  SWIGTYPE_p_wxWindowDestroyEvent swig_types[94] 
-#define  SWIGTYPE_p_wxMenuBar swig_types[95] 
+#define  SWIGTYPE_p_wxWindow swig_types[95] 
-#define  SWIGTYPE_p_wxFileSystem swig_types[96] 
+#define  SWIGTYPE_p_wxMenuBar swig_types[96] 
-#define  SWIGTYPE_p_wxBitmap swig_types[97] 
+#define  SWIGTYPE_p_wxFileSystem swig_types[97] 
-#define  SWIGTYPE_p_wxMenuEvent swig_types[98] 
+#define  SWIGTYPE_p_wxBitmap swig_types[98] 
-#define  SWIGTYPE_p_wxContextMenuEvent swig_types[99] 
+#define  SWIGTYPE_p_wxMenuEvent swig_types[99] 
-#define  SWIGTYPE_p_unsigned_char swig_types[100] 
+#define  SWIGTYPE_p_wxContextMenuEvent swig_types[100] 
-#define  SWIGTYPE_p_wxCloseEvent swig_types[101] 
+#define  SWIGTYPE_p_unsigned_char swig_types[101] 
-#define  SWIGTYPE_p_wxEraseEvent swig_types[102] 
+#define  SWIGTYPE_p_wxCloseEvent swig_types[102] 
-#define  SWIGTYPE_p_wxMouseEvent swig_types[103] 
+#define  SWIGTYPE_p_wxEraseEvent swig_types[103] 
-#define  SWIGTYPE_p_wxPyApp swig_types[104] 
+#define  SWIGTYPE_p_wxMouseEvent swig_types[104] 
-#define  SWIGTYPE_p_wxCommandEvent swig_types[105] 
+#define  SWIGTYPE_p_wxPyApp swig_types[105] 
-#define  SWIGTYPE_p_wxPyCommandEvent swig_types[106] 
+#define  SWIGTYPE_p_wxCommandEvent swig_types[106] 
-#define  SWIGTYPE_p_wxPyDropTarget swig_types[107] 
+#define  SWIGTYPE_p_wxPyCommandEvent swig_types[107] 
-#define  SWIGTYPE_p_wxQuantize swig_types[108] 
+#define  SWIGTYPE_p_wxPyDropTarget swig_types[108] 
-#define  SWIGTYPE_p_wxChildFocusEvent swig_types[109] 
+#define  SWIGTYPE_p_wxQuantize swig_types[109] 
-#define  SWIGTYPE_p_wxFocusEvent swig_types[110] 
+#define  SWIGTYPE_p_wxChildFocusEvent swig_types[110] 
-#define  SWIGTYPE_p_wxDropFilesEvent swig_types[111] 
+#define  SWIGTYPE_p_wxFocusEvent swig_types[111] 
-#define  SWIGTYPE_p_wxControlWithItems swig_types[112] 
+#define  SWIGTYPE_p_wxDropFilesEvent swig_types[112] 
-#define  SWIGTYPE_p_wxColour swig_types[113] 
+#define  SWIGTYPE_p_wxControlWithItems swig_types[113] 
-#define  SWIGTYPE_p_wxValidator swig_types[114] 
+#define  SWIGTYPE_p_wxColour swig_types[114] 
-#define  SWIGTYPE_p_wxPyValidator swig_types[115] 
+#define  SWIGTYPE_p_wxValidator swig_types[115] 
-static swig_type_info *swig_types[117];
+#define  SWIGTYPE_p_wxPyValidator swig_types[116] 
+static swig_type_info *swig_types[118];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -1122,13 +1123,11 @@ SWIG_Check_bool(PyObject* obj)
   return SWIG_AsVal_bool(obj, (bool*)0);
 }
 
-
+wxString FileSystem_URLToFileName(wxString const &url){
-    wxString wxFileSystem_URLToFileName(const wxString& url) {
             wxFileName fname = wxFileSystem::URLToFileName(url);
             return fname.GetFullPath();
         }
 
-
     void __wxMemoryFSHandler_AddFile_wxImage(const wxString& filename,
                                              wxImage& image,
                                              long type) {
@@ -1143,10 +1142,18 @@ SWIG_Check_bool(PyObject* obj)
 
     void __wxMemoryFSHandler_AddFile_Data(const wxString& filename,
                                           PyObject* data) {
-        wxMemoryFSHandler::AddFile(filename,
+        if (! PyString_Check(data)) {
-                                   // TODO:  Verify data type
+            wxPyBLOCK_THREADS(PyErr_SetString(PyExc_TypeError,
-                                   (void*)PyString_AsString(data),
+                                              "Expected string object"));
-                                   (size_t)PyString_Size(data));
+            return;
+        }
+
+        bool blocked = wxPyBeginBlockThreads();
+        void*  ptr = (void*)PyString_AsString(data);
+        size_t size = PyString_Size(data);
+        wxPyEndBlockThreads(blocked);
+
+        wxMemoryFSHandler::AddFile(filename, ptr, size);
     }
 
 
@@ -1264,7 +1271,8 @@ void wxImage_SetData(wxImage *self,PyObject *data){
             unsigned char* dataPtr;
 
             if (! PyString_Check(data)) {
-                PyErr_SetString(PyExc_TypeError, "Expected string object");
+                wxPyBLOCK_THREADS(PyErr_SetString(PyExc_TypeError,
+                                                  "Expected string object"));
                 return /* NULL */ ;
             }
 
@@ -1531,6 +1539,9 @@ int PyApp_GetComCtl32Version(){ wxPyRaiseNotImplemented(); return 0; }
     wxPyApp* wxPyGetApp() { return (wxPyApp*)wxTheApp; }
 
 
+#include <wx/evtloop.h>
+
+
 
  static const wxString wxPyPanelNameStr(wxPanelNameStr); 
 wxVisualAttributes *new_wxVisualAttributes(){ return new wxVisualAttributes; }
@@ -7571,13 +7582,6 @@ static PyObject *_wrap_FileSystem_FileNameToURL(PyObject *, PyObject *args, PyOb
 }
 
 
-static PyObject * FileSystem_swigregister(PyObject *, PyObject *args) {
-    PyObject *obj;
-    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
-    SWIG_TypeClientData(SWIGTYPE_p_wxFileSystem, obj);
-    Py_INCREF(obj);
-    return Py_BuildValue((char *)"");
-}
 static PyObject *_wrap_FileSystem_URLToFileName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
@@ -7596,7 +7600,7 @@ static PyObject *_wrap_FileSystem_URLToFileName(PyObject *, PyObject *args, PyOb
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = wxFileSystem_URLToFileName((wxString const &)*arg1);
+        result = FileSystem_URLToFileName((wxString const &)*arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -7622,6 +7626,13 @@ static PyObject *_wrap_FileSystem_URLToFileName(PyObject *, PyObject *args, PyOb
 }
 
 
+static PyObject * FileSystem_swigregister(PyObject *, PyObject *args) {
+    PyObject *obj;
+    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
+    SWIG_TypeClientData(SWIGTYPE_p_wxFileSystem, obj);
+    Py_INCREF(obj);
+    return Py_BuildValue((char *)"");
+}
 static PyObject *_wrap_new_InternetFSHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInternetFSHandler *result;
@@ -21206,6 +21217,248 @@ static PyObject *_wrap_GetApp(PyObject *, PyObject *args, PyObject *kwargs) {
 }
 
 
+static PyObject *_wrap_new_EventLoop(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxEventLoop *result;
+    char *kwnames[] = {
+        NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_EventLoop",kwnames)) goto fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxEventLoop *)new wxEventLoop();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEventLoop, 1);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_delete_EventLoop(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxEventLoop *arg1 = (wxEventLoop *) 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_EventLoop",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEventLoop,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        delete arg1;
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_EventLoop_Run(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxEventLoop *arg1 = (wxEventLoop *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EventLoop_Run",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEventLoop,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)(arg1)->Run();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_From_int((int)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_EventLoop_Exit(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxEventLoop *arg1 = (wxEventLoop *) 0 ;
+    int arg2 = (int) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "rc", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:EventLoop_Exit",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEventLoop,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (int)SWIG_As_int(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->Exit(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_EventLoop_Pending(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxEventLoop *arg1 = (wxEventLoop *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EventLoop_Pending",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEventLoop,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)((wxEventLoop const *)arg1)->Pending();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_EventLoop_Dispatch(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxEventLoop *arg1 = (wxEventLoop *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EventLoop_Dispatch",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEventLoop,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)(arg1)->Dispatch();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_EventLoop_IsRunning(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxEventLoop *arg1 = (wxEventLoop *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EventLoop_IsRunning",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEventLoop,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)((wxEventLoop const *)arg1)->IsRunning();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_EventLoop_GetActive(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxEventLoop *result;
+    char *kwnames[] = {
+        NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":EventLoop_GetActive",kwnames)) goto fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxEventLoop *)wxEventLoop::GetActive();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEventLoop, 0);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_EventLoop_SetActive(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxEventLoop *arg1 = (wxEventLoop *) 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "loop", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EventLoop_SetActive",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEventLoop,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxEventLoop::SetActive(arg1);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject * EventLoop_swigregister(PyObject *, PyObject *args) {
+    PyObject *obj;
+    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
+    SWIG_TypeClientData(SWIGTYPE_p_wxEventLoop, obj);
+    Py_INCREF(obj);
+    return Py_BuildValue((char *)"");
+}
 static PyObject *_wrap_new_AcceleratorEntry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
@@ -40515,8 +40768,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FileSystem_AddHandler", (PyCFunction) _wrap_FileSystem_AddHandler, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"FileSystem_CleanUpHandlers", (PyCFunction) _wrap_FileSystem_CleanUpHandlers, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"FileSystem_FileNameToURL", (PyCFunction) _wrap_FileSystem_FileNameToURL, METH_VARARGS | METH_KEYWORDS, NULL },
-	 { (char *)"FileSystem_swigregister", FileSystem_swigregister, METH_VARARGS, NULL },
 	 { (char *)"FileSystem_URLToFileName", (PyCFunction) _wrap_FileSystem_URLToFileName, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"FileSystem_swigregister", FileSystem_swigregister, METH_VARARGS, NULL },
 	 { (char *)"new_InternetFSHandler", (PyCFunction) _wrap_new_InternetFSHandler, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"InternetFSHandler_CanOpen", (PyCFunction) _wrap_InternetFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"InternetFSHandler_OpenFile", (PyCFunction) _wrap_InternetFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL },
@@ -41005,6 +41258,16 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"PostEvent", (PyCFunction) _wrap_PostEvent, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"App_CleanUp", (PyCFunction) _wrap_App_CleanUp, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"GetApp", (PyCFunction) _wrap_GetApp, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"new_EventLoop", (PyCFunction) _wrap_new_EventLoop, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"delete_EventLoop", (PyCFunction) _wrap_delete_EventLoop, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"EventLoop_Run", (PyCFunction) _wrap_EventLoop_Run, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"EventLoop_Exit", (PyCFunction) _wrap_EventLoop_Exit, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"EventLoop_Pending", (PyCFunction) _wrap_EventLoop_Pending, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"EventLoop_Dispatch", (PyCFunction) _wrap_EventLoop_Dispatch, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"EventLoop_IsRunning", (PyCFunction) _wrap_EventLoop_IsRunning, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"EventLoop_GetActive", (PyCFunction) _wrap_EventLoop_GetActive, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"EventLoop_SetActive", (PyCFunction) _wrap_EventLoop_SetActive, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"EventLoop_swigregister", EventLoop_swigregister, METH_VARARGS, NULL },
 	 { (char *)"new_AcceleratorEntry", (PyCFunction) _wrap_new_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"delete_AcceleratorEntry", (PyCFunction) _wrap_delete_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"AcceleratorEntry_Set", (PyCFunction) _wrap_AcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS, NULL },
@@ -42072,6 +42335,7 @@ static swig_type_info _swigt__p_wxRealPoint[] = {{"_p_wxRealPoint", 0, "wxRealPo
 static swig_type_info _swigt__p_wxSizerItem[] = {{"_p_wxSizerItem", 0, "wxSizerItem *", 0, 0, 0, 0},{"_p_wxSizerItem", 0, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxSizerItem, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxGBSizerItem[] = {{"_p_wxGBSizerItem", 0, "wxGBSizerItem *", 0, 0, 0, 0},{"_p_wxGBSizerItem", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxScrollEvent[] = {{"_p_wxScrollEvent", 0, "wxScrollEvent *", 0, 0, 0, 0},{"_p_wxScrollEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxEventLoop[] = {{"_p_wxEventLoop", 0, "wxEventLoop *", 0, 0, 0, 0},{"_p_wxEventLoop", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxIndividualLayoutConstraint[] = {{"_p_wxIndividualLayoutConstraint", 0, "wxIndividualLayoutConstraint *", 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxSizer[] = {{"_p_wxSizer", 0, "wxSizer *", 0, 0, 0, 0},{"_p_wxSizer", 0, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxSizer, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxBoxSizer[] = {{"_p_wxBoxSizer", 0, "wxBoxSizer *", 0, 0, 0, 0},{"_p_wxBoxSizer", 0, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxBoxSizer, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -42190,6 +42454,7 @@ _swigt__p_wxRealPoint,
 _swigt__p_wxSizerItem, 
 _swigt__p_wxGBSizerItem, 
 _swigt__p_wxScrollEvent, 
+_swigt__p_wxEventLoop, 
 _swigt__p_wxIndividualLayoutConstraint, 
 _swigt__p_wxSizer, 
 _swigt__p_wxBoxSizer, 

wxPython/src/gtk/_windows.py

@@ -3684,6 +3684,21 @@ PRINT_MODE_PREVIEW = _windows_.PRINT_MODE_PREVIEW
 PRINT_MODE_FILE = _windows_.PRINT_MODE_FILE
 PRINT_MODE_PRINTER = _windows_.PRINT_MODE_PRINTER
 PRINT_MODE_STREAM = _windows_.PRINT_MODE_STREAM
+PRINTBIN_DEFAULT = _windows_.PRINTBIN_DEFAULT
+PRINTBIN_ONLYONE = _windows_.PRINTBIN_ONLYONE
+PRINTBIN_LOWER = _windows_.PRINTBIN_LOWER
+PRINTBIN_MIDDLE = _windows_.PRINTBIN_MIDDLE
+PRINTBIN_MANUAL = _windows_.PRINTBIN_MANUAL
+PRINTBIN_ENVELOPE = _windows_.PRINTBIN_ENVELOPE
+PRINTBIN_ENVMANUAL = _windows_.PRINTBIN_ENVMANUAL
+PRINTBIN_AUTO = _windows_.PRINTBIN_AUTO
+PRINTBIN_TRACTOR = _windows_.PRINTBIN_TRACTOR
+PRINTBIN_SMALLFMT = _windows_.PRINTBIN_SMALLFMT
+PRINTBIN_LARGEFMT = _windows_.PRINTBIN_LARGEFMT
+PRINTBIN_LARGECAPACITY = _windows_.PRINTBIN_LARGECAPACITY
+PRINTBIN_CASSETTE = _windows_.PRINTBIN_CASSETTE
+PRINTBIN_FORMSOURCE = _windows_.PRINTBIN_FORMSOURCE
+PRINTBIN_USER = _windows_.PRINTBIN_USER
 class PrintData(_core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -3742,6 +3757,10 @@ class PrintData(_core.Object):
         """GetQuality(self) -> int"""
         return _windows_.PrintData_GetQuality(*args, **kwargs)
 
+    def GetBin(*args, **kwargs):
+        """GetBin(self) -> int"""
+        return _windows_.PrintData_GetBin(*args, **kwargs)
+
     def SetNoCopies(*args, **kwargs):
         """SetNoCopies(self, int v)"""
         return _windows_.PrintData_SetNoCopies(*args, **kwargs)
@@ -3778,6 +3797,10 @@ class PrintData(_core.Object):
         """SetQuality(self, int quality)"""
         return _windows_.PrintData_SetQuality(*args, **kwargs)
 
+    def SetBin(*args, **kwargs):
+        """SetBin(self, int bin)"""
+        return _windows_.PrintData_SetBin(*args, **kwargs)
+
     def GetPrinterCommand(*args, **kwargs):
         """GetPrinterCommand(self) -> String"""
         return _windows_.PrintData_GetPrinterCommand(*args, **kwargs)

wxPython/src/gtk/_windows_wrap.cpp

@@ -18548,6 +18548,32 @@ static PyObject *_wrap_PrintData_GetQuality(PyObject *, PyObject *args, PyObject
 }
 
 
+static PyObject *_wrap_PrintData_GetBin(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPrintData *arg1 = (wxPrintData *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PrintData_GetBin",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)(arg1)->GetBin();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_From_int((int)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_PrintData_SetNoCopies(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
@@ -18824,6 +18850,35 @@ static PyObject *_wrap_PrintData_SetQuality(PyObject *, PyObject *args, PyObject
 }
 
 
+static PyObject *_wrap_PrintData_SetBin(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPrintData *arg1 = (wxPrintData *) 0 ;
+    int arg2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "bin", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetBin",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    arg2 = (int)SWIG_As_int(obj1); 
+    if (PyErr_Occurred()) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetBin((wxPrintBin )arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_PrintData_GetPrinterCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
@@ -25617,6 +25672,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"PrintData_GetPaperId", (PyCFunction) _wrap_PrintData_GetPaperId, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"PrintData_GetPaperSize", (PyCFunction) _wrap_PrintData_GetPaperSize, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"PrintData_GetQuality", (PyCFunction) _wrap_PrintData_GetQuality, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"PrintData_GetBin", (PyCFunction) _wrap_PrintData_GetBin, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
@@ -25626,6 +25682,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"PrintData_SetPaperId", (PyCFunction) _wrap_PrintData_SetPaperId, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"PrintData_SetPaperSize", (PyCFunction) _wrap_PrintData_SetPaperSize, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL },
+	 { (char *)"PrintData_SetBin", (PyCFunction) _wrap_PrintData_SetBin, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"PrintData_GetPrinterCommand", (PyCFunction) _wrap_PrintData_GetPrinterCommand, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"PrintData_GetPrinterOptions", (PyCFunction) _wrap_PrintData_GetPrinterOptions, METH_VARARGS | METH_KEYWORDS, NULL },
 	 { (char *)"PrintData_GetPreviewCommand", (PyCFunction) _wrap_PrintData_GetPreviewCommand, METH_VARARGS | METH_KEYWORDS, NULL },
@@ -27198,6 +27255,21 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d,"PRINT_MODE_FILE", SWIG_From_int((int)wxPRINT_MODE_FILE));
     PyDict_SetItemString(d,"PRINT_MODE_PRINTER", SWIG_From_int((int)wxPRINT_MODE_PRINTER));
     PyDict_SetItemString(d,"PRINT_MODE_STREAM", SWIG_From_int((int)wxPRINT_MODE_STREAM));
+    PyDict_SetItemString(d,"PRINTBIN_DEFAULT", SWIG_From_int((int)wxPRINTBIN_DEFAULT));
+    PyDict_SetItemString(d,"PRINTBIN_ONLYONE", SWIG_From_int((int)wxPRINTBIN_ONLYONE));
+    PyDict_SetItemString(d,"PRINTBIN_LOWER", SWIG_From_int((int)wxPRINTBIN_LOWER));
+    PyDict_SetItemString(d,"PRINTBIN_MIDDLE", SWIG_From_int((int)wxPRINTBIN_MIDDLE));
+    PyDict_SetItemString(d,"PRINTBIN_MANUAL", SWIG_From_int((int)wxPRINTBIN_MANUAL));
+    PyDict_SetItemString(d,"PRINTBIN_ENVELOPE", SWIG_From_int((int)wxPRINTBIN_ENVELOPE));
+    PyDict_SetItemString(d,"PRINTBIN_ENVMANUAL", SWIG_From_int((int)wxPRINTBIN_ENVMANUAL));
+    PyDict_SetItemString(d,"PRINTBIN_AUTO", SWIG_From_int((int)wxPRINTBIN_AUTO));
+    PyDict_SetItemString(d,"PRINTBIN_TRACTOR", SWIG_From_int((int)wxPRINTBIN_TRACTOR));
+    PyDict_SetItemString(d,"PRINTBIN_SMALLFMT", SWIG_From_int((int)wxPRINTBIN_SMALLFMT));
+    PyDict_SetItemString(d,"PRINTBIN_LARGEFMT", SWIG_From_int((int)wxPRINTBIN_LARGEFMT));
+    PyDict_SetItemString(d,"PRINTBIN_LARGECAPACITY", SWIG_From_int((int)wxPRINTBIN_LARGECAPACITY));
+    PyDict_SetItemString(d,"PRINTBIN_CASSETTE", SWIG_From_int((int)wxPRINTBIN_CASSETTE));
+    PyDict_SetItemString(d,"PRINTBIN_FORMSOURCE", SWIG_From_int((int)wxPRINTBIN_FORMSOURCE));
+    PyDict_SetItemString(d,"PRINTBIN_USER", SWIG_From_int((int)wxPRINTBIN_USER));
     PyDict_SetItemString(d,"PRINTER_NO_ERROR", SWIG_From_int((int)wxPRINTER_NO_ERROR));
     PyDict_SetItemString(d,"PRINTER_CANCELLED", SWIG_From_int((int)wxPRINTER_CANCELLED));
     PyDict_SetItemString(d,"PRINTER_ERROR", SWIG_From_int((int)wxPRINTER_ERROR));

wxPython/src/gtk/xrc.py

@@ -0,0 +1,693 @@
+# This file was created automatically by SWIG.
+# Don't modify this file, modify the SWIG interface instead.
+
+"""
+The `XmlResource` class allows program resources defining menus, layout of
+controls on a panel, etc. to be loaded from an XML file.
+"""
+
+import _xrc
+
+import _core
+wx = _core 
+__docfilter__ = wx.__DocFilter(globals()) 
+#---------------------------------------------------------------------------
+
+WX_XMLRES_CURRENT_VERSION_MAJOR = _xrc.WX_XMLRES_CURRENT_VERSION_MAJOR
+WX_XMLRES_CURRENT_VERSION_MINOR = _xrc.WX_XMLRES_CURRENT_VERSION_MINOR
+WX_XMLRES_CURRENT_VERSION_RELEASE = _xrc.WX_XMLRES_CURRENT_VERSION_RELEASE
+WX_XMLRES_CURRENT_VERSION_REVISION = _xrc.WX_XMLRES_CURRENT_VERSION_REVISION
+XRC_USE_LOCALE = _xrc.XRC_USE_LOCALE
+XRC_NO_SUBCLASSING = _xrc.XRC_NO_SUBCLASSING
+XRC_NO_RELOADING = _xrc.XRC_NO_RELOADING
+class XmlResource(_core.Object):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(self, String filemask, int flags=XRC_USE_LOCALE) -> XmlResource"""
+        newobj = _xrc.new_XmlResource(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self.InitAllHandlers()
+
+    def __del__(self, destroy=_xrc.delete_XmlResource):
+        """__del__(self)"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+
+    def Load(*args, **kwargs):
+        """Load(self, String filemask) -> bool"""
+        return _xrc.XmlResource_Load(*args, **kwargs)
+
+    def LoadFromString(*args, **kwargs):
+        """LoadFromString(self, String data) -> bool"""
+        return _xrc.XmlResource_LoadFromString(*args, **kwargs)
+
+    def InitAllHandlers(*args, **kwargs):
+        """InitAllHandlers(self)"""
+        return _xrc.XmlResource_InitAllHandlers(*args, **kwargs)
+
+    def AddHandler(*args, **kwargs):
+        """AddHandler(self, XmlResourceHandler handler)"""
+        return _xrc.XmlResource_AddHandler(*args, **kwargs)
+
+    def InsertHandler(*args, **kwargs):
+        """InsertHandler(self, XmlResourceHandler handler)"""
+        return _xrc.XmlResource_InsertHandler(*args, **kwargs)
+
+    def ClearHandlers(*args, **kwargs):
+        """ClearHandlers(self)"""
+        return _xrc.XmlResource_ClearHandlers(*args, **kwargs)
+
+    def AddSubclassFactory(*args, **kwargs):
+        """AddSubclassFactory(XmlSubclassFactory factory)"""
+        return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)
+
+    AddSubclassFactory = staticmethod(AddSubclassFactory)
+    def LoadMenu(*args, **kwargs):
+        """LoadMenu(self, String name) -> Menu"""
+        return _xrc.XmlResource_LoadMenu(*args, **kwargs)
+
+    def LoadMenuBar(*args, **kwargs):
+        """LoadMenuBar(self, String name) -> MenuBar"""
+        return _xrc.XmlResource_LoadMenuBar(*args, **kwargs)
+
+    def LoadMenuBarOnFrame(*args, **kwargs):
+        """LoadMenuBarOnFrame(self, Window parent, String name) -> MenuBar"""
+        return _xrc.XmlResource_LoadMenuBarOnFrame(*args, **kwargs)
+
+    def LoadToolBar(*args, **kwargs):
+        """LoadToolBar(self, Window parent, String name) -> wxToolBar"""
+        return _xrc.XmlResource_LoadToolBar(*args, **kwargs)
+
+    def LoadDialog(*args, **kwargs):
+        """LoadDialog(self, Window parent, String name) -> wxDialog"""
+        return _xrc.XmlResource_LoadDialog(*args, **kwargs)
+
+    def LoadOnDialog(*args, **kwargs):
+        """LoadOnDialog(self, wxDialog dlg, Window parent, String name) -> bool"""
+        return _xrc.XmlResource_LoadOnDialog(*args, **kwargs)
+
+    def LoadPanel(*args, **kwargs):
+        """LoadPanel(self, Window parent, String name) -> wxPanel"""
+        return _xrc.XmlResource_LoadPanel(*args, **kwargs)
+
+    def LoadOnPanel(*args, **kwargs):
+        """LoadOnPanel(self, wxPanel panel, Window parent, String name) -> bool"""
+        return _xrc.XmlResource_LoadOnPanel(*args, **kwargs)
+
+    def LoadFrame(*args, **kwargs):
+        """LoadFrame(self, Window parent, String name) -> wxFrame"""
+        return _xrc.XmlResource_LoadFrame(*args, **kwargs)
+
+    def LoadOnFrame(*args, **kwargs):
+        """LoadOnFrame(self, wxFrame frame, Window parent, String name) -> bool"""
+        return _xrc.XmlResource_LoadOnFrame(*args, **kwargs)
+
+    def LoadObject(*args, **kwargs):
+        """LoadObject(self, Window parent, String name, String classname) -> Object"""
+        return _xrc.XmlResource_LoadObject(*args, **kwargs)
+
+    def LoadOnObject(*args, **kwargs):
+        """LoadOnObject(self, Object instance, Window parent, String name, String classname) -> bool"""
+        return _xrc.XmlResource_LoadOnObject(*args, **kwargs)
+
+    def LoadBitmap(*args, **kwargs):
+        """LoadBitmap(self, String name) -> Bitmap"""
+        return _xrc.XmlResource_LoadBitmap(*args, **kwargs)
+
+    def LoadIcon(*args, **kwargs):
+        """LoadIcon(self, String name) -> Icon"""
+        return _xrc.XmlResource_LoadIcon(*args, **kwargs)
+
+    def AttachUnknownControl(*args, **kwargs):
+        """AttachUnknownControl(self, String name, Window control, Window parent=None) -> bool"""
+        return _xrc.XmlResource_AttachUnknownControl(*args, **kwargs)
+
+    def GetXRCID(*args, **kwargs):
+        """GetXRCID(String str_id) -> int"""
+        return _xrc.XmlResource_GetXRCID(*args, **kwargs)
+
+    GetXRCID = staticmethod(GetXRCID)
+    def GetVersion(*args, **kwargs):
+        """GetVersion(self) -> long"""
+        return _xrc.XmlResource_GetVersion(*args, **kwargs)
+
+    def CompareVersion(*args, **kwargs):
+        """CompareVersion(self, int major, int minor, int release, int revision) -> int"""
+        return _xrc.XmlResource_CompareVersion(*args, **kwargs)
+
+    def Get(*args, **kwargs):
+        """Get() -> XmlResource"""
+        return _xrc.XmlResource_Get(*args, **kwargs)
+
+    Get = staticmethod(Get)
+    def Set(*args, **kwargs):
+        """Set(XmlResource res) -> XmlResource"""
+        return _xrc.XmlResource_Set(*args, **kwargs)
+
+    Set = staticmethod(Set)
+    def GetFlags(*args, **kwargs):
+        """GetFlags(self) -> int"""
+        return _xrc.XmlResource_GetFlags(*args, **kwargs)
+
+    def SetFlags(*args, **kwargs):
+        """SetFlags(self, int flags)"""
+        return _xrc.XmlResource_SetFlags(*args, **kwargs)
+
+
+class XmlResourcePtr(XmlResource):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = XmlResource
+_xrc.XmlResource_swigregister(XmlResourcePtr)
+cvar = _xrc.cvar
+UTF8String = cvar.UTF8String
+StyleString = cvar.StyleString
+SizeString = cvar.SizeString
+PosString = cvar.PosString
+BitmapString = cvar.BitmapString
+IconString = cvar.IconString
+FontString = cvar.FontString
+
+def EmptyXmlResource(*args, **kwargs):
+    """EmptyXmlResource(int flags=XRC_USE_LOCALE) -> XmlResource"""
+    val = _xrc.new_EmptyXmlResource(*args, **kwargs)
+    val.thisown = 1
+    val.InitAllHandlers()
+    return val
+
+def XmlResource_AddSubclassFactory(*args, **kwargs):
+    """XmlResource_AddSubclassFactory(XmlSubclassFactory factory)"""
+    return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)
+
+def XmlResource_GetXRCID(*args, **kwargs):
+    """XmlResource_GetXRCID(String str_id) -> int"""
+    return _xrc.XmlResource_GetXRCID(*args, **kwargs)
+
+def XmlResource_Get(*args, **kwargs):
+    """XmlResource_Get() -> XmlResource"""
+    return _xrc.XmlResource_Get(*args, **kwargs)
+
+def XmlResource_Set(*args, **kwargs):
+    """XmlResource_Set(XmlResource res) -> XmlResource"""
+    return _xrc.XmlResource_Set(*args, **kwargs)
+
+def XRCID(str_id):
+    return XmlResource_GetXRCID(str_id)
+
+def XRCCTRL(window, str_id, *ignoreargs):
+    return window.FindWindowById(XRCID(str_id))
+
+#---------------------------------------------------------------------------
+
+class XmlSubclassFactory(object):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyXmlSubclassFactory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(self) -> XmlSubclassFactory"""
+        newobj = _xrc.new_XmlSubclassFactory(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setCallbackInfo(self, XmlSubclassFactory)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
+        return _xrc.XmlSubclassFactory__setCallbackInfo(*args, **kwargs)
+
+
+class XmlSubclassFactoryPtr(XmlSubclassFactory):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = XmlSubclassFactory
+_xrc.XmlSubclassFactory_swigregister(XmlSubclassFactoryPtr)
+
+#---------------------------------------------------------------------------
+
+XML_ELEMENT_NODE = _xrc.XML_ELEMENT_NODE
+XML_ATTRIBUTE_NODE = _xrc.XML_ATTRIBUTE_NODE
+XML_TEXT_NODE = _xrc.XML_TEXT_NODE
+XML_CDATA_SECTION_NODE = _xrc.XML_CDATA_SECTION_NODE
+XML_ENTITY_REF_NODE = _xrc.XML_ENTITY_REF_NODE
+XML_ENTITY_NODE = _xrc.XML_ENTITY_NODE
+XML_PI_NODE = _xrc.XML_PI_NODE
+XML_COMMENT_NODE = _xrc.XML_COMMENT_NODE
+XML_DOCUMENT_NODE = _xrc.XML_DOCUMENT_NODE
+XML_DOCUMENT_TYPE_NODE = _xrc.XML_DOCUMENT_TYPE_NODE
+XML_DOCUMENT_FRAG_NODE = _xrc.XML_DOCUMENT_FRAG_NODE
+XML_NOTATION_NODE = _xrc.XML_NOTATION_NODE
+XML_HTML_DOCUMENT_NODE = _xrc.XML_HTML_DOCUMENT_NODE
+class XmlProperty(object):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxXmlProperty instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, String name=EmptyString, String value=EmptyString, 
+            XmlProperty next=None) -> XmlProperty
+        """
+        newobj = _xrc.new_XmlProperty(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def GetName(*args, **kwargs):
+        """GetName(self) -> String"""
+        return _xrc.XmlProperty_GetName(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue(self) -> String"""
+        return _xrc.XmlProperty_GetValue(*args, **kwargs)
+
+    def GetNext(*args, **kwargs):
+        """GetNext(self) -> XmlProperty"""
+        return _xrc.XmlProperty_GetNext(*args, **kwargs)
+
+    def SetName(*args, **kwargs):
+        """SetName(self, String name)"""
+        return _xrc.XmlProperty_SetName(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(self, String value)"""
+        return _xrc.XmlProperty_SetValue(*args, **kwargs)
+
+    def SetNext(*args, **kwargs):
+        """SetNext(self, XmlProperty next)"""
+        return _xrc.XmlProperty_SetNext(*args, **kwargs)
+
+
+class XmlPropertyPtr(XmlProperty):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = XmlProperty
+_xrc.XmlProperty_swigregister(XmlPropertyPtr)
+
+class XmlNode(object):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxXmlNode instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, XmlNode parent=None, int type=0, String name=EmptyString, 
+            String content=EmptyString, XmlProperty props=None, 
+            XmlNode next=None) -> XmlNode
+        """
+        newobj = _xrc.new_XmlNode(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_xrc.delete_XmlNode):
+        """__del__(self)"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+
+    def AddChild(*args, **kwargs):
+        """AddChild(self, XmlNode child)"""
+        return _xrc.XmlNode_AddChild(*args, **kwargs)
+
+    def InsertChild(*args, **kwargs):
+        """InsertChild(self, XmlNode child, XmlNode before_node)"""
+        return _xrc.XmlNode_InsertChild(*args, **kwargs)
+
+    def RemoveChild(*args, **kwargs):
+        """RemoveChild(self, XmlNode child) -> bool"""
+        return _xrc.XmlNode_RemoveChild(*args, **kwargs)
+
+    def AddProperty(*args, **kwargs):
+        """AddProperty(self, XmlProperty prop)"""
+        return _xrc.XmlNode_AddProperty(*args, **kwargs)
+
+    def AddPropertyName(*args, **kwargs):
+        """AddPropertyName(self, String name, String value)"""
+        return _xrc.XmlNode_AddPropertyName(*args, **kwargs)
+
+    def DeleteProperty(*args, **kwargs):
+        """DeleteProperty(self, String name) -> bool"""
+        return _xrc.XmlNode_DeleteProperty(*args, **kwargs)
+
+    def GetType(*args, **kwargs):
+        """GetType(self) -> int"""
+        return _xrc.XmlNode_GetType(*args, **kwargs)
+
+    def GetName(*args, **kwargs):
+        """GetName(self) -> String"""
+        return _xrc.XmlNode_GetName(*args, **kwargs)
+
+    def GetContent(*args, **kwargs):
+        """GetContent(self) -> String"""
+        return _xrc.XmlNode_GetContent(*args, **kwargs)
+
+    def GetParent(*args, **kwargs):
+        """GetParent(self) -> XmlNode"""
+        return _xrc.XmlNode_GetParent(*args, **kwargs)
+
+    def GetNext(*args, **kwargs):
+        """GetNext(self) -> XmlNode"""
+        return _xrc.XmlNode_GetNext(*args, **kwargs)
+
+    def GetChildren(*args, **kwargs):
+        """GetChildren(self) -> XmlNode"""
+        return _xrc.XmlNode_GetChildren(*args, **kwargs)
+
+    def GetProperties(*args, **kwargs):
+        """GetProperties(self) -> XmlProperty"""
+        return _xrc.XmlNode_GetProperties(*args, **kwargs)
+
+    def GetPropVal(*args, **kwargs):
+        """GetPropVal(self, String propName, String defaultVal) -> String"""
+        return _xrc.XmlNode_GetPropVal(*args, **kwargs)
+
+    def HasProp(*args, **kwargs):
+        """HasProp(self, String propName) -> bool"""
+        return _xrc.XmlNode_HasProp(*args, **kwargs)
+
+    def SetType(*args, **kwargs):
+        """SetType(self, int type)"""
+        return _xrc.XmlNode_SetType(*args, **kwargs)
+
+    def SetName(*args, **kwargs):
+        """SetName(self, String name)"""
+        return _xrc.XmlNode_SetName(*args, **kwargs)
+
+    def SetContent(*args, **kwargs):
+        """SetContent(self, String con)"""
+        return _xrc.XmlNode_SetContent(*args, **kwargs)
+
+    def SetParent(*args, **kwargs):
+        """SetParent(self, XmlNode parent)"""
+        return _xrc.XmlNode_SetParent(*args, **kwargs)
+
+    def SetNext(*args, **kwargs):
+        """SetNext(self, XmlNode next)"""
+        return _xrc.XmlNode_SetNext(*args, **kwargs)
+
+    def SetChildren(*args, **kwargs):
+        """SetChildren(self, XmlNode child)"""
+        return _xrc.XmlNode_SetChildren(*args, **kwargs)
+
+    def SetProperties(*args, **kwargs):
+        """SetProperties(self, XmlProperty prop)"""
+        return _xrc.XmlNode_SetProperties(*args, **kwargs)
+
+
+class XmlNodePtr(XmlNode):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = XmlNode
+_xrc.XmlNode_swigregister(XmlNodePtr)
+
+def XmlNodeEasy(*args, **kwargs):
+    """XmlNodeEasy(int type, String name, String content=EmptyString) -> XmlNode"""
+    val = _xrc.new_XmlNodeEasy(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+class XmlDocument(_core.Object):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxXmlDocument instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(self, String filename, String encoding=UTF8String) -> XmlDocument"""
+        newobj = _xrc.new_XmlDocument(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_xrc.delete_XmlDocument):
+        """__del__(self)"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+
+    def Load(*args, **kwargs):
+        """Load(self, String filename, String encoding=UTF8String) -> bool"""
+        return _xrc.XmlDocument_Load(*args, **kwargs)
+
+    def LoadFromStream(*args, **kwargs):
+        """LoadFromStream(self, InputStream stream, String encoding=UTF8String) -> bool"""
+        return _xrc.XmlDocument_LoadFromStream(*args, **kwargs)
+
+    def Save(*args, **kwargs):
+        """Save(self, String filename) -> bool"""
+        return _xrc.XmlDocument_Save(*args, **kwargs)
+
+    def SaveToStream(*args, **kwargs):
+        """SaveToStream(self, OutputStream stream) -> bool"""
+        return _xrc.XmlDocument_SaveToStream(*args, **kwargs)
+
+    def IsOk(*args, **kwargs):
+        """IsOk(self) -> bool"""
+        return _xrc.XmlDocument_IsOk(*args, **kwargs)
+
+    def GetRoot(*args, **kwargs):
+        """GetRoot(self) -> XmlNode"""
+        return _xrc.XmlDocument_GetRoot(*args, **kwargs)
+
+    def GetVersion(*args, **kwargs):
+        """GetVersion(self) -> String"""
+        return _xrc.XmlDocument_GetVersion(*args, **kwargs)
+
+    def GetFileEncoding(*args, **kwargs):
+        """GetFileEncoding(self) -> String"""
+        return _xrc.XmlDocument_GetFileEncoding(*args, **kwargs)
+
+    def SetRoot(*args, **kwargs):
+        """SetRoot(self, XmlNode node)"""
+        return _xrc.XmlDocument_SetRoot(*args, **kwargs)
+
+    def SetVersion(*args, **kwargs):
+        """SetVersion(self, String version)"""
+        return _xrc.XmlDocument_SetVersion(*args, **kwargs)
+
+    def SetFileEncoding(*args, **kwargs):
+        """SetFileEncoding(self, String encoding)"""
+        return _xrc.XmlDocument_SetFileEncoding(*args, **kwargs)
+
+
+class XmlDocumentPtr(XmlDocument):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = XmlDocument
+_xrc.XmlDocument_swigregister(XmlDocumentPtr)
+
+def XmlDocumentFromStream(*args, **kwargs):
+    """XmlDocumentFromStream(InputStream stream, String encoding=UTF8String) -> XmlDocument"""
+    val = _xrc.new_XmlDocumentFromStream(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+def EmptyXmlDocument(*args, **kwargs):
+    """EmptyXmlDocument() -> XmlDocument"""
+    val = _xrc.new_EmptyXmlDocument(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+#---------------------------------------------------------------------------
+
+class XmlResourceHandler(_core.Object):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyXmlResourceHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(self) -> XmlResourceHandler"""
+        newobj = _xrc.new_XmlResourceHandler(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setCallbackInfo(self, XmlResourceHandler)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
+        return _xrc.XmlResourceHandler__setCallbackInfo(*args, **kwargs)
+
+    def CreateResource(*args, **kwargs):
+        """CreateResource(self, XmlNode node, Object parent, Object instance) -> Object"""
+        return _xrc.XmlResourceHandler_CreateResource(*args, **kwargs)
+
+    def SetParentResource(*args, **kwargs):
+        """SetParentResource(self, XmlResource res)"""
+        return _xrc.XmlResourceHandler_SetParentResource(*args, **kwargs)
+
+    def GetResource(*args, **kwargs):
+        """GetResource(self) -> XmlResource"""
+        return _xrc.XmlResourceHandler_GetResource(*args, **kwargs)
+
+    def GetNode(*args, **kwargs):
+        """GetNode(self) -> XmlNode"""
+        return _xrc.XmlResourceHandler_GetNode(*args, **kwargs)
+
+    def GetClass(*args, **kwargs):
+        """GetClass(self) -> String"""
+        return _xrc.XmlResourceHandler_GetClass(*args, **kwargs)
+
+    def GetParent(*args, **kwargs):
+        """GetParent(self) -> Object"""
+        return _xrc.XmlResourceHandler_GetParent(*args, **kwargs)
+
+    def GetInstance(*args, **kwargs):
+        """GetInstance(self) -> Object"""
+        return _xrc.XmlResourceHandler_GetInstance(*args, **kwargs)
+
+    def GetParentAsWindow(*args, **kwargs):
+        """GetParentAsWindow(self) -> Window"""
+        return _xrc.XmlResourceHandler_GetParentAsWindow(*args, **kwargs)
+
+    def GetInstanceAsWindow(*args, **kwargs):
+        """GetInstanceAsWindow(self) -> Window"""
+        return _xrc.XmlResourceHandler_GetInstanceAsWindow(*args, **kwargs)
+
+    def IsOfClass(*args, **kwargs):
+        """IsOfClass(self, XmlNode node, String classname) -> bool"""
+        return _xrc.XmlResourceHandler_IsOfClass(*args, **kwargs)
+
+    def GetNodeContent(*args, **kwargs):
+        """GetNodeContent(self, XmlNode node) -> String"""
+        return _xrc.XmlResourceHandler_GetNodeContent(*args, **kwargs)
+
+    def HasParam(*args, **kwargs):
+        """HasParam(self, String param) -> bool"""
+        return _xrc.XmlResourceHandler_HasParam(*args, **kwargs)
+
+    def GetParamNode(*args, **kwargs):
+        """GetParamNode(self, String param) -> XmlNode"""
+        return _xrc.XmlResourceHandler_GetParamNode(*args, **kwargs)
+
+    def GetParamValue(*args, **kwargs):
+        """GetParamValue(self, String param) -> String"""
+        return _xrc.XmlResourceHandler_GetParamValue(*args, **kwargs)
+
+    def AddStyle(*args, **kwargs):
+        """AddStyle(self, String name, int value)"""
+        return _xrc.XmlResourceHandler_AddStyle(*args, **kwargs)
+
+    def AddWindowStyles(*args, **kwargs):
+        """AddWindowStyles(self)"""
+        return _xrc.XmlResourceHandler_AddWindowStyles(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle(self, String param=StyleString, int defaults=0) -> int"""
+        return _xrc.XmlResourceHandler_GetStyle(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText(self, String param, bool translate=True) -> String"""
+        return _xrc.XmlResourceHandler_GetText(*args, **kwargs)
+
+    def GetID(*args, **kwargs):
+        """GetID(self) -> int"""
+        return _xrc.XmlResourceHandler_GetID(*args, **kwargs)
+
+    def GetName(*args, **kwargs):
+        """GetName(self) -> String"""
+        return _xrc.XmlResourceHandler_GetName(*args, **kwargs)
+
+    def GetBool(*args, **kwargs):
+        """GetBool(self, String param, bool defaultv=False) -> bool"""
+        return _xrc.XmlResourceHandler_GetBool(*args, **kwargs)
+
+    def GetLong(*args, **kwargs):
+        """GetLong(self, String param, long defaultv=0) -> long"""
+        return _xrc.XmlResourceHandler_GetLong(*args, **kwargs)
+
+    def GetColour(*args, **kwargs):
+        """GetColour(self, String param) -> Colour"""
+        return _xrc.XmlResourceHandler_GetColour(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize(self, String param=SizeString) -> Size"""
+        return _xrc.XmlResourceHandler_GetSize(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition(self, String param=PosString) -> Point"""
+        return _xrc.XmlResourceHandler_GetPosition(*args, **kwargs)
+
+    def GetDimension(*args, **kwargs):
+        """GetDimension(self, String param, int defaultv=0) -> int"""
+        return _xrc.XmlResourceHandler_GetDimension(*args, **kwargs)
+
+    def GetBitmap(*args, **kwargs):
+        """
+        GetBitmap(self, String param=BitmapString, wxArtClient defaultArtClient=wxART_OTHER, 
+            Size size=DefaultSize) -> Bitmap
+        """
+        return _xrc.XmlResourceHandler_GetBitmap(*args, **kwargs)
+
+    def GetIcon(*args, **kwargs):
+        """
+        GetIcon(self, String param=IconString, wxArtClient defaultArtClient=wxART_OTHER, 
+            Size size=DefaultSize) -> Icon
+        """
+        return _xrc.XmlResourceHandler_GetIcon(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont(self, String param=FontString) -> Font"""
+        return _xrc.XmlResourceHandler_GetFont(*args, **kwargs)
+
+    def SetupWindow(*args, **kwargs):
+        """SetupWindow(self, Window wnd)"""
+        return _xrc.XmlResourceHandler_SetupWindow(*args, **kwargs)
+
+    def CreateChildren(*args, **kwargs):
+        """CreateChildren(self, Object parent, bool this_hnd_only=False)"""
+        return _xrc.XmlResourceHandler_CreateChildren(*args, **kwargs)
+
+    def CreateChildrenPrivately(*args, **kwargs):
+        """CreateChildrenPrivately(self, Object parent, XmlNode rootnode=None)"""
+        return _xrc.XmlResourceHandler_CreateChildrenPrivately(*args, **kwargs)
+
+    def CreateResFromNode(*args, **kwargs):
+        """CreateResFromNode(self, XmlNode node, Object parent, Object instance=None) -> Object"""
+        return _xrc.XmlResourceHandler_CreateResFromNode(*args, **kwargs)
+
+    def GetCurFileSystem(*args, **kwargs):
+        """GetCurFileSystem(self) -> FileSystem"""
+        return _xrc.XmlResourceHandler_GetCurFileSystem(*args, **kwargs)
+
+
+class XmlResourceHandlerPtr(XmlResourceHandler):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = XmlResourceHandler
+_xrc.XmlResourceHandler_swigregister(XmlResourceHandlerPtr)
+
+#----------------------------------------------------------------------------
+# The global was removed  in favor of static accessor functions.  This is for
+# backwards compatibility:
+
+TheXmlResource = XmlResource_Get()
+
+
+#----------------------------------------------------------------------------
+#  Create a factory for handling the subclass property of the object tag.
+
+
+def _my_import(name):
+    mod = __import__(name)
+    components = name.split('.')
+    for comp in components[1:]:
+        mod = getattr(mod, comp)
+    return mod
+
+
+class XmlSubclassFactory_Python(XmlSubclassFactory):
+    def __init__(self):
+        XmlSubclassFactory.__init__(self)
+
+    def Create(self, className):
+        assert className.find('.') != -1, "Module name must be specified!"
+        mname = className[:className.rfind('.')]
+        cname = className[className.rfind('.')+1:]
+        module = _my_import(mname)
+        klass = getattr(module, cname)
+        inst = klass()
+        return inst
+
+
+XmlResource_AddSubclassFactory(XmlSubclassFactory_Python())
+
+#----------------------------------------------------------------------------
+
+

wxPython/wxPython/_controls.py

@@ -227,6 +227,19 @@ wxListbookEvent = wx._controls.ListbookEvent
 wxListbookEventPtr = wx._controls.ListbookEventPtr
 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED
 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING
+wxCHB_DEFAULT = wx._controls.CHB_DEFAULT
+wxCHB_TOP = wx._controls.CHB_TOP
+wxCHB_BOTTOM = wx._controls.CHB_BOTTOM
+wxCHB_LEFT = wx._controls.CHB_LEFT
+wxCHB_RIGHT = wx._controls.CHB_RIGHT
+wxCHB_ALIGN_MASK = wx._controls.CHB_ALIGN_MASK
+wxChoicebook = wx._controls.Choicebook
+wxChoicebookPtr = wx._controls.ChoicebookPtr
+wxPreChoicebook = wx._controls.PreChoicebook
+wxChoicebookEvent = wx._controls.ChoicebookEvent
+wxChoicebookEventPtr = wx._controls.ChoicebookEventPtr
+wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED
+wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING
 wxBookCtrlSizer = wx._controls.BookCtrlSizer
 wxBookCtrlSizerPtr = wx._controls.BookCtrlSizerPtr
 wxNotebookSizer = wx._controls.NotebookSizer

wxPython/wxPython/_core.py

@@ -964,6 +964,10 @@ wxWakeUpIdle = wx._core.WakeUpIdle
 wxPostEvent = wx._core.PostEvent
 wxApp_CleanUp = wx._core.App_CleanUp
 wxGetApp = wx._core.GetApp
+wxEventLoop = wx._core.EventLoop
+wxEventLoopPtr = wx._core.EventLoopPtr
+wxEventLoop_GetActive = wx._core.EventLoop_GetActive
+wxEventLoop_SetActive = wx._core.EventLoop_SetActive
 wxAcceleratorEntry = wx._core.AcceleratorEntry
 wxAcceleratorEntryPtr = wx._core.AcceleratorEntryPtr
 wxAcceleratorTable = wx._core.AcceleratorTable

wxPython/wxPython/_windows.py

@@ -274,6 +274,21 @@ wxPRINT_MODE_PREVIEW = wx._windows.PRINT_MODE_PREVIEW
 wxPRINT_MODE_FILE = wx._windows.PRINT_MODE_FILE
 wxPRINT_MODE_PRINTER = wx._windows.PRINT_MODE_PRINTER
 wxPRINT_MODE_STREAM = wx._windows.PRINT_MODE_STREAM
+wxPRINTBIN_DEFAULT = wx._windows.PRINTBIN_DEFAULT
+wxPRINTBIN_ONLYONE = wx._windows.PRINTBIN_ONLYONE
+wxPRINTBIN_LOWER = wx._windows.PRINTBIN_LOWER
+wxPRINTBIN_MIDDLE = wx._windows.PRINTBIN_MIDDLE
+wxPRINTBIN_MANUAL = wx._windows.PRINTBIN_MANUAL
+wxPRINTBIN_ENVELOPE = wx._windows.PRINTBIN_ENVELOPE
+wxPRINTBIN_ENVMANUAL = wx._windows.PRINTBIN_ENVMANUAL
+wxPRINTBIN_AUTO = wx._windows.PRINTBIN_AUTO
+wxPRINTBIN_TRACTOR = wx._windows.PRINTBIN_TRACTOR
+wxPRINTBIN_SMALLFMT = wx._windows.PRINTBIN_SMALLFMT
+wxPRINTBIN_LARGEFMT = wx._windows.PRINTBIN_LARGEFMT
+wxPRINTBIN_LARGECAPACITY = wx._windows.PRINTBIN_LARGECAPACITY
+wxPRINTBIN_CASSETTE = wx._windows.PRINTBIN_CASSETTE
+wxPRINTBIN_FORMSOURCE = wx._windows.PRINTBIN_FORMSOURCE
+wxPRINTBIN_USER = wx._windows.PRINTBIN_USER
 wxPrintData = wx._windows.PrintData
 wxPrintDataPtr = wx._windows.PrintDataPtr
 wxPageSetupDialogData = wx._windows.PageSetupDialogData