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

@@ -3094,7 +3094,7 @@ class NotebookPage(wx.Panel):
         wx.Panel.__init__(self, parent, id, pos, size, style, name)
         self.child = None
         EVT_SIZE(self, self.OnSize)
-        
+
     def OnSize(self, evt):
         if self.child is None:
             children = self.GetChildren()
@@ -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=''):
-    if isinstance(a, wx.Image):
-        __wxMemoryFSHandler_AddFile_wxImage(filename, a, b)
-    elif isinstance(a, wx.Bitmap):
-        __wxMemoryFSHandler_AddFile_wxBitmap(filename, a, b)
-    elif type(a) == str:
-        __wxMemoryFSHandler_AddFile_Data(filename, a)
-    else: raise TypeError, 'wx.Image, wx.Bitmap or string expected'
+def MemoryFSHandler_AddFile(filename, dataItem, imgType=-1):
+    """
+    Add 'file' to the memory filesystem.  The dataItem parameter can
+    either be a `wx.Bitmap`, `wx.Image` or a string that can contain
+    arbitrary data.  If a bitmap or image is used then the imgType
+    parameter should specify what kind of image file it should be
+    written as, wx.BITMAP_TYPE_PNG, etc.
+    """
+    if isinstance(dataItem, wx.Image):
+        __wxMemoryFSHandler_AddFile_wxImage(filename, dataItem, imgType)
+    elif isinstance(dataItem, wx.Bitmap):
+        __wxMemoryFSHandler_AddFile_wxBitmap(filename, dataItem, imgType)
+    elif type(dataItem) == str:
+        __wxMemoryFSHandler_AddFile_Data(filename, dataItem)
+    else:
+        raise TypeError, 'wx.Image, wx.Bitmap or string expected'
 
 class MemoryFSHandler(CPPFileSystemHandler):
     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/_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/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