X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/185d7c3ee4c6e4a9ddaf811ae38e57d68a0fdff3..0e980f91092ded629a7b014ff0d2238b1c8940c5:/wxPython/src/msw/windows3.cpp diff --git a/wxPython/src/msw/windows3.cpp b/wxPython/src/msw/windows3.cpp index 4a668a6f81..0fb5abe64c 100644 --- a/wxPython/src/msw/windows3.cpp +++ b/wxPython/src/msw/windows3.cpp @@ -59,53 +59,38 @@ extern PyObject *SWIG_newvarlink(void); #include #include -static PyObject* l_output_helper(PyObject* target, PyObject* o) { - PyObject* o2; - 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 #ifdef __cplusplus extern "C" { #endif @@ -125,6 +110,14 @@ static void *SwigwxSashEventTowxEvent(void *ptr) { return (void *) dest; } +static void *SwigwxSashEventTowxObject(void *ptr) { + wxSashEvent *src; + wxObject *dest; + src = (wxSashEvent *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define wxSashEvent_SetEdge(_swigobj,_swigarg0) (_swigobj->SetEdge(_swigarg0)) static PyObject *_wrap_wxSashEvent_SetEdge(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -148,6 +141,7 @@ static PyObject *_wrap_wxSashEvent_SetEdge(PyObject *self, PyObject *args, PyObj wxSashEvent_SetEdge(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -176,6 +170,7 @@ static PyObject *_wrap_wxSashEvent_GetEdge(PyObject *self, PyObject *args, PyObj _result = (wxSashEdgePosition )wxSashEvent_GetEdge(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -210,6 +205,7 @@ static PyObject *_wrap_wxSashEvent_SetDragRect(PyObject *self, PyObject *args, P wxSashEvent_SetDragRect(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -239,6 +235,7 @@ static PyObject *_wrap_wxSashEvent_GetDragRect(PyObject *self, PyObject *args, P _result = new wxRect (wxSashEvent_GetDragRect(_arg0)); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -267,6 +264,7 @@ static PyObject *_wrap_wxSashEvent_SetDragStatus(PyObject *self, PyObject *args, wxSashEvent_SetDragStatus(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -295,6 +293,7 @@ static PyObject *_wrap_wxSashEvent_GetDragStatus(PyObject *self, PyObject *args, _result = (wxSashDragStatus )wxSashEvent_GetDragStatus(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -315,14 +314,22 @@ static void *SwigwxSashWindowTowxEvtHandler(void *ptr) { return (void *) dest; } +static void *SwigwxSashWindowTowxObject(void *ptr) { + wxSashWindow *src; + wxObject *dest; + src = (wxSashWindow *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define new_wxSashWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSashWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSashWindow * _result; wxWindow * _arg0; wxWindowID _arg1; - wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; long _arg4 = (long ) wxCLIP_CHILDREN|(wxSW_3D); char * _arg5 = (char *) "sashWindow"; PyObject * _argo0 = 0; @@ -360,6 +367,7 @@ static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args, PyObject _result = (wxSashWindow *)new_wxSashWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxSashWindow_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -394,6 +402,7 @@ static PyObject *_wrap_wxSashWindow_GetSashVisible(PyObject *self, PyObject *arg _result = (bool )wxSashWindow_GetSashVisible(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -421,6 +430,7 @@ static PyObject *_wrap_wxSashWindow_GetDefaultBorderSize(PyObject *self, PyObjec _result = (int )wxSashWindow_GetDefaultBorderSize(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -449,6 +459,7 @@ static PyObject *_wrap_wxSashWindow_GetEdgeMargin(PyObject *self, PyObject *args _result = (int )wxSashWindow_GetEdgeMargin(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -476,6 +487,7 @@ static PyObject *_wrap_wxSashWindow_GetExtraBorderSize(PyObject *self, PyObject _result = (int )wxSashWindow_GetExtraBorderSize(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -503,6 +515,7 @@ static PyObject *_wrap_wxSashWindow_GetMaximumSizeX(PyObject *self, PyObject *ar _result = (int )wxSashWindow_GetMaximumSizeX(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -530,6 +543,7 @@ static PyObject *_wrap_wxSashWindow_GetMaximumSizeY(PyObject *self, PyObject *ar _result = (int )wxSashWindow_GetMaximumSizeY(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -557,6 +571,7 @@ static PyObject *_wrap_wxSashWindow_GetMinimumSizeX(PyObject *self, PyObject *ar _result = (int )wxSashWindow_GetMinimumSizeX(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -584,6 +599,7 @@ static PyObject *_wrap_wxSashWindow_GetMinimumSizeY(PyObject *self, PyObject *ar _result = (int )wxSashWindow_GetMinimumSizeY(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -612,6 +628,7 @@ static PyObject *_wrap_wxSashWindow_HasBorder(PyObject *self, PyObject *args, Py _result = (bool )wxSashWindow_HasBorder(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -639,6 +656,7 @@ static PyObject *_wrap_wxSashWindow_SetDefaultBorderSize(PyObject *self, PyObjec wxSashWindow_SetDefaultBorderSize(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -667,6 +685,7 @@ static PyObject *_wrap_wxSashWindow_SetExtraBorderSize(PyObject *self, PyObject wxSashWindow_SetExtraBorderSize(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -695,6 +714,7 @@ static PyObject *_wrap_wxSashWindow_SetMaximumSizeX(PyObject *self, PyObject *ar wxSashWindow_SetMaximumSizeX(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -723,6 +743,7 @@ static PyObject *_wrap_wxSashWindow_SetMaximumSizeY(PyObject *self, PyObject *ar wxSashWindow_SetMaximumSizeY(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -751,6 +772,7 @@ static PyObject *_wrap_wxSashWindow_SetMinimumSizeX(PyObject *self, PyObject *ar wxSashWindow_SetMinimumSizeX(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -779,6 +801,7 @@ static PyObject *_wrap_wxSashWindow_SetMinimumSizeY(PyObject *self, PyObject *ar wxSashWindow_SetMinimumSizeY(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -810,6 +833,7 @@ static PyObject *_wrap_wxSashWindow_SetSashVisible(PyObject *self, PyObject *arg wxSashWindow_SetSashVisible(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -841,6 +865,7 @@ static PyObject *_wrap_wxSashWindow_SetSashBorder(PyObject *self, PyObject *args wxSashWindow_SetSashBorder(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -854,6 +879,14 @@ static void *SwigwxQueryLayoutInfoEventTowxEvent(void *ptr) { return (void *) dest; } +static void *SwigwxQueryLayoutInfoEventTowxObject(void *ptr) { + wxQueryLayoutInfoEvent *src; + wxObject *dest; + src = (wxQueryLayoutInfoEvent *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define wxQueryLayoutInfoEvent_SetRequestedLength(_swigobj,_swigarg0) (_swigobj->SetRequestedLength(_swigarg0)) static PyObject *_wrap_wxQueryLayoutInfoEvent_SetRequestedLength(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -877,6 +910,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetRequestedLength(PyObject *self, wxQueryLayoutInfoEvent_SetRequestedLength(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -905,6 +939,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetRequestedLength(PyObject *self, _result = (int )wxQueryLayoutInfoEvent_GetRequestedLength(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -932,6 +967,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject wxQueryLayoutInfoEvent_SetFlags(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -960,6 +996,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject _result = (int )wxQueryLayoutInfoEvent_GetFlags(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -994,6 +1031,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetSize(PyObject *self, PyObject * wxQueryLayoutInfoEvent_SetSize(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1023,6 +1061,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetSize(PyObject *self, PyObject * _result = new wxSize (wxQueryLayoutInfoEvent_GetSize(_arg0)); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -1051,6 +1090,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetOrientation(PyObject *self, PyO wxQueryLayoutInfoEvent_SetOrientation(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1079,6 +1119,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetOrientation(PyObject *self, PyO _result = (wxLayoutOrientation )wxQueryLayoutInfoEvent_GetOrientation(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1106,6 +1147,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObj wxQueryLayoutInfoEvent_SetAlignment(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1134,6 +1176,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetAlignment(PyObject *self, PyObj _result = (wxLayoutAlignment )wxQueryLayoutInfoEvent_GetAlignment(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1146,6 +1189,14 @@ static void *SwigwxCalculateLayoutEventTowxEvent(void *ptr) { return (void *) dest; } +static void *SwigwxCalculateLayoutEventTowxObject(void *ptr) { + wxCalculateLayoutEvent *src; + wxObject *dest; + src = (wxCalculateLayoutEvent *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define wxCalculateLayoutEvent_SetFlags(_swigobj,_swigarg0) (_swigobj->SetFlags(_swigarg0)) static PyObject *_wrap_wxCalculateLayoutEvent_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1169,6 +1220,7 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetFlags(PyObject *self, PyObject wxCalculateLayoutEvent_SetFlags(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1197,6 +1249,7 @@ static PyObject *_wrap_wxCalculateLayoutEvent_GetFlags(PyObject *self, PyObject _result = (int )wxCalculateLayoutEvent_GetFlags(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1231,6 +1284,7 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetRect(PyObject *self, PyObject * wxCalculateLayoutEvent_SetRect(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1260,6 +1314,7 @@ static PyObject *_wrap_wxCalculateLayoutEvent_GetRect(PyObject *self, PyObject * _result = new wxRect (wxCalculateLayoutEvent_GetRect(_arg0)); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -1289,14 +1344,22 @@ static void *SwigwxSashLayoutWindowTowxEvtHandler(void *ptr) { return (void *) dest; } +static void *SwigwxSashLayoutWindowTowxObject(void *ptr) { + wxSashLayoutWindow *src; + wxObject *dest; + src = (wxSashLayoutWindow *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define new_wxSashLayoutWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSashLayoutWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSashLayoutWindow * _result; wxWindow * _arg0; wxWindowID _arg1; - wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; long _arg4 = (long ) wxCLIP_CHILDREN|(wxSW_3D); char * _arg5 = (char *) "layoutWindow"; PyObject * _argo0 = 0; @@ -1334,6 +1397,7 @@ static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args, Py _result = (wxSashLayoutWindow *)new_wxSashLayoutWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxSashLayoutWindow_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -1367,6 +1431,7 @@ static PyObject *_wrap_wxSashLayoutWindow_GetAlignment(PyObject *self, PyObject _result = (wxLayoutAlignment )wxSashLayoutWindow_GetAlignment(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1394,6 +1459,7 @@ static PyObject *_wrap_wxSashLayoutWindow_GetOrientation(PyObject *self, PyObjec _result = (wxLayoutOrientation )wxSashLayoutWindow_GetOrientation(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1421,6 +1487,7 @@ static PyObject *_wrap_wxSashLayoutWindow_SetAlignment(PyObject *self, PyObject wxSashLayoutWindow_SetAlignment(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1456,6 +1523,7 @@ static PyObject *_wrap_wxSashLayoutWindow_SetDefaultSize(PyObject *self, PyObjec wxSashLayoutWindow_SetDefaultSize(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1484,11 +1552,20 @@ static PyObject *_wrap_wxSashLayoutWindow_SetOrientation(PyObject *self, PyObjec wxSashLayoutWindow_SetOrientation(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; } +static void *SwigwxLayoutAlgorithmTowxObject(void *ptr) { + wxLayoutAlgorithm *src; + wxObject *dest; + src = (wxLayoutAlgorithm *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define new_wxLayoutAlgorithm() (new wxLayoutAlgorithm()) static PyObject *_wrap_new_wxLayoutAlgorithm(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1504,6 +1581,7 @@ static PyObject *_wrap_new_wxLayoutAlgorithm(PyObject *self, PyObject *args, PyO _result = (wxLayoutAlgorithm *)new_wxLayoutAlgorithm(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutAlgorithm_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -1536,6 +1614,7 @@ static PyObject *_wrap_delete_wxLayoutAlgorithm(PyObject *self, PyObject *args, delete_wxLayoutAlgorithm(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1582,6 +1661,7 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject _result = (bool )wxLayoutAlgorithm_LayoutMDIFrame(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1627,6 +1707,7 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *a _result = (bool )wxLayoutAlgorithm_LayoutFrame(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1672,6 +1753,7 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutWindow(PyObject *self, PyObject * _result = (bool )wxLayoutAlgorithm_LayoutWindow(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1735,20 +1817,10 @@ static PyMethodDef windows3cMethods[] = { * 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_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent}, { "_wxEvent","_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent}, - { "_wxEvent","_class_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent}, { "_wxEvent","_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent}, - { "_wxEvent","_class_wxSashEvent",SwigwxSashEventTowxEvent}, { "_wxEvent","_wxSashEvent",SwigwxSashEventTowxEvent}, - { "_wxEvent","_class_wxEvent",0}, - { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, - { "_wxMenuEvent","_class_wxMenuEvent",0}, - { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0}, - { "_wxBitmapDataObject","_class_wxBitmapDataObject",0}, - { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxPrintQuality","_wxCoord",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, @@ -1758,49 +1830,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, - { "_class_wxCustomDataObject","_wxCustomDataObject",0}, - { "_wxSpinCtrl","_class_wxSpinCtrl",0}, - { "_class_wxRegionIterator","_wxRegionIterator",0}, - { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0}, - { "_class_wxMenuBar","_wxMenuBar",0}, - { "_class_wxEvtHandler","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler}, - { "_class_wxEvtHandler","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler}, - { "_class_wxEvtHandler","_class_wxSashWindow",SwigwxSashWindowTowxEvtHandler}, - { "_class_wxEvtHandler","_wxSashWindow",SwigwxSashWindowTowxEvtHandler}, - { "_class_wxEvtHandler","_wxEvtHandler",0}, - { "_wxPaintEvent","_class_wxPaintEvent",0}, - { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, - { "_wxCursor","_class_wxCursor",0}, - { "_wxNotifyEvent","_class_wxNotifyEvent",0}, - { "_class_wxToolBarBase","_wxToolBarBase",0}, - { "_wxMask","_class_wxMask",0}, - { "_wxPen","_class_wxPen",0}, - { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0}, { "_byte","_unsigned_char",0}, - { "_wxDataObject","_class_wxDataObject",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}, { "_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_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow}, { "_wxSashWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow}, - { "_wxSashWindow","_class_wxSashWindow",0}, - { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, - { "_class_wxClipboard","_wxClipboard",0}, - { "_class_wxGauge","_wxGauge",0}, - { "_class_wxSashEvent","_wxSashEvent",0}, - { "_wxDC","_class_wxDC",0}, - { "_class_wxBitmapDataObject","_wxBitmapDataObject",0}, - { "_wxSpinEvent","_class_wxSpinEvent",0}, - { "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -1808,40 +1841,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, - { "_class_wxRealPoint","_wxRealPoint",0}, - { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0}, - { "_wxPrinterDC","_class_wxPrinterDC",0}, - { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0}, - { "_class_wxMenuItem","_wxMenuItem",0}, - { "_class_wxPaintEvent","_wxPaintEvent",0}, - { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0}, - { "_class_wxStatusBar","_wxStatusBar",0}, - { "_wxPanel","_class_wxPanel",0}, - { "_wxInitDialogEvent","_class_wxInitDialogEvent",0}, - { "_wxCheckBox","_class_wxCheckBox",0}, - { "_wxPyEvent","_class_wxPyEvent",0}, - { "_wxTextCtrl","_class_wxTextCtrl",0}, - { "_class_wxMask","_wxMask",0}, - { "_wxTextDataObject","_class_wxTextDataObject",0}, - { "_class_wxKeyEvent","_wxKeyEvent",0}, - { "_wxColour","_class_wxColour",0}, - { "_class_wxDialog","_wxDialog",0}, - { "_class_wxFileDataObject","_wxFileDataObject",0}, - { "_wxIdleEvent","_class_wxIdleEvent",0}, - { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0}, - { "_wxToolBar","_class_wxToolBar",0}, - { "_class_wxDataObject","_wxDataObject",0}, - { "_wxStaticLine","_class_wxStaticLine",0}, - { "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0}, - { "_wxBrush","_class_wxBrush",0}, - { "_class_wxNotebookEvent","_wxNotebookEvent",0}, - { "_wxMiniFrame","_class_wxMiniFrame",0}, - { "_wxDataFormat","_class_wxDataFormat",0}, - { "_class_wxDataObjectSimple","_wxDataObjectSimple",0}, - { "_class_wxSashWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow}, - { "_class_wxSashWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow}, - { "_class_wxSashWindow","_wxSashWindow",0}, - { "_wxShowEvent","_class_wxShowEvent",0}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -1850,141 +1849,33 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_int",0}, { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, - { "_wxPyValidator","_class_wxPyValidator",0}, - { "_class_wxEvent","_class_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent}, - { "_class_wxEvent","_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent}, - { "_class_wxEvent","_class_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent}, - { "_class_wxEvent","_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent}, - { "_class_wxEvent","_class_wxSashEvent",SwigwxSashEventTowxEvent}, - { "_class_wxEvent","_wxSashEvent",SwigwxSashEventTowxEvent}, - { "_class_wxEvent","_wxEvent",0}, - { "_wxCheckListBox","_class_wxCheckListBox",0}, - { "_wxSplitterEvent","_class_wxSplitterEvent",0}, - { "_wxRect","_class_wxRect",0}, - { "_wxCommandEvent","_class_wxSashEvent",SwigwxSashEventTowxCommandEvent}, { "_wxCommandEvent","_wxSashEvent",SwigwxSashEventTowxCommandEvent}, - { "_wxCommandEvent","_class_wxCommandEvent",0}, - { "_wxSizeEvent","_class_wxSizeEvent",0}, - { "_wxPoint","_class_wxPoint",0}, - { "_class_wxSashLayoutWindow","_wxSashLayoutWindow",0}, - { "_class_wxButton","_wxButton",0}, - { "_wxRadioBox","_class_wxRadioBox",0}, - { "_class_wxSpinCtrl","_wxSpinCtrl",0}, { "_char","_wxChar",0}, - { "_wxBitmap","_class_wxBitmap",0}, - { "_wxTaskBarIcon","_class_wxTaskBarIcon",0}, - { "_wxWindowDC","_class_wxWindowDC",0}, - { "_wxTimerEvent","_class_wxTimerEvent",0}, - { "_wxScrollBar","_class_wxScrollBar",0}, - { "_wxSpinButton","_class_wxSpinButton",0}, - { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, - { "_class_wxNotifyEvent","_wxNotifyEvent",0}, - { "_class_wxValidator","_wxValidator",0}, - { "_class_wxPyEvent","_wxPyEvent",0}, - { "_class_wxIconizeEvent","_wxIconizeEvent",0}, - { "_class_wxStaticBitmap","_wxStaticBitmap",0}, - { "_wxToolBarSimple","_class_wxToolBarSimple",0}, - { "_wxMDIChildFrame","_class_wxMDIChildFrame",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}, - { "_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}, - { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0}, - { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0}, - { "_wxMDIParentFrame","_class_wxMDIParentFrame",0}, - { "_wxFocusEvent","_class_wxFocusEvent",0}, - { "_wxMaximizeEvent","_class_wxMaximizeEvent",0}, - { "_class_wxTimerEvent","_wxTimerEvent",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}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, - { "_class_wxTextCtrl","_wxTextCtrl",0}, - { "_wxLayoutConstraints","_class_wxLayoutConstraints",0}, - { "_wxMetaFileDC","_class_wxMetaFileDC",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","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, - { "_class_wxDropTarget","_wxDropTarget",0}, - { "_class_wxMDIClientWindow","_wxMDIClientWindow",0}, - { "_class_wxBrush","_wxBrush",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, - { "_class_wxWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow}, - { "_class_wxWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow}, - { "_class_wxWindow","_class_wxSashWindow",SwigwxSashWindowTowxWindow}, - { "_class_wxWindow","_wxSashWindow",SwigwxSashWindowTowxWindow}, - { "_class_wxWindow","_wxWindow",0}, - { "_wxSplitterWindow","_class_wxSplitterWindow",0}, - { "_class_wxStaticText","_wxStaticText",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_wxPoint","_wxPoint",0}, - { "_wxRealPoint","_class_wxRealPoint",0}, - { "_class_wxRadioBox","_wxRadioBox",0}, + { "_wxObject","_wxLayoutAlgorithm",SwigwxLayoutAlgorithmTowxObject}, + { "_wxObject","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxObject}, + { "_wxObject","_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxObject}, + { "_wxObject","_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxObject}, + { "_wxObject","_wxSashWindow",SwigwxSashWindowTowxObject}, + { "_wxObject","_wxSashEvent",SwigwxSashEventTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, - { "_wxMemoryDC","_class_wxMemoryDC",0}, - { "_wxPyTextDataObject","_class_wxPyTextDataObject",0}, - { "_class_wxTaskBarIcon","_wxTaskBarIcon",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}, - { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, - { "_wxScrolledWindow","_class_wxScrolledWindow",0}, { "_unsigned_char","_byte",0}, - { "_class_wxMetaFileDC","_wxMetaFileDC",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}, @@ -1992,27 +1883,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_int","_uint",0}, { "_unsigned_int","_wxWindowID",0}, { "_unsigned_int","_int",0}, - { "_wxIcon","_class_wxIcon",0}, - { "_wxDialog","_class_wxDialog",0}, - { "_class_wxPen","_wxPen",0}, - { "_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",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}, - { "_wxFrame","_class_wxFrame",0}, - { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, - { "_class_wxNotebook","_wxNotebook",0}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, { "_wxWindowID","_time_t",0}, @@ -2022,7 +1895,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowID","_int",0}, { "_wxWindowID","_signed_int",0}, { "_wxWindowID","_unsigned_int",0}, - { "_class_wxScrollWinEvent","_wxScrollWinEvent",0}, { "_int","_wxCoord",0}, { "_int","_wxPrintQuality",0}, { "_int","_time_t",0}, @@ -2032,10 +1904,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_wxWindowID",0}, { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, - { "_class_wxMouseEvent","_wxMouseEvent",0}, - { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, - { "_class_wxSpinEvent","_wxSpinEvent",0}, - { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0}, { "_time_t","_wxCoord",0}, { "_time_t","_wxPrintQuality",0}, { "_time_t","_unsigned_int",0}, @@ -2043,30 +1911,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_time_t","_wxWindowID",0}, { "_time_t","_uint",0}, { "_time_t","_size_t",0}, - { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0}, - { "_wxButton","_class_wxButton",0}, - { "_wxSize","_class_wxSize",0}, - { "_wxRegionIterator","_class_wxRegionIterator",0}, - { "_class_wxPrinterDC","_wxPrinterDC",0}, - { "_class_wxPyTextDataObject","_wxPyTextDataObject",0}, - { "_class_wxMDIParentFrame","_wxMDIParentFrame",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_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}, - { "_wxPalette","_class_wxPalette",0}, - { "_class_wxIdleEvent","_wxIdleEvent",0}, { "_wxCoord","_int",0}, { "_wxCoord","_signed_int",0}, { "_wxCoord","_unsigned_int",0}, @@ -2076,53 +1920,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, - { "_wxEraseEvent","_class_wxEraseEvent",0}, - { "_wxDataObjectComposite","_class_wxDataObjectComposite",0}, - { "_class_wxJoystickEvent","_wxJoystickEvent",0}, - { "_class_wxMiniFrame","_wxMiniFrame",0}, - { "_wxRegion","_class_wxRegion",0}, - { "_class_wxSplitterWindow","_wxSplitterWindow",0}, - { "_class_wxShowEvent","_wxShowEvent",0}, - { "_wxPyDropTarget","_class_wxPyDropTarget",0}, - { "_wxActivateEvent","_class_wxActivateEvent",0}, - { "_wxGauge","_class_wxGauge",0}, - { "_class_wxCheckListBox","_wxCheckListBox",0}, - { "_class_wxBusyInfo","_wxBusyInfo",0}, - { "_class_wxCommandEvent","_class_wxSashEvent",SwigwxSashEventTowxCommandEvent}, - { "_class_wxCommandEvent","_wxSashEvent",SwigwxSashEventTowxCommandEvent}, - { "_class_wxCommandEvent","_wxCommandEvent",0}, - { "_class_wxClientDC","_wxClientDC",0}, - { "_class_wxSizeEvent","_wxSizeEvent",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}, - { "_wxEvtHandler","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler}, { "_wxEvtHandler","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxEvtHandler}, - { "_wxEvtHandler","_class_wxSashWindow",SwigwxSashWindowTowxEvtHandler}, { "_wxEvtHandler","_wxSashWindow",SwigwxSashWindowTowxEvtHandler}, - { "_wxEvtHandler","_class_wxEvtHandler",0}, - { "_wxMenuItem","_class_wxMenuItem",0}, - { "_class_wxScrollBar","_wxScrollBar",0}, - { "_class_wxScrolledWindow","_wxScrolledWindow",0}, - { "_wxKeyEvent","_class_wxKeyEvent",0}, - { "_wxMoveEvent","_class_wxMoveEvent",0}, - { "_class_wxPalette","_wxPalette",0}, - { "_wxFileDataObject","_class_wxFileDataObject",0}, - { "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0}, - { "_class_wxEraseEvent","_wxEraseEvent",0}, - { "_wxMDIClientWindow","_class_wxMDIClientWindow",0}, - { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, - { "_class_wxToolBarToolBase","_wxToolBarToolBase",0}, - { "_wxWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow}, { "_wxWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow}, - { "_wxWindow","_class_wxSashWindow",SwigwxSashWindowTowxWindow}, { "_wxWindow","_wxSashWindow",SwigwxSashWindowTowxWindow}, - { "_wxWindow","_class_wxWindow",0}, - { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0}, - { "_class_wxFrame","_wxFrame",0}, {0,0,0}}; static PyObject *SWIG_globals; @@ -2141,6 +1942,9 @@ SWIGEXPORT(void) initwindows3c() { PyDict_SetItemString(d,"wxSASH_NONE", PyInt_FromLong((long) wxSASH_NONE)); PyDict_SetItemString(d,"wxEVT_SASH_DRAGGED", PyInt_FromLong((long) wxEVT_SASH_DRAGGED)); PyDict_SetItemString(d,"wxSW_3D", PyInt_FromLong((long) wxSW_3D)); + PyDict_SetItemString(d,"wxSW_3DSASH", PyInt_FromLong((long) wxSW_3DSASH)); + PyDict_SetItemString(d,"wxSW_3DBORDER", PyInt_FromLong((long) wxSW_3DBORDER)); + PyDict_SetItemString(d,"wxSW_BORDER", PyInt_FromLong((long) wxSW_BORDER)); PyDict_SetItemString(d,"wxSASH_STATUS_OK", PyInt_FromLong((long) wxSASH_STATUS_OK)); PyDict_SetItemString(d,"wxSASH_STATUS_OUT_OF_RANGE", PyInt_FromLong((long) wxSASH_STATUS_OUT_OF_RANGE)); PyDict_SetItemString(d,"wxLAYOUT_HORIZONTAL", PyInt_FromLong((long) wxLAYOUT_HORIZONTAL));