X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d0180d415f3cce126abebed2ef1d0fde00bcc61..26e335b844ea77f6b3e62f9daffe7063f2cede7d:/wxPython/src/msw/windows3.cpp diff --git a/wxPython/src/msw/windows3.cpp b/wxPython/src/msw/windows3.cpp index cdc6ec04b1..f85b359096 100644 --- a/wxPython/src/msw/windows3.cpp +++ b/wxPython/src/msw/windows3.cpp @@ -90,12 +90,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } -#if PYTHON_API_VERSION >= 1009 - static char* wxStringErrorMsg = "String or Unicode type required"; -#else - static char* wxStringErrorMsg = "String type required"; -#endif - class wxPyPopupTransientWindow : public wxPopupTransientWindow { public: @@ -153,7 +147,7 @@ static PyObject *_wrap_new_wxSashEvent(PyObject *self, PyObject *args, PyObject return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxSashEvent *)new_wxSashEvent(_arg0,_arg1); + _result = (wxSashEvent *)new_wxSashEvent(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -187,7 +181,7 @@ static PyObject *_wrap_wxSashEvent_SetEdge(PyObject *self, PyObject *args, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashEvent_SetEdge(_arg0,_arg1); + wxSashEvent_SetEdge(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -216,7 +210,7 @@ static PyObject *_wrap_wxSashEvent_GetEdge(PyObject *self, PyObject *args, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxSashEdgePosition )wxSashEvent_GetEdge(_arg0); + _result = (wxSashEdgePosition )wxSashEvent_GetEdge(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -251,7 +245,7 @@ static PyObject *_wrap_wxSashEvent_SetDragRect(PyObject *self, PyObject *args, P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashEvent_SetDragRect(_arg0,*_arg1); + wxSashEvent_SetDragRect(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -281,7 +275,7 @@ static PyObject *_wrap_wxSashEvent_GetDragRect(PyObject *self, PyObject *args, P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxRect (wxSashEvent_GetDragRect(_arg0)); + _result = new wxRect (wxSashEvent_GetDragRect(_arg0)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -310,7 +304,7 @@ static PyObject *_wrap_wxSashEvent_SetDragStatus(PyObject *self, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashEvent_SetDragStatus(_arg0,_arg1); + wxSashEvent_SetDragStatus(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -339,7 +333,7 @@ static PyObject *_wrap_wxSashEvent_GetDragStatus(PyObject *self, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxSashDragStatus )wxSashEvent_GetDragStatus(_arg0); + _result = (wxSashDragStatus )wxSashEvent_GetDragStatus(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -413,7 +407,7 @@ static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxSashWindow *)new_wxSashWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); + _result = (wxSashWindow *)new_wxSashWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -439,7 +433,7 @@ static PyObject *_wrap_new_wxPreSashWindow(PyObject *self, PyObject *args, PyObj return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxSashWindow *)new_wxPreSashWindow(); + _result = (wxSashWindow *)new_wxPreSashWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -503,7 +497,7 @@ static PyObject *_wrap_wxSashWindow_Create(PyObject *self, PyObject *args, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSashWindow_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6); + _result = (bool )wxSashWindow_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -532,7 +526,7 @@ static PyObject *_wrap_wxSashWindow_GetSashVisible(PyObject *self, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSashWindow_GetSashVisible(_arg0,_arg1); + _result = (bool )wxSashWindow_GetSashVisible(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -560,7 +554,7 @@ static PyObject *_wrap_wxSashWindow_GetDefaultBorderSize(PyObject *self, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxSashWindow_GetDefaultBorderSize(_arg0); + _result = (int )wxSashWindow_GetDefaultBorderSize(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -589,7 +583,7 @@ static PyObject *_wrap_wxSashWindow_GetEdgeMargin(PyObject *self, PyObject *args } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxSashWindow_GetEdgeMargin(_arg0,_arg1); + _result = (int )wxSashWindow_GetEdgeMargin(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -617,7 +611,7 @@ static PyObject *_wrap_wxSashWindow_GetExtraBorderSize(PyObject *self, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxSashWindow_GetExtraBorderSize(_arg0); + _result = (int )wxSashWindow_GetExtraBorderSize(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -645,7 +639,7 @@ static PyObject *_wrap_wxSashWindow_GetMaximumSizeX(PyObject *self, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxSashWindow_GetMaximumSizeX(_arg0); + _result = (int )wxSashWindow_GetMaximumSizeX(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -673,7 +667,7 @@ static PyObject *_wrap_wxSashWindow_GetMaximumSizeY(PyObject *self, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxSashWindow_GetMaximumSizeY(_arg0); + _result = (int )wxSashWindow_GetMaximumSizeY(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -701,7 +695,7 @@ static PyObject *_wrap_wxSashWindow_GetMinimumSizeX(PyObject *self, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxSashWindow_GetMinimumSizeX(_arg0); + _result = (int )wxSashWindow_GetMinimumSizeX(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -729,7 +723,7 @@ static PyObject *_wrap_wxSashWindow_GetMinimumSizeY(PyObject *self, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxSashWindow_GetMinimumSizeY(_arg0); + _result = (int )wxSashWindow_GetMinimumSizeY(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -758,7 +752,7 @@ static PyObject *_wrap_wxSashWindow_HasBorder(PyObject *self, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSashWindow_HasBorder(_arg0,_arg1); + _result = (bool )wxSashWindow_HasBorder(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -786,7 +780,7 @@ static PyObject *_wrap_wxSashWindow_SetDefaultBorderSize(PyObject *self, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashWindow_SetDefaultBorderSize(_arg0,_arg1); + wxSashWindow_SetDefaultBorderSize(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -815,7 +809,7 @@ static PyObject *_wrap_wxSashWindow_SetExtraBorderSize(PyObject *self, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashWindow_SetExtraBorderSize(_arg0,_arg1); + wxSashWindow_SetExtraBorderSize(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -844,7 +838,7 @@ static PyObject *_wrap_wxSashWindow_SetMaximumSizeX(PyObject *self, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashWindow_SetMaximumSizeX(_arg0,_arg1); + wxSashWindow_SetMaximumSizeX(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -873,7 +867,7 @@ static PyObject *_wrap_wxSashWindow_SetMaximumSizeY(PyObject *self, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashWindow_SetMaximumSizeY(_arg0,_arg1); + wxSashWindow_SetMaximumSizeY(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -902,7 +896,7 @@ static PyObject *_wrap_wxSashWindow_SetMinimumSizeX(PyObject *self, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashWindow_SetMinimumSizeX(_arg0,_arg1); + wxSashWindow_SetMinimumSizeX(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -931,7 +925,7 @@ static PyObject *_wrap_wxSashWindow_SetMinimumSizeY(PyObject *self, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashWindow_SetMinimumSizeY(_arg0,_arg1); + wxSashWindow_SetMinimumSizeY(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -963,7 +957,7 @@ static PyObject *_wrap_wxSashWindow_SetSashVisible(PyObject *self, PyObject *arg _arg2 = (bool ) tempbool2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashWindow_SetSashVisible(_arg0,_arg1,_arg2); + wxSashWindow_SetSashVisible(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -995,7 +989,7 @@ static PyObject *_wrap_wxSashWindow_SetSashBorder(PyObject *self, PyObject *args _arg2 = (bool ) tempbool2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashWindow_SetSashBorder(_arg0,_arg1,_arg2); + wxSashWindow_SetSashBorder(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1033,7 +1027,7 @@ static PyObject *_wrap_new_wxQueryLayoutInfoEvent(PyObject *self, PyObject *args return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxQueryLayoutInfoEvent *)new_wxQueryLayoutInfoEvent(_arg0); + _result = (wxQueryLayoutInfoEvent *)new_wxQueryLayoutInfoEvent(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1067,7 +1061,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetRequestedLength(PyObject *self, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxQueryLayoutInfoEvent_SetRequestedLength(_arg0,_arg1); + wxQueryLayoutInfoEvent_SetRequestedLength(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1096,7 +1090,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetRequestedLength(PyObject *self, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxQueryLayoutInfoEvent_GetRequestedLength(_arg0); + _result = (int )wxQueryLayoutInfoEvent_GetRequestedLength(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1124,7 +1118,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxQueryLayoutInfoEvent_SetFlags(_arg0,_arg1); + wxQueryLayoutInfoEvent_SetFlags(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1153,7 +1147,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxQueryLayoutInfoEvent_GetFlags(_arg0); + _result = (int )wxQueryLayoutInfoEvent_GetFlags(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1188,7 +1182,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetSize(PyObject *self, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxQueryLayoutInfoEvent_SetSize(_arg0,*_arg1); + wxQueryLayoutInfoEvent_SetSize(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1218,7 +1212,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetSize(PyObject *self, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxSize (wxQueryLayoutInfoEvent_GetSize(_arg0)); + _result = new wxSize (wxQueryLayoutInfoEvent_GetSize(_arg0)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1247,7 +1241,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetOrientation(PyObject *self, PyO } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxQueryLayoutInfoEvent_SetOrientation(_arg0,_arg1); + wxQueryLayoutInfoEvent_SetOrientation(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1276,7 +1270,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetOrientation(PyObject *self, PyO } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxLayoutOrientation )wxQueryLayoutInfoEvent_GetOrientation(_arg0); + _result = (wxLayoutOrientation )wxQueryLayoutInfoEvent_GetOrientation(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1304,7 +1298,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxQueryLayoutInfoEvent_SetAlignment(_arg0,_arg1); + wxQueryLayoutInfoEvent_SetAlignment(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1333,7 +1327,7 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetAlignment(PyObject *self, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxLayoutAlignment )wxQueryLayoutInfoEvent_GetAlignment(_arg0); + _result = (wxLayoutAlignment )wxQueryLayoutInfoEvent_GetAlignment(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1370,7 +1364,7 @@ static PyObject *_wrap_new_wxCalculateLayoutEvent(PyObject *self, PyObject *args return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxCalculateLayoutEvent *)new_wxCalculateLayoutEvent(_arg0); + _result = (wxCalculateLayoutEvent *)new_wxCalculateLayoutEvent(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1404,7 +1398,7 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetFlags(PyObject *self, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxCalculateLayoutEvent_SetFlags(_arg0,_arg1); + wxCalculateLayoutEvent_SetFlags(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1433,7 +1427,7 @@ static PyObject *_wrap_wxCalculateLayoutEvent_GetFlags(PyObject *self, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxCalculateLayoutEvent_GetFlags(_arg0); + _result = (int )wxCalculateLayoutEvent_GetFlags(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1468,7 +1462,7 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetRect(PyObject *self, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxCalculateLayoutEvent_SetRect(_arg0,*_arg1); + wxCalculateLayoutEvent_SetRect(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1498,7 +1492,7 @@ static PyObject *_wrap_wxCalculateLayoutEvent_GetRect(PyObject *self, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxRect (wxCalculateLayoutEvent_GetRect(_arg0)); + _result = new wxRect (wxCalculateLayoutEvent_GetRect(_arg0)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1581,7 +1575,7 @@ static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxSashLayoutWindow *)new_wxSashLayoutWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); + _result = (wxSashLayoutWindow *)new_wxSashLayoutWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1607,7 +1601,7 @@ static PyObject *_wrap_new_wxPreSashLayoutWindow(PyObject *self, PyObject *args, return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxSashLayoutWindow *)new_wxPreSashLayoutWindow(); + _result = (wxSashLayoutWindow *)new_wxPreSashLayoutWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1671,7 +1665,7 @@ static PyObject *_wrap_wxSashLayoutWindow_Create(PyObject *self, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxSashLayoutWindow_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6); + _result = (bool )wxSashLayoutWindow_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1699,7 +1693,7 @@ static PyObject *_wrap_wxSashLayoutWindow_GetAlignment(PyObject *self, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxLayoutAlignment )wxSashLayoutWindow_GetAlignment(_arg0); + _result = (wxLayoutAlignment )wxSashLayoutWindow_GetAlignment(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1727,7 +1721,7 @@ static PyObject *_wrap_wxSashLayoutWindow_GetOrientation(PyObject *self, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxLayoutOrientation )wxSashLayoutWindow_GetOrientation(_arg0); + _result = (wxLayoutOrientation )wxSashLayoutWindow_GetOrientation(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1755,7 +1749,7 @@ static PyObject *_wrap_wxSashLayoutWindow_SetAlignment(PyObject *self, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashLayoutWindow_SetAlignment(_arg0,_arg1); + wxSashLayoutWindow_SetAlignment(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1791,7 +1785,7 @@ static PyObject *_wrap_wxSashLayoutWindow_SetDefaultSize(PyObject *self, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashLayoutWindow_SetDefaultSize(_arg0,*_arg1); + wxSashLayoutWindow_SetDefaultSize(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1820,7 +1814,7 @@ static PyObject *_wrap_wxSashLayoutWindow_SetOrientation(PyObject *self, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxSashLayoutWindow_SetOrientation(_arg0,_arg1); + wxSashLayoutWindow_SetOrientation(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1849,7 +1843,7 @@ static PyObject *_wrap_new_wxLayoutAlgorithm(PyObject *self, PyObject *args, PyO return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxLayoutAlgorithm *)new_wxLayoutAlgorithm(); + _result = (wxLayoutAlgorithm *)new_wxLayoutAlgorithm(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1882,7 +1876,7 @@ static PyObject *_wrap_delete_wxLayoutAlgorithm(PyObject *self, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete_wxLayoutAlgorithm(_arg0); + delete_wxLayoutAlgorithm(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1929,7 +1923,7 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxLayoutAlgorithm_LayoutMDIFrame(_arg0,_arg1,_arg2); + _result = (bool )wxLayoutAlgorithm_LayoutMDIFrame(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1975,7 +1969,7 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *a } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxLayoutAlgorithm_LayoutFrame(_arg0,_arg1,_arg2); + _result = (bool )wxLayoutAlgorithm_LayoutFrame(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2021,7 +2015,7 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutWindow(PyObject *self, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxLayoutAlgorithm_LayoutWindow(_arg0,_arg1,_arg2); + _result = (bool )wxLayoutAlgorithm_LayoutWindow(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2075,7 +2069,7 @@ static PyObject *_wrap_new_wxPopupWindow(PyObject *self, PyObject *args, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPopupWindow *)new_wxPopupWindow(_arg0,_arg1); + _result = (wxPopupWindow *)new_wxPopupWindow(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2101,7 +2095,7 @@ static PyObject *_wrap_new_wxPrePopupWindow(PyObject *self, PyObject *args, PyOb return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPopupWindow *)new_wxPrePopupWindow(); + _result = (wxPopupWindow *)new_wxPrePopupWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2145,7 +2139,7 @@ static PyObject *_wrap_wxPopupWindow_Create(PyObject *self, PyObject *args, PyOb } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxPopupWindow_Create(_arg0,_arg1,_arg2); + _result = (bool )wxPopupWindow_Create(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2188,7 +2182,7 @@ static PyObject *_wrap_wxPopupWindow_Position(PyObject *self, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPopupWindow_Position(_arg0,*_arg1,*_arg2); + wxPopupWindow_Position(_arg0,*_arg1,*_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2251,7 +2245,7 @@ static PyObject *_wrap_new_wxPopupTransientWindow(PyObject *self, PyObject *args } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPyPopupTransientWindow *)new_wxPopupTransientWindow(_arg0,_arg1); + _result = (wxPyPopupTransientWindow *)new_wxPopupTransientWindow(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2277,7 +2271,7 @@ static PyObject *_wrap_new_wxPrePopupTransientWindow(PyObject *self, PyObject *a return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxPyPopupTransientWindow *)new_wxPrePopupTransientWindow(); + _result = (wxPyPopupTransientWindow *)new_wxPrePopupTransientWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2320,7 +2314,7 @@ static PyObject *_wrap_wxPopupTransientWindow__setCallbackInfo(PyObject *self, P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPopupTransientWindow__setCallbackInfo(_arg0,_arg1,_arg2); + wxPopupTransientWindow__setCallbackInfo(_arg0,_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2357,7 +2351,7 @@ static PyObject *_wrap_wxPopupTransientWindow_Popup(PyObject *self, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPopupTransientWindow_Popup(_arg0,_arg1); + wxPopupTransientWindow_Popup(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2385,7 +2379,7 @@ static PyObject *_wrap_wxPopupTransientWindow_Dismiss(PyObject *self, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxPopupTransientWindow_Dismiss(_arg0); + wxPopupTransientWindow_Dismiss(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2464,22 +2458,9 @@ static PyObject *_wrap_new_wxTipWindow(PyObject *self, PyObject *args, PyObject } } { -#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) + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) return NULL; - _arg1 = new wxString(tmpPtr, tmpSize); -#else - if (!PyString_Check(_obj1)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1)); -#endif } if (_obj3) { @@ -2489,7 +2470,7 @@ static PyObject *_wrap_new_wxTipWindow(PyObject *self, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxTipWindow *)new_wxTipWindow(_arg0,_arg1,_arg2,_arg3); + _result = (wxTipWindow *)new_wxTipWindow(_arg0,_arg1,_arg2,_arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2534,7 +2515,7 @@ static PyObject *_wrap_wxTipWindow_SetBoundingRect(PyObject *self, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxTipWindow_SetBoundingRect(_arg0,*_arg1); + wxTipWindow_SetBoundingRect(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -2562,7 +2543,7 @@ static PyObject *_wrap_wxTipWindow_Close(PyObject *self, PyObject *args, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxTipWindow_Close(_arg0); + wxTipWindow_Close(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL;