X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..4087064a382ca938e9b7889a9aafd6340b54d6c5:/wxPython/src/gtk/wx.cpp?ds=sidebyside diff --git a/wxPython/src/gtk/wx.cpp b/wxPython/src/gtk/wx.cpp index 641527dc1e..7ecfa961fa 100644 --- a/wxPython/src/gtk/wx.cpp +++ b/wxPython/src/gtk/wx.cpp @@ -1,9 +1,9 @@ /* - * FILE : gtk/wx.cpp + * FILE : src/gtk/wx.cpp * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 810) + * Version 1.1 (Build 883) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -27,19 +27,21 @@ # define SWIGEXPORT(a) __declspec(dllexport) a # else # if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export +# define SWIGEXPORT(a) a _export # else -# define SWIGEXPORT(a) a +# define SWIGEXPORT(a) a # endif # endif #else -# define SWIGEXPORT(a) a +# define SWIGEXPORT(a) a #endif +#include "Python.h" + #ifdef __cplusplus extern "C" { #endif -#include "Python.h" + extern void SWIG_MakePtr(char *, void *, char *); extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *)); extern char *SWIG_GetPtr(char *, void **, char *); @@ -55,54 +57,38 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" -static PyObject* l_output_helper(PyObject* target, PyObject* o) { - PyObject* o2; - PyObject* o3; - if (!target) { - target = o; - } else if (target == Py_None) { - Py_DECREF(Py_None); - target = o; - } else { - if (!PyList_Check(target)) { - o2 = target; - target = PyList_New(0); - PyList_Append(target, o2); - Py_XDECREF(o2); - } - PyList_Append(target,o); - Py_XDECREF(o); - } - return target; -} static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); Py_DECREF(o3); } return target; } -static char* wxStringErrorMsg = "string type is required for parameter"; +#if PYTHON_API_VERSION >= 1009 + static char* wxStringErrorMsg = "String or Unicode type required"; +#else + static char* wxStringErrorMsg = "string type is required for parameter"; +#endif #include @@ -614,10 +600,16 @@ PyObject *ptrfree(PyObject *_PTRVALUE) { } + wxPyApp* wxGetApp() { + return wxPythonApp; + } + void wxApp_CleanUp() { __wxCleanup(); } + + extern "C" SWIGEXPORT(void) initwindowsc(); extern "C" SWIGEXPORT(void) initwindows2c(); extern "C" SWIGEXPORT(void) initeventsc(); @@ -635,11 +627,54 @@ extern "C" SWIGEXPORT(void) initimagec(); extern "C" SWIGEXPORT(void) initprintfwc(); extern "C" SWIGEXPORT(void) initsizersc(); extern "C" SWIGEXPORT(void) initclip_dndc(); -extern "C" SWIGEXPORT(void) initgridc(); -extern "C" SWIGEXPORT(void) initutilsc(); -extern "C" SWIGEXPORT(void) inithtmlc(); -extern "C" SWIGEXPORT(void) inithtmlhelpc(); -extern "C" SWIGEXPORT(void) initcalendarc(); +extern "C" SWIGEXPORT(void) initstreamsc(); +extern "C" SWIGEXPORT(void) initfilesysc(); + + + +// Export a C API in a struct. Other modules will be able to load this from +// the wxc module and will then have safe access to these functions, even if +// in another shared library. +static wxPyCoreAPI API = { + SWIG_MakePtr, + SWIG_GetPtr, + SWIG_GetPtrObj, + SWIG_RegisterMapping, + SWIG_addvarlink, + SWIG_newvarlink, + + wxPySaveThread, + wxPyRestoreThread, + wxPyConstructObject, + wxPy_ConvertList, + + byte_LIST_helper, + int_LIST_helper, + long_LIST_helper, + string_LIST_helper, + wxPoint_LIST_helper, + wxBitmap_LIST_helper, + wxString_LIST_helper, + wxAcceleratorEntry_LIST_helper, + + wxSize_helper, + wxPoint_helper, + wxRealPoint_helper, + wxRect_helper, + wxColour_helper, + + wxPyCBH_setSelf, + wxPyCBH_findCallback, + wxPyCBH_callCallback, + wxPyCBH_callCallbackObj, + wxPyCBH_delete, + + wxPyClassExists, + wxPyMake_wxObject, + wxPyPtrTypeMap_Add, +}; + + #ifdef __cplusplus extern "C" { #endif @@ -662,6 +697,7 @@ static PyObject *_wrap_ptrcast(PyObject *self, PyObject *args, PyObject *kwargs) _result = (PyObject *)ptrcast(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } @@ -688,6 +724,7 @@ static PyObject *_wrap_ptrvalue(PyObject *self, PyObject *args, PyObject *kwargs _result = (PyObject *)ptrvalue(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } @@ -719,6 +756,7 @@ static PyObject *_wrap_ptrset(PyObject *self, PyObject *args, PyObject *kwargs) _result = (PyObject *)ptrset(_arg0,_arg1,_arg2,_arg3); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } @@ -746,6 +784,7 @@ static PyObject *_wrap_ptrcreate(PyObject *self, PyObject *args, PyObject *kwarg _result = (PyObject *)ptrcreate(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } @@ -770,6 +809,7 @@ static PyObject *_wrap_ptrfree(PyObject *self, PyObject *args, PyObject *kwargs) _result = (PyObject *)ptrfree(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } @@ -795,6 +835,7 @@ static PyObject *_wrap_ptradd(PyObject *self, PyObject *args, PyObject *kwargs) _result = (PyObject *)ptradd(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } @@ -815,57 +856,66 @@ static PyObject *_wrap_ptrmap(PyObject *self, PyObject *args, PyObject *kwargs) ptrmap(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; } -static int _wrap_wxPyDefaultPosition_set(PyObject *val) { - wxPoint * temp; +static int _wrap_wxDefaultPosition_set(PyObject *val) { - if (val) { - if (val == Py_None) { temp = NULL; } - else if (SWIG_GetPtrObj(val,(void **) &temp,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultPosition. Expected _wxPoint_p."); - return 1; - } - } - wxPyDefaultPosition = *temp; - return 0; + PyErr_SetString(PyExc_TypeError,"Variable wxDefaultPosition is read-only."); + return 1; } -static PyObject *_wrap_wxPyDefaultPosition_get() { +static PyObject *_wrap_wxDefaultPosition_get() { PyObject * pyobj; char ptemp[128]; - SWIG_MakePtr(ptemp,(char *) &wxPyDefaultPosition,"_wxPoint_p"); + SWIG_MakePtr(ptemp,(char *) &wxDefaultPosition,"_wxPoint_p"); pyobj = PyString_FromString(ptemp); return pyobj; } -static int _wrap_wxPyDefaultSize_set(PyObject *val) { - wxSize * temp; +static int _wrap_wxDefaultSize_set(PyObject *val) { - if (val) { - if (val == Py_None) { temp = NULL; } - else if (SWIG_GetPtrObj(val,(void **) &temp,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultSize. Expected _wxSize_p."); - return 1; - } - } - wxPyDefaultSize = *temp; - return 0; + PyErr_SetString(PyExc_TypeError,"Variable wxDefaultSize is read-only."); + return 1; } -static PyObject *_wrap_wxPyDefaultSize_get() { +static PyObject *_wrap_wxDefaultSize_get() { PyObject * pyobj; char ptemp[128]; - SWIG_MakePtr(ptemp,(char *) &wxPyDefaultSize,"_wxSize_p"); + SWIG_MakePtr(ptemp,(char *) &wxDefaultSize,"_wxSize_p"); pyobj = PyString_FromString(ptemp); return pyobj; } +static PyObject *_wrap_wxGetApp(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyApp * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxGetApp",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxPyApp *)wxGetApp(); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyApp_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + static PyObject *_wrap_wxApp_CleanUp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; char *_kwnames[] = { NULL }; @@ -891,6 +941,14 @@ static void *SwigwxPyAppTowxEvtHandler(void *ptr) { return (void *) dest; } +static void *SwigwxPyAppTowxObject(void *ptr) { + wxPyApp *src; + wxObject *dest; + src = (wxPyApp *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + static wxPyApp *new_wxPyApp() { wxPythonApp = new wxPyApp(); return wxPythonApp; @@ -1072,7 +1130,6 @@ static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *self, PyObject *args, PyOb wxPyApp * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_GetTopWindow",_kwnames,&_argo0)) @@ -1089,13 +1146,7 @@ static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *self, PyObject *args, PyOb _result = (wxWindow *)wxPyApp_GetTopWindow(_arg0); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -1340,11 +1391,22 @@ static PyObject *_wrap_wxPyApp_SetAppName(PyObject *self, PyObject *args, PyObje } } { +#if PYTHON_API_VERSION >= 1009 + char* tmpPtr; int tmpSize; + if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1) + return NULL; + _arg1 = new wxString(tmpPtr, tmpSize); +#else if (!PyString_Check(_obj1)) { PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); return NULL; } - _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); + _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1)); +#endif } { wxPy_BEGIN_ALLOW_THREADS; @@ -1380,11 +1442,22 @@ static PyObject *_wrap_wxPyApp_SetClassName(PyObject *self, PyObject *args, PyOb } } { +#if PYTHON_API_VERSION >= 1009 + char* tmpPtr; int tmpSize; + if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1) + return NULL; + _arg1 = new wxString(tmpPtr, tmpSize); +#else if (!PyString_Check(_obj1)) { PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); return NULL; } - _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); + _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1)); +#endif } { wxPy_BEGIN_ALLOW_THREADS; @@ -1514,11 +1587,22 @@ static PyObject *_wrap_wxPyApp_SetVendorName(PyObject *self, PyObject *args, PyO } } { +#if PYTHON_API_VERSION >= 1009 + char* tmpPtr; int tmpSize; + if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1) + return NULL; + _arg1 = new wxString(tmpPtr, tmpSize); +#else if (!PyString_Check(_obj1)) { PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); return NULL; } - _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); + _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1)); +#endif } { wxPy_BEGIN_ALLOW_THREADS; @@ -1619,6 +1703,7 @@ static PyMethodDef wxcMethods[] = { { "delete_wxPyApp", (PyCFunction) _wrap_delete_wxPyApp, METH_VARARGS | METH_KEYWORDS }, { "new_wxPyApp", (PyCFunction) _wrap_new_wxPyApp, METH_VARARGS | METH_KEYWORDS }, { "wxApp_CleanUp", (PyCFunction) _wrap_wxApp_CleanUp, METH_VARARGS | METH_KEYWORDS }, + { "wxGetApp", (PyCFunction) _wrap_wxGetApp, METH_VARARGS | METH_KEYWORDS }, { "_wxSetDictionary", (PyCFunction) __wxSetDictionary, METH_VARARGS | METH_KEYWORDS }, { "_wxStart", (PyCFunction) __wxStart, METH_VARARGS | METH_KEYWORDS }, { "ptrmap", (PyCFunction) _wrap_ptrmap, METH_VARARGS | METH_KEYWORDS }, @@ -1637,18 +1722,7 @@ static PyMethodDef wxcMethods[] = { * This table is used by the pointer type-checker */ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { - { "_wxAcceleratorTable","_class_wxAcceleratorTable",0}, - { "_wxEvent","_class_wxEvent",0}, - { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, - { "_wxMenuEvent","_class_wxMenuEvent",0}, - { "_class_wxJPEGHandler","_wxJPEGHandler",0}, - { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0}, - { "_wxBitmapDataObject","_class_wxBitmapDataObject",0}, - { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, - { "_wxBMPHandler","_class_wxBMPHandler",0}, - { "_wxImage","_class_wxImage",0}, - { "_wxFlexGridSizer","_class_wxFlexGridSizer",0}, { "_wxPrintQuality","_wxCoord",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, @@ -1657,362 +1731,92 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_uint",0}, { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, - { "_class_wxCustomDataObject","_wxCustomDataObject",0}, - { "_wxFontData","_class_wxFontData",0}, - { "_class_wxRegionIterator","_wxRegionIterator",0}, - { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0}, - { "_class_wxMenuBar","_wxMenuBar",0}, - { "_class_wxPyTreeItemData","_wxPyTreeItemData",0}, - { "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0}, + { "_wxPrintQuality","_time_t",0}, { "_class_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler}, { "_class_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler}, - { "_class_wxEvtHandler","_wxEvtHandler",0}, - { "_wxPaintEvent","_class_wxPaintEvent",0}, - { "_wxGIFHandler","_class_wxGIFHandler",0}, - { "_wxPySizer","_class_wxPySizer",0}, - { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, - { "_wxCursor","_class_wxCursor",0}, - { "_wxNotifyEvent","_class_wxNotifyEvent",0}, - { "_wxPyTreeCtrl","_class_wxPyTreeCtrl",0}, - { "_wxImageHandler","_class_wxImageHandler",0}, - { "_class_wxToolBarBase","_wxToolBarBase",0}, - { "_wxMask","_class_wxMask",0}, - { "_wxToolTip","_class_wxToolTip",0}, - { "_wxPNGHandler","_class_wxPNGHandler",0}, - { "_class_wxColourData","_wxColourData",0}, - { "_class_wxPageSetupDialogData","_wxPageSetupDialogData",0}, - { "_wxPrinter","_class_wxPrinter",0}, - { "_wxPen","_class_wxPen",0}, - { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0}, - { "_class_wxNotebookSizer","_wxNotebookSizer",0}, { "_byte","_unsigned_char",0}, - { "_wxDataObject","_class_wxDataObject",0}, - { "_class_wxPyFontEnumerator","_wxPyFontEnumerator",0}, - { "_wxStaticBox","_class_wxStaticBox",0}, - { "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0}, - { "_wxPyDropSource","_class_wxPyDropSource",0}, - { "_wxChoice","_class_wxChoice",0}, - { "_wxSlider","_class_wxSlider",0}, - { "_wxNotebookEvent","_class_wxNotebookEvent",0}, - { "_wxPyPrintout","_class_wxPyPrintout",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, - { "_wxImageList","_class_wxImageList",0}, - { "_wxDataObjectSimple","_class_wxDataObjectSimple",0}, - { "_wxDropFilesEvent","_class_wxDropFilesEvent",0}, - { "_wxBitmapButton","_class_wxBitmapButton",0}, - { "_wxSashWindow","_class_wxSashWindow",0}, - { "_class_wxSizer","_wxSizer",0}, - { "_class_wxTIFFHandler","_wxTIFFHandler",0}, - { "_class_wxPrintDialogData","_wxPrintDialogData",0}, - { "_wxGridSizer","_class_wxGridSizer",0}, - { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, - { "_class_wxClipboard","_wxClipboard",0}, - { "_class_wxGauge","_wxGauge",0}, - { "_class_wxSashEvent","_wxSashEvent",0}, - { "_wxDC","_class_wxDC",0}, - { "_wxSizerItem","_class_wxSizerItem",0}, - { "_class_wxBitmapDataObject","_wxBitmapDataObject",0}, - { "_wxListEvent","_class_wxListEvent",0}, - { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0}, - { "_wxProgressDialog","_class_wxProgressDialog",0}, - { "_class_wxBMPHandler","_wxBMPHandler",0}, - { "_wxPrintPreview","_class_wxPrintPreview",0}, - { "_class_wxFlexGridSizer","_wxFlexGridSizer",0}, - { "_wxSpinEvent","_class_wxSpinEvent",0}, - { "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0}, + { "_class_wxObject","_class_wxPyApp",SwigwxPyAppTowxObject}, + { "_class_wxObject","_wxPyApp",SwigwxPyAppTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, + { "_size_t","_time_t",0}, { "_size_t","_unsigned_int",0}, { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, - { "_class_wxRealPoint","_wxRealPoint",0}, - { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0}, - { "_wxPNMHandler","_class_wxPNMHandler",0}, - { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0}, - { "_class_wxMenuItem","_wxMenuItem",0}, - { "_class_wxPaintEvent","_wxPaintEvent",0}, - { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0}, - { "_class_wxStatusBar","_wxStatusBar",0}, - { "_class_wxGIFHandler","_wxGIFHandler",0}, - { "_class_wxPySizer","_wxPySizer",0}, - { "_class_wxPostScriptDC","_wxPostScriptDC",0}, - { "_wxPanel","_class_wxPanel",0}, - { "_wxInitDialogEvent","_class_wxInitDialogEvent",0}, - { "_wxCheckBox","_class_wxCheckBox",0}, - { "_class_wxPyTreeCtrl","_wxPyTreeCtrl",0}, - { "_wxPyEvent","_class_wxPyEvent",0}, - { "_wxTextCtrl","_class_wxTextCtrl",0}, - { "_class_wxMask","_wxMask",0}, - { "_wxTextDataObject","_class_wxTextDataObject",0}, - { "_class_wxKeyEvent","_wxKeyEvent",0}, - { "_class_wxToolTip","_wxToolTip",0}, - { "_class_wxPNGHandler","_wxPNGHandler",0}, - { "_wxColour","_class_wxColour",0}, - { "_class_wxDialog","_wxDialog",0}, - { "_wxBusyCursor","_class_wxBusyCursor",0}, - { "_wxPageSetupDialog","_class_wxPageSetupDialog",0}, - { "_class_wxPrinter","_wxPrinter",0}, - { "_class_wxFileDataObject","_wxFileDataObject",0}, - { "_wxIdleEvent","_class_wxIdleEvent",0}, - { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0}, - { "_wxToolBar","_class_wxToolBar",0}, - { "_class_wxDataObject","_wxDataObject",0}, - { "_wxCaret","_class_wxCaret",0}, - { "_wxStaticLine","_class_wxStaticLine",0}, - { "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0}, - { "_wxBrush","_class_wxBrush",0}, - { "_wxMiniFrame","_class_wxMiniFrame",0}, - { "_class_wxNotebookEvent","_wxNotebookEvent",0}, - { "_class_wxPyPrintout","_wxPyPrintout",0}, - { "_wxDataFormat","_class_wxDataFormat",0}, - { "_class_wxDataObjectSimple","_wxDataObjectSimple",0}, - { "_class_wxSashWindow","_wxSashWindow",0}, - { "_wxShowEvent","_class_wxShowEvent",0}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, + { "_uint","_time_t",0}, { "_uint","_size_t",0}, { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, - { "_wxPyValidator","_class_wxPyValidator",0}, - { "_class_wxEvent","_wxEvent",0}, - { "_wxCheckListBox","_class_wxCheckListBox",0}, - { "_wxSplitterEvent","_class_wxSplitterEvent",0}, - { "_wxRect","_class_wxRect",0}, - { "_wxCommandEvent","_class_wxCommandEvent",0}, - { "_wxSizeEvent","_class_wxSizeEvent",0}, - { "_class_wxImage","_wxImage",0}, - { "_wxPoint","_class_wxPoint",0}, - { "_class_wxSashLayoutWindow","_wxSashLayoutWindow",0}, - { "_class_wxButton","_wxButton",0}, - { "_wxRadioBox","_class_wxRadioBox",0}, - { "_class_wxFontData","_wxFontData",0}, - { "_class_wxPNMHandler","_wxPNMHandler",0}, - { "_wxBoxSizer","_class_wxBoxSizer",0}, { "_char","_wxChar",0}, - { "_wxBitmap","_class_wxBitmap",0}, - { "_wxPrintDialog","_class_wxPrintDialog",0}, - { "_wxWindowDC","_class_wxWindowDC",0}, - { "_wxTimerEvent","_class_wxTimerEvent",0}, - { "_wxPyTimer","_class_wxPyTimer",0}, - { "_wxScrollBar","_class_wxScrollBar",0}, - { "_wxSpinButton","_class_wxSpinButton",0}, - { "_wxColourDialog","_class_wxColourDialog",0}, - { "_wxPrintData","_class_wxPrintData",0}, - { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, - { "_class_wxNotifyEvent","_wxNotifyEvent",0}, - { "_wxMessageDialog","_class_wxMessageDialog",0}, - { "_class_wxValidator","_wxValidator",0}, - { "_class_wxPyEvent","_wxPyEvent",0}, - { "_wxTextEntryDialog","_class_wxTextEntryDialog",0}, - { "_class_wxIconizeEvent","_wxIconizeEvent",0}, - { "_class_wxStaticBitmap","_wxStaticBitmap",0}, - { "_class_wxBusyCursor","_wxBusyCursor",0}, - { "_wxToolBarSimple","_class_wxToolBarSimple",0}, - { "_wxMDIChildFrame","_class_wxMDIChildFrame",0}, - { "_wxListItem","_class_wxListItem",0}, - { "_class_wxToolBar","_wxToolBar",0}, - { "_wxDropTarget","_class_wxDropTarget",0}, - { "_class_wxStaticLine","_wxStaticLine",0}, - { "_wxScrollEvent","_class_wxScrollEvent",0}, - { "_wxToolBarToolBase","_class_wxToolBarToolBase",0}, - { "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, - { "_class_wxRegion","_wxRegion",0}, - { "_class_wxDataFormat","_wxDataFormat",0}, - { "_class_wxDropFilesEvent","_wxDropFilesEvent",0}, - { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0}, - { "_class_wxPreviewFrame","_wxPreviewFrame",0}, - { "_wxStaticText","_class_wxStaticText",0}, - { "_wxFont","_class_wxFont",0}, - { "_class_wxPyDropTarget","_wxPyDropTarget",0}, - { "_wxCloseEvent","_class_wxCloseEvent",0}, - { "_class_wxSplitterEvent","_wxSplitterEvent",0}, - { "_wxNotebook","_class_wxNotebook",0}, { "_unsigned_long","_long",0}, - { "_class_wxRect","_wxRect",0}, - { "_class_wxDC","_wxDC",0}, - { "_wxScrollWinEvent","_class_wxScrollWinEvent",0}, - { "_wxGenericDragImage","_class_wxGenericDragImage",0}, - { "_class_wxProgressDialog","_wxProgressDialog",0}, - { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0}, - { "_wxPyApp","_class_wxPyApp",0}, - { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0}, - { "_wxMDIParentFrame","_class_wxMDIParentFrame",0}, - { "_class_wxTreeEvent","_wxTreeEvent",0}, - { "_class_wxDirDialog","_wxDirDialog",0}, - { "_wxFocusEvent","_class_wxFocusEvent",0}, - { "_wxMaximizeEvent","_class_wxMaximizeEvent",0}, - { "_class_wxTimerEvent","_wxTimerEvent",0}, - { "_class_wxPyTimer","_wxPyTimer",0}, - { "_class_wxSpinButton","_wxSpinButton",0}, - { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0}, - { "_class_wxPanel","_wxPanel",0}, - { "_class_wxCheckBox","_wxCheckBox",0}, - { "_wxComboBox","_class_wxComboBox",0}, - { "_wxRadioButton","_class_wxRadioButton",0}, - { "_class_wxMessageDialog","_wxMessageDialog",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, - { "_class_wxTextCtrl","_wxTextCtrl",0}, - { "_class_wxListItemAttr","_wxListItemAttr",0}, - { "_wxLayoutConstraints","_class_wxLayoutConstraints",0}, - { "_class_wxTextDataObject","_wxTextDataObject",0}, - { "_wxMenu","_class_wxMenu",0}, - { "_class_wxMoveEvent","_wxMoveEvent",0}, - { "_wxListBox","_class_wxListBox",0}, - { "_wxScreenDC","_class_wxScreenDC",0}, - { "_class_wxToolBarSimple","_wxToolBarSimple",0}, - { "_class_wxMDIChildFrame","_wxMDIChildFrame",0}, + { "_WXTYPE","_wxDateTime_t",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, - { "_wxFileDialog","_class_wxFileDialog",0}, - { "_class_wxDropTarget","_wxDropTarget",0}, - { "_class_wxCaret","_wxCaret",0}, - { "_class_wxMDIClientWindow","_wxMDIClientWindow",0}, - { "_class_wxBrush","_wxBrush",0}, - { "_wxTipProvider","_class_wxTipProvider",0}, + { "_unsigned_short","_wxDateTime_t",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, - { "_class_wxWindow","_wxWindow",0}, - { "_wxSplitterWindow","_class_wxSplitterWindow",0}, - { "_class_wxStaticText","_wxStaticText",0}, - { "_wxPrintDialogData","_class_wxPrintDialogData",0}, - { "_class_wxFont","_wxFont",0}, - { "_wxClipboard","_class_wxClipboard",0}, - { "_class_wxPyValidator","_wxPyValidator",0}, - { "_class_wxCloseEvent","_wxCloseEvent",0}, - { "_wxSashEvent","_class_wxSashEvent",0}, - { "_wxBusyInfo","_class_wxBusyInfo",0}, - { "_class_wxMenuEvent","_wxMenuEvent",0}, - { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0}, - { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0}, - { "_wxClientDC","_class_wxClientDC",0}, - { "_wxMouseEvent","_class_wxMouseEvent",0}, - { "_class_wxGenericDragImage","_wxGenericDragImage",0}, - { "_wxListCtrl","_class_wxListCtrl",0}, - { "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0}, - { "_class_wxPoint","_wxPoint",0}, - { "_wxRealPoint","_class_wxRealPoint",0}, - { "_class_wxRadioBox","_wxRadioBox",0}, - { "_class_wxBoxSizer","_wxBoxSizer",0}, + { "_wxObject","_class_wxPyApp",SwigwxPyAppTowxObject}, + { "_wxObject","_wxPyApp",SwigwxPyAppTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, - { "_wxMemoryDC","_class_wxMemoryDC",0}, - { "_wxPyTextDataObject","_class_wxPyTextDataObject",0}, - { "_class_wxPrintDialog","_wxPrintDialog",0}, - { "_wxPaintDC","_class_wxPaintDC",0}, - { "_class_wxWindowDC","_wxWindowDC",0}, - { "_class_wxFocusEvent","_wxFocusEvent",0}, - { "_class_wxMaximizeEvent","_wxMaximizeEvent",0}, - { "_wxStatusBar","_class_wxStatusBar",0}, - { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, - { "_class_wxCursor","_wxCursor",0}, - { "_wxPostScriptDC","_class_wxPostScriptDC",0}, - { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, - { "_class_wxImageHandler","_wxImageHandler",0}, - { "_wxScrolledWindow","_class_wxScrolledWindow",0}, - { "_wxTreeItemId","_class_wxTreeItemId",0}, { "_unsigned_char","_byte",0}, - { "_class_wxMenu","_wxMenu",0}, - { "_wxControl","_class_wxControl",0}, - { "_class_wxListBox","_wxListBox",0}, { "_unsigned_int","_wxCoord",0}, { "_unsigned_int","_wxPrintQuality",0}, + { "_unsigned_int","_time_t",0}, { "_unsigned_int","_size_t",0}, { "_unsigned_int","_uint",0}, { "_unsigned_int","_wxWindowID",0}, { "_unsigned_int","_int",0}, - { "_wxIcon","_class_wxIcon",0}, - { "_wxDialog","_class_wxDialog",0}, - { "_class_wxListItem","_wxListItem",0}, - { "_class_wxPen","_wxPen",0}, - { "_class_wxFileDialog","_wxFileDialog",0}, - { "_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0}, + { "_short","_wxDateTime_t",0}, { "_short","_WXTYPE",0}, { "_short","_unsigned_short",0}, { "_short","_signed_short",0}, - { "_class_wxStaticBox","_wxStaticBox",0}, - { "_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0}, - { "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0}, - { "_class_wxPyDropSource","_wxPyDropSource",0}, - { "_class_wxScrollEvent","_wxScrollEvent",0}, - { "_wxJoystickEvent","_class_wxJoystickEvent",0}, - { "_class_wxChoice","_wxChoice",0}, - { "_class_wxSlider","_wxSlider",0}, - { "_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0}, - { "_class_wxImageList","_wxImageList",0}, - { "_class_wxBitmapButton","_wxBitmapButton",0}, - { "_wxPyTipProvider","_class_wxPyTipProvider",0}, - { "_wxFrame","_class_wxFrame",0}, - { "_wxPCXHandler","_class_wxPCXHandler",0}, - { "_class_wxGridSizer","_wxGridSizer",0}, - { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, - { "_class_wxNotebook","_wxNotebook",0}, - { "_wxJPEGHandler","_class_wxJPEGHandler",0}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, + { "_wxWindowID","_time_t",0}, { "_wxWindowID","_size_t",0}, { "_wxWindowID","_EBool",0}, { "_wxWindowID","_uint",0}, { "_wxWindowID","_int",0}, { "_wxWindowID","_signed_int",0}, { "_wxWindowID","_unsigned_int",0}, - { "_class_wxScrollWinEvent","_wxScrollWinEvent",0}, - { "_class_wxSizerItem","_wxSizerItem",0}, { "_int","_wxCoord",0}, { "_int","_wxPrintQuality",0}, + { "_int","_time_t",0}, { "_int","_size_t",0}, { "_int","_EBool",0}, { "_int","_uint",0}, { "_int","_wxWindowID",0}, { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, - { "_class_wxMouseEvent","_wxMouseEvent",0}, - { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, - { "_class_wxListEvent","_wxListEvent",0}, - { "_class_wxPrintPreview","_wxPrintPreview",0}, - { "_class_wxSpinEvent","_wxSpinEvent",0}, - { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0}, - { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0}, - { "_wxButton","_class_wxButton",0}, - { "_class_wxPyApp","_wxPyApp",0}, - { "_wxSize","_class_wxSize",0}, - { "_wxRegionIterator","_class_wxRegionIterator",0}, - { "_class_wxPyTextDataObject","_wxPyTextDataObject",0}, - { "_class_wxMDIParentFrame","_wxMDIParentFrame",0}, - { "_wxPyTreeItemData","_class_wxPyTreeItemData",0}, - { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0}, - { "_class_wxPaintDC","_wxPaintDC",0}, - { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0}, - { "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0}, - { "_class_wxInitDialogEvent","_wxInitDialogEvent",0}, - { "_class_wxComboBox","_wxComboBox",0}, - { "_class_wxRadioButton","_wxRadioButton",0}, - { "_wxValidator","_class_wxValidator",0}, - { "_wxToolBarBase","_class_wxToolBarBase",0}, - { "_class_wxTreeItemId","_wxTreeItemId",0}, - { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, - { "_wxIconizeEvent","_class_wxIconizeEvent",0}, - { "_class_wxControl","_wxControl",0}, - { "_wxStaticBitmap","_class_wxStaticBitmap",0}, - { "_class_wxIcon","_wxIcon",0}, - { "_class_wxColour","_wxColour",0}, - { "_class_wxScreenDC","_wxScreenDC",0}, - { "_class_wxPageSetupDialog","_wxPageSetupDialog",0}, - { "_wxPalette","_class_wxPalette",0}, - { "_class_wxIdleEvent","_wxIdleEvent",0}, + { "_wxDateTime_t","_unsigned_short",0}, + { "_wxDateTime_t","_short",0}, + { "_wxDateTime_t","_WXTYPE",0}, + { "_time_t","_wxCoord",0}, + { "_time_t","_wxPrintQuality",0}, + { "_time_t","_unsigned_int",0}, + { "_time_t","_int",0}, + { "_time_t","_wxWindowID",0}, + { "_time_t","_uint",0}, + { "_time_t","_size_t",0}, { "_wxCoord","_int",0}, { "_wxCoord","_signed_int",0}, { "_wxCoord","_unsigned_int",0}, @@ -2020,65 +1824,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_uint",0}, { "_wxCoord","_EBool",0}, { "_wxCoord","_size_t",0}, + { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, - { "_wxEraseEvent","_class_wxEraseEvent",0}, - { "_wxDataObjectComposite","_class_wxDataObjectComposite",0}, - { "_class_wxJoystickEvent","_wxJoystickEvent",0}, - { "_class_wxTipProvider","_wxTipProvider",0}, - { "_class_wxMiniFrame","_wxMiniFrame",0}, - { "_wxFontDialog","_class_wxFontDialog",0}, - { "_wxRegion","_class_wxRegion",0}, - { "_class_wxSplitterWindow","_wxSplitterWindow",0}, - { "_wxPreviewFrame","_class_wxPreviewFrame",0}, - { "_wxSizer","_class_wxSizer",0}, - { "_class_wxShowEvent","_wxShowEvent",0}, - { "_class_wxPyTipProvider","_wxPyTipProvider",0}, - { "_class_wxPCXHandler","_wxPCXHandler",0}, - { "_wxTIFFHandler","_class_wxTIFFHandler",0}, - { "_wxPyDropTarget","_class_wxPyDropTarget",0}, - { "_wxActivateEvent","_class_wxActivateEvent",0}, - { "_wxGauge","_class_wxGauge",0}, - { "_class_wxCheckListBox","_wxCheckListBox",0}, - { "_class_wxBusyInfo","_wxBusyInfo",0}, - { "_class_wxCommandEvent","_wxCommandEvent",0}, - { "_class_wxClientDC","_wxClientDC",0}, - { "_class_wxSizeEvent","_wxSizeEvent",0}, - { "_class_wxListCtrl","_wxListCtrl",0}, - { "_wxCustomDataObject","_class_wxCustomDataObject",0}, - { "_class_wxSize","_wxSize",0}, - { "_class_wxBitmap","_wxBitmap",0}, - { "_class_wxMemoryDC","_wxMemoryDC",0}, - { "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0}, - { "_wxMenuBar","_class_wxMenuBar",0}, - { "_wxTreeEvent","_class_wxTreeEvent",0}, - { "_wxDirDialog","_class_wxDirDialog",0}, { "_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler}, { "_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler}, - { "_wxEvtHandler","_class_wxEvtHandler",0}, - { "_wxMenuItem","_class_wxMenuItem",0}, - { "_class_wxScrollBar","_wxScrollBar",0}, - { "_class_wxColourDialog","_wxColourDialog",0}, - { "_class_wxPrintData","_wxPrintData",0}, - { "_class_wxScrolledWindow","_wxScrolledWindow",0}, - { "_wxListItemAttr","_class_wxListItemAttr",0}, - { "_class_wxTextEntryDialog","_wxTextEntryDialog",0}, - { "_wxKeyEvent","_class_wxKeyEvent",0}, - { "_wxMoveEvent","_class_wxMoveEvent",0}, - { "_wxColourData","_class_wxColourData",0}, - { "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0}, - { "_class_wxPalette","_wxPalette",0}, - { "_wxFileDataObject","_class_wxFileDataObject",0}, - { "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0}, - { "_wxNotebookSizer","_class_wxNotebookSizer",0}, - { "_class_wxEraseEvent","_wxEraseEvent",0}, - { "_wxPyFontEnumerator","_class_wxPyFontEnumerator",0}, - { "_wxMDIClientWindow","_class_wxMDIClientWindow",0}, - { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, - { "_class_wxToolBarToolBase","_wxToolBarToolBase",0}, - { "_class_wxFontDialog","_wxFontDialog",0}, - { "_wxWindow","_class_wxWindow",0}, - { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0}, - { "_class_wxFrame","_wxFrame",0}, {0,0,0}}; static PyObject *SWIG_globals; @@ -2129,17 +1878,21 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxRESIZE_BORDER", PyInt_FromLong((long) wxRESIZE_BORDER)); PyDict_SetItemString(d,"wxDIALOG_MODAL", PyInt_FromLong((long) wxDIALOG_MODAL)); PyDict_SetItemString(d,"wxDIALOG_MODELESS", PyInt_FromLong((long) wxDIALOG_MODELESS)); + PyDict_SetItemString(d,"wxDIALOG_NO_PARENT", PyInt_FromLong((long) wxDIALOG_NO_PARENT)); PyDict_SetItemString(d,"wxDEFAULT_FRAME_STYLE", PyInt_FromLong((long) wxDEFAULT_FRAME_STYLE)); PyDict_SetItemString(d,"wxDEFAULT_DIALOG_STYLE", PyInt_FromLong((long) wxDEFAULT_DIALOG_STYLE)); PyDict_SetItemString(d,"wxFRAME_TOOL_WINDOW", PyInt_FromLong((long) wxFRAME_TOOL_WINDOW)); PyDict_SetItemString(d,"wxFRAME_FLOAT_ON_PARENT", PyInt_FromLong((long) wxFRAME_FLOAT_ON_PARENT)); PyDict_SetItemString(d,"wxFRAME_NO_WINDOW_MENU", PyInt_FromLong((long) wxFRAME_NO_WINDOW_MENU)); + PyDict_SetItemString(d,"wxFRAME_NO_TASKBAR", PyInt_FromLong((long) wxFRAME_NO_TASKBAR)); + PyDict_SetItemString(d,"wxFRAME_EX_CONTEXTHELP", PyInt_FromLong((long) wxFRAME_EX_CONTEXTHELP)); PyDict_SetItemString(d,"wxED_CLIENT_MARGIN", PyInt_FromLong((long) wxED_CLIENT_MARGIN)); PyDict_SetItemString(d,"wxED_BUTTONS_BOTTOM", PyInt_FromLong((long) wxED_BUTTONS_BOTTOM)); PyDict_SetItemString(d,"wxED_BUTTONS_RIGHT", PyInt_FromLong((long) wxED_BUTTONS_RIGHT)); PyDict_SetItemString(d,"wxED_STATIC_LINE", PyInt_FromLong((long) wxED_STATIC_LINE)); PyDict_SetItemString(d,"wxEXT_DIALOG_STYLE", PyInt_FromLong((long) wxEXT_DIALOG_STYLE)); PyDict_SetItemString(d,"wxCLIP_CHILDREN", PyInt_FromLong((long) wxCLIP_CHILDREN)); + PyDict_SetItemString(d,"wxCLIP_SIBLINGS", PyInt_FromLong((long) wxCLIP_SIBLINGS)); PyDict_SetItemString(d,"wxRETAINED", PyInt_FromLong((long) wxRETAINED)); PyDict_SetItemString(d,"wxBACKINGSTORE", PyInt_FromLong((long) wxBACKINGSTORE)); PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS)); @@ -2160,6 +1913,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxALIGN_CENTER", PyInt_FromLong((long) wxALIGN_CENTER)); PyDict_SetItemString(d,"wxALIGN_CENTRE", PyInt_FromLong((long) wxALIGN_CENTRE)); PyDict_SetItemString(d,"wxSHAPED", PyInt_FromLong((long) wxSHAPED)); + PyDict_SetItemString(d,"wxADJUST_MINSIZE", PyInt_FromLong((long) wxADJUST_MINSIZE)); PyDict_SetItemString(d,"wxLB_NEEDED_SB", PyInt_FromLong((long) wxLB_NEEDED_SB)); PyDict_SetItemString(d,"wxLB_ALWAYS_SB", PyInt_FromLong((long) wxLB_ALWAYS_SB)); PyDict_SetItemString(d,"wxLB_SORT", PyInt_FromLong((long) wxLB_SORT)); @@ -2213,29 +1967,15 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxTR_MULTIPLE", PyInt_FromLong((long) wxTR_MULTIPLE)); PyDict_SetItemString(d,"wxTR_SINGLE", PyInt_FromLong((long) wxTR_SINGLE)); PyDict_SetItemString(d,"wxTR_HAS_VARIABLE_ROW_HEIGHT", PyInt_FromLong((long) wxTR_HAS_VARIABLE_ROW_HEIGHT)); - PyDict_SetItemString(d,"wxLC_ICON", PyInt_FromLong((long) wxLC_ICON)); - PyDict_SetItemString(d,"wxLC_SMALL_ICON", PyInt_FromLong((long) wxLC_SMALL_ICON)); - PyDict_SetItemString(d,"wxLC_LIST", PyInt_FromLong((long) wxLC_LIST)); - PyDict_SetItemString(d,"wxLC_REPORT", PyInt_FromLong((long) wxLC_REPORT)); - PyDict_SetItemString(d,"wxLC_ALIGN_TOP", PyInt_FromLong((long) wxLC_ALIGN_TOP)); - PyDict_SetItemString(d,"wxLC_ALIGN_LEFT", PyInt_FromLong((long) wxLC_ALIGN_LEFT)); - PyDict_SetItemString(d,"wxLC_AUTOARRANGE", PyInt_FromLong((long) wxLC_AUTOARRANGE)); - PyDict_SetItemString(d,"wxLC_USER_TEXT", PyInt_FromLong((long) wxLC_USER_TEXT)); - PyDict_SetItemString(d,"wxLC_EDIT_LABELS", PyInt_FromLong((long) wxLC_EDIT_LABELS)); - PyDict_SetItemString(d,"wxLC_NO_HEADER", PyInt_FromLong((long) wxLC_NO_HEADER)); - PyDict_SetItemString(d,"wxLC_NO_SORT_HEADER", PyInt_FromLong((long) wxLC_NO_SORT_HEADER)); - PyDict_SetItemString(d,"wxLC_SINGLE_SEL", PyInt_FromLong((long) wxLC_SINGLE_SEL)); - PyDict_SetItemString(d,"wxLC_SORT_ASCENDING", PyInt_FromLong((long) wxLC_SORT_ASCENDING)); - PyDict_SetItemString(d,"wxLC_SORT_DESCENDING", PyInt_FromLong((long) wxLC_SORT_DESCENDING)); - PyDict_SetItemString(d,"wxLC_MASK_TYPE", PyInt_FromLong((long) wxLC_MASK_TYPE)); - PyDict_SetItemString(d,"wxLC_MASK_ALIGN", PyInt_FromLong((long) wxLC_MASK_ALIGN)); - PyDict_SetItemString(d,"wxLC_MASK_SORT", PyInt_FromLong((long) wxLC_MASK_SORT)); PyDict_SetItemString(d,"wxSP_VERTICAL", PyInt_FromLong((long) wxSP_VERTICAL)); PyDict_SetItemString(d,"wxSP_HORIZONTAL", PyInt_FromLong((long) wxSP_HORIZONTAL)); PyDict_SetItemString(d,"wxSP_ARROW_KEYS", PyInt_FromLong((long) wxSP_ARROW_KEYS)); PyDict_SetItemString(d,"wxSP_WRAP", PyInt_FromLong((long) wxSP_WRAP)); PyDict_SetItemString(d,"wxSP_NOBORDER", PyInt_FromLong((long) wxSP_NOBORDER)); PyDict_SetItemString(d,"wxSP_3D", PyInt_FromLong((long) wxSP_3D)); + PyDict_SetItemString(d,"wxSP_3DSASH", PyInt_FromLong((long) wxSP_3DSASH)); + PyDict_SetItemString(d,"wxSP_3DBORDER", PyInt_FromLong((long) wxSP_3DBORDER)); + PyDict_SetItemString(d,"wxSP_FULLSASH", PyInt_FromLong((long) wxSP_FULLSASH)); PyDict_SetItemString(d,"wxSP_BORDER", PyInt_FromLong((long) wxSP_BORDER)); PyDict_SetItemString(d,"wxSP_LIVE_UPDATE", PyInt_FromLong((long) wxSP_LIVE_UPDATE)); PyDict_SetItemString(d,"wxSP_PERMIT_UNSPLIT", PyInt_FromLong((long) wxSP_PERMIT_UNSPLIT)); @@ -2305,6 +2045,8 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxID_PASTE", PyInt_FromLong((long) wxID_PASTE)); PyDict_SetItemString(d,"wxID_CLEAR", PyInt_FromLong((long) wxID_CLEAR)); PyDict_SetItemString(d,"wxID_FIND", PyInt_FromLong((long) wxID_FIND)); + PyDict_SetItemString(d,"wxID_DUPLICATE", PyInt_FromLong((long) wxID_DUPLICATE)); + PyDict_SetItemString(d,"wxID_SELECTALL", PyInt_FromLong((long) wxID_SELECTALL)); PyDict_SetItemString(d,"wxID_FILE1", PyInt_FromLong((long) wxID_FILE1)); PyDict_SetItemString(d,"wxID_FILE2", PyInt_FromLong((long) wxID_FILE2)); PyDict_SetItemString(d,"wxID_FILE3", PyInt_FromLong((long) wxID_FILE3)); @@ -2321,32 +2063,17 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxID_NO", PyInt_FromLong((long) wxID_NO)); PyDict_SetItemString(d,"wxID_STATIC", PyInt_FromLong((long) wxID_STATIC)); PyDict_SetItemString(d,"wxID_SEPARATOR", PyInt_FromLong((long) wxID_SEPARATOR)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_BMP", PyInt_FromLong((long) wxBITMAP_TYPE_BMP)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_BMP_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_BMP_RESOURCE)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_ICO", PyInt_FromLong((long) wxBITMAP_TYPE_ICO)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_ICO_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_ICO_RESOURCE)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_CUR", PyInt_FromLong((long) wxBITMAP_TYPE_CUR)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_CUR_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_CUR_RESOURCE)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_XBM", PyInt_FromLong((long) wxBITMAP_TYPE_XBM)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_XBM_DATA", PyInt_FromLong((long) wxBITMAP_TYPE_XBM_DATA)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_XPM", PyInt_FromLong((long) wxBITMAP_TYPE_XPM)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_XPM_DATA", PyInt_FromLong((long) wxBITMAP_TYPE_XPM_DATA)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_TIF", PyInt_FromLong((long) wxBITMAP_TYPE_TIF)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_TIF_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_TIF_RESOURCE)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_GIF", PyInt_FromLong((long) wxBITMAP_TYPE_GIF)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_GIF_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_GIF_RESOURCE)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_PNG", PyInt_FromLong((long) wxBITMAP_TYPE_PNG)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_PNG_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_PNG_RESOURCE)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_ANY", PyInt_FromLong((long) wxBITMAP_TYPE_ANY)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_RESOURCE)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_JPEG", PyInt_FromLong((long) wxBITMAP_TYPE_JPEG)); - PyDict_SetItemString(d,"wxBITMAP_TYPE_PCX", PyInt_FromLong((long) wxBITMAP_TYPE_PCX)); + PyDict_SetItemString(d,"wxID_FORWARD", PyInt_FromLong((long) wxID_FORWARD)); + PyDict_SetItemString(d,"wxID_BACKWARD", PyInt_FromLong((long) wxID_BACKWARD)); + PyDict_SetItemString(d,"wxID_SETUP", PyInt_FromLong((long) wxID_SETUP)); + PyDict_SetItemString(d,"wxID_MORE", PyInt_FromLong((long) wxID_MORE)); PyDict_SetItemString(d,"wxOPEN", PyInt_FromLong((long) wxOPEN)); PyDict_SetItemString(d,"wxSAVE", PyInt_FromLong((long) wxSAVE)); PyDict_SetItemString(d,"wxHIDE_READONLY", PyInt_FromLong((long) wxHIDE_READONLY)); PyDict_SetItemString(d,"wxOVERWRITE_PROMPT", PyInt_FromLong((long) wxOVERWRITE_PROMPT)); PyDict_SetItemString(d,"wxFILE_MUST_EXIST", PyInt_FromLong((long) wxFILE_MUST_EXIST)); PyDict_SetItemString(d,"wxMULTIPLE", PyInt_FromLong((long) wxMULTIPLE)); + PyDict_SetItemString(d,"wxCHANGE_DIR", PyInt_FromLong((long) wxCHANGE_DIR)); PyDict_SetItemString(d,"wxACCEL_ALT", PyInt_FromLong((long) wxACCEL_ALT)); PyDict_SetItemString(d,"wxACCEL_CTRL", PyInt_FromLong((long) wxACCEL_CTRL)); PyDict_SetItemString(d,"wxACCEL_SHIFT", PyInt_FromLong((long) wxACCEL_SHIFT)); @@ -2379,10 +2106,19 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT)); PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT)); PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM)); + PyDict_SetItemString(d,"wxNB_MULTILINE", PyInt_FromLong((long) wxNB_MULTILINE)); PyDict_SetItemString(d,"wxLI_HORIZONTAL", PyInt_FromLong((long) wxLI_HORIZONTAL)); PyDict_SetItemString(d,"wxLI_VERTICAL", PyInt_FromLong((long) wxLI_VERTICAL)); PyDict_SetItemString(d,"wxHW_SCROLLBAR_NEVER", PyInt_FromLong((long) wxHW_SCROLLBAR_NEVER)); PyDict_SetItemString(d,"wxHW_SCROLLBAR_AUTO", PyInt_FromLong((long) wxHW_SCROLLBAR_AUTO)); + PyDict_SetItemString(d,"wxJOYSTICK1", PyInt_FromLong((long) wxJOYSTICK1)); + PyDict_SetItemString(d,"wxJOYSTICK2", PyInt_FromLong((long) wxJOYSTICK2)); + PyDict_SetItemString(d,"wxJOY_BUTTON1", PyInt_FromLong((long) wxJOY_BUTTON1)); + PyDict_SetItemString(d,"wxJOY_BUTTON2", PyInt_FromLong((long) wxJOY_BUTTON2)); + PyDict_SetItemString(d,"wxJOY_BUTTON3", PyInt_FromLong((long) wxJOY_BUTTON3)); + PyDict_SetItemString(d,"wxJOY_BUTTON4", PyInt_FromLong((long) wxJOY_BUTTON4)); + PyDict_SetItemString(d,"wxJOY_BUTTON_ANY", PyInt_FromLong((long) wxJOY_BUTTON_ANY)); + PyDict_SetItemString(d,"wxWS_EX_VALIDATE_RECURSIVELY", PyInt_FromLong((long) wxWS_EX_VALIDATE_RECURSIVELY)); PyDict_SetItemString(d,"wxDEFAULT", PyInt_FromLong((long) wxDEFAULT)); PyDict_SetItemString(d,"wxDECORATIVE", PyInt_FromLong((long) wxDECORATIVE)); PyDict_SetItemString(d,"wxROMAN", PyInt_FromLong((long) wxROMAN)); @@ -2508,6 +2244,37 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"WXK_SCROLL", PyInt_FromLong((long) WXK_SCROLL)); PyDict_SetItemString(d,"WXK_PAGEUP", PyInt_FromLong((long) WXK_PAGEUP)); PyDict_SetItemString(d,"WXK_PAGEDOWN", PyInt_FromLong((long) WXK_PAGEDOWN)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_INVALID", PyInt_FromLong((long) wxBITMAP_TYPE_INVALID)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_BMP", PyInt_FromLong((long) wxBITMAP_TYPE_BMP)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_BMP_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_BMP_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_ICO", PyInt_FromLong((long) wxBITMAP_TYPE_ICO)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_ICO_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_ICO_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_CUR", PyInt_FromLong((long) wxBITMAP_TYPE_CUR)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_CUR_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_CUR_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_XBM", PyInt_FromLong((long) wxBITMAP_TYPE_XBM)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_XBM_DATA", PyInt_FromLong((long) wxBITMAP_TYPE_XBM_DATA)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_XPM", PyInt_FromLong((long) wxBITMAP_TYPE_XPM)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_XPM_DATA", PyInt_FromLong((long) wxBITMAP_TYPE_XPM_DATA)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_TIF", PyInt_FromLong((long) wxBITMAP_TYPE_TIF)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_TIF_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_TIF_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_GIF", PyInt_FromLong((long) wxBITMAP_TYPE_GIF)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_GIF_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_GIF_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_PNG", PyInt_FromLong((long) wxBITMAP_TYPE_PNG)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_PNG_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_PNG_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_JPEG", PyInt_FromLong((long) wxBITMAP_TYPE_JPEG)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_JPEG_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_JPEG_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_PNM", PyInt_FromLong((long) wxBITMAP_TYPE_PNM)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_PNM_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_PNM_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_PCX", PyInt_FromLong((long) wxBITMAP_TYPE_PCX)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_PCX_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_PCX_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_PICT", PyInt_FromLong((long) wxBITMAP_TYPE_PICT)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_PICT_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_PICT_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_ICON", PyInt_FromLong((long) wxBITMAP_TYPE_ICON)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_ICON_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_ICON_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_MACCURSOR", PyInt_FromLong((long) wxBITMAP_TYPE_MACCURSOR)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_MACCURSOR_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_MACCURSOR_RESOURCE)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_ANY", PyInt_FromLong((long) wxBITMAP_TYPE_ANY)); PyDict_SetItemString(d,"wxCURSOR_NONE", PyInt_FromLong((long) wxCURSOR_NONE)); PyDict_SetItemString(d,"wxCURSOR_ARROW", PyInt_FromLong((long) wxCURSOR_ARROW)); PyDict_SetItemString(d,"wxCURSOR_BULLSEYE", PyInt_FromLong((long) wxCURSOR_BULLSEYE)); @@ -2534,6 +2301,9 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxCURSOR_WAIT", PyInt_FromLong((long) wxCURSOR_WAIT)); PyDict_SetItemString(d,"wxCURSOR_WATCH", PyInt_FromLong((long) wxCURSOR_WATCH)); PyDict_SetItemString(d,"wxCURSOR_BLANK", PyInt_FromLong((long) wxCURSOR_BLANK)); + PyDict_SetItemString(d,"wxCURSOR_DEFAULT", PyInt_FromLong((long) wxCURSOR_DEFAULT)); + PyDict_SetItemString(d,"wxCURSOR_ARROWWAIT", PyInt_FromLong((long) wxCURSOR_ARROWWAIT)); + PyDict_SetItemString(d,"wxCURSOR_MAX", PyInt_FromLong((long) wxCURSOR_MAX)); PyDict_SetItemString(d,"wxPAPER_NONE", PyInt_FromLong((long) wxPAPER_NONE)); PyDict_SetItemString(d,"wxPAPER_LETTER", PyInt_FromLong((long) wxPAPER_LETTER)); PyDict_SetItemString(d,"wxPAPER_LEGAL", PyInt_FromLong((long) wxPAPER_LEGAL)); @@ -2632,6 +2402,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxEVT_COMMAND_TOOL_ENTER", PyInt_FromLong((long) wxEVT_COMMAND_TOOL_ENTER)); PyDict_SetItemString(d,"wxEVT_SET_FOCUS", PyInt_FromLong((long) wxEVT_SET_FOCUS)); PyDict_SetItemString(d,"wxEVT_KILL_FOCUS", PyInt_FromLong((long) wxEVT_KILL_FOCUS)); + PyDict_SetItemString(d,"wxEVT_MOUSEWHEEL", PyInt_FromLong((long) wxEVT_MOUSEWHEEL)); PyDict_SetItemString(d,"wxEVT_LEFT_DOWN", PyInt_FromLong((long) wxEVT_LEFT_DOWN)); PyDict_SetItemString(d,"wxEVT_LEFT_UP", PyInt_FromLong((long) wxEVT_LEFT_UP)); PyDict_SetItemString(d,"wxEVT_MIDDLE_DOWN", PyInt_FromLong((long) wxEVT_MIDDLE_DOWN)); @@ -2712,6 +2483,8 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxEVT_MEASURE_ITEM", PyInt_FromLong((long) wxEVT_MEASURE_ITEM)); PyDict_SetItemString(d,"wxEVT_COMPARE_ITEM", PyInt_FromLong((long) wxEVT_COMPARE_ITEM)); PyDict_SetItemString(d,"wxEVT_INIT_DIALOG", PyInt_FromLong((long) wxEVT_INIT_DIALOG)); + PyDict_SetItemString(d,"wxEVT_HELP", PyInt_FromLong((long) wxEVT_HELP)); + PyDict_SetItemString(d,"wxEVT_DETAILED_HELP", PyInt_FromLong((long) wxEVT_DETAILED_HELP)); PyDict_SetItemString(d,"wxEVT_IDLE", PyInt_FromLong((long) wxEVT_IDLE)); PyDict_SetItemString(d,"wxEVT_UPDATE_UI", PyInt_FromLong((long) wxEVT_UPDATE_UI)); PyDict_SetItemString(d,"wxEVT_COMMAND_LEFT_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LEFT_CLICK)); @@ -2721,53 +2494,18 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxEVT_COMMAND_SET_FOCUS", PyInt_FromLong((long) wxEVT_COMMAND_SET_FOCUS)); PyDict_SetItemString(d,"wxEVT_COMMAND_KILL_FOCUS", PyInt_FromLong((long) wxEVT_COMMAND_KILL_FOCUS)); PyDict_SetItemString(d,"wxEVT_COMMAND_ENTER", PyInt_FromLong((long) wxEVT_COMMAND_ENTER)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_BEGIN_DRAG", PyInt_FromLong((long) wxEVT_COMMAND_TREE_BEGIN_DRAG)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_BEGIN_RDRAG", PyInt_FromLong((long) wxEVT_COMMAND_TREE_BEGIN_RDRAG)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT", PyInt_FromLong((long) wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_END_LABEL_EDIT", PyInt_FromLong((long) wxEVT_COMMAND_TREE_END_LABEL_EDIT)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_DELETE_ITEM", PyInt_FromLong((long) wxEVT_COMMAND_TREE_DELETE_ITEM)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_GET_INFO", PyInt_FromLong((long) wxEVT_COMMAND_TREE_GET_INFO)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_SET_INFO", PyInt_FromLong((long) wxEVT_COMMAND_TREE_SET_INFO)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_EXPANDED", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_EXPANDED)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_EXPANDING", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_EXPANDING)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_COLLAPSED", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_COLLAPSED)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_COLLAPSING", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_COLLAPSING)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_SEL_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_TREE_SEL_CHANGED)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TREE_SEL_CHANGING)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_KEY_DOWN", PyInt_FromLong((long) wxEVT_COMMAND_TREE_KEY_DOWN)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_ACTIVATED", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_ACTIVATED)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_BEGIN_DRAG", PyInt_FromLong((long) wxEVT_COMMAND_LIST_BEGIN_DRAG)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_BEGIN_RDRAG", PyInt_FromLong((long) wxEVT_COMMAND_LIST_BEGIN_RDRAG)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT", PyInt_FromLong((long) wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_END_LABEL_EDIT", PyInt_FromLong((long) wxEVT_COMMAND_LIST_END_LABEL_EDIT)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_DELETE_ITEM", PyInt_FromLong((long) wxEVT_COMMAND_LIST_DELETE_ITEM)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS", PyInt_FromLong((long) wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_GET_INFO", PyInt_FromLong((long) wxEVT_COMMAND_LIST_GET_INFO)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_SET_INFO", PyInt_FromLong((long) wxEVT_COMMAND_LIST_SET_INFO)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_SELECTED", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_SELECTED)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_DESELECTED", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_DESELECTED)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_KEY_DOWN", PyInt_FromLong((long) wxEVT_COMMAND_LIST_KEY_DOWN)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_INSERT_ITEM", PyInt_FromLong((long) wxEVT_COMMAND_LIST_INSERT_ITEM)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_COL_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LIST_COL_CLICK)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_ACTIVATED", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_ACTIVATED)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)); - PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGED)); - PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING)); - PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); - PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); - PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING)); - PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)); - PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_UNSPLIT)); - PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_DOUBLECLICKED)); PyDict_SetItemString(d,"wxEVT_NAVIGATION_KEY", PyInt_FromLong((long) wxEVT_NAVIGATION_KEY)); PyDict_SetItemString(d,"wxEVT_TIMER", PyInt_FromLong((long) wxEVT_TIMER)); PyDict_SetItemString(d,"__version__", PyString_FromString("0.0.0")); PyDict_SetItemString(d,"cvar", SWIG_globals); - SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set); - SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set); + SWIG_addvarlink(SWIG_globals,"wxDefaultPosition",_wrap_wxDefaultPosition_get, _wrap_wxDefaultPosition_set); + SWIG_addvarlink(SWIG_globals,"wxDefaultSize",_wrap_wxDefaultSize_get, _wrap_wxDefaultSize_set); + + // Make our API structure a CObject so other modules can import it + // from this module. + PyObject* v = PyCObject_FromVoidPtr(&API, NULL); + PyDict_SetItemString(d,"wxPyCoreAPI", v); + Py_XDECREF(v); __wxPreStart(); // initialize the GUI toolkit, if needed. @@ -2793,12 +2531,9 @@ SWIGEXPORT(void) initwxc() { initprintfwc(); initsizersc(); initclip_dndc(); + initstreamsc(); + initfilesysc(); - initgridc(); - initutilsc(); - inithtmlc(); - inithtmlhelpc(); - initcalendarc(); { int i; for (i = 0; _swig_mapping[i].n1; i++)