AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied and merged patch 486364, which enables wxPython to be built in

Browse Source 
unicode mode.  There are a number of things still missing in it and
not everything is converted correctly...  But it now builds and
functions properly again in non-unicode mode so this is a good time to
check in everything.  The previous version of all of wxPython sources
is tagged wxPy_B4_UNICODE.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2002-03-10 00:40:13 +00:00
parent c8bc7bb84d
commit 6824d4f9e0
27 changed files with 5672 additions and 10634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wxPython/contrib/glcanvas/mac/glcanvas.cpp
View File

@ -89,12 +89,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
#ifdef __cplusplus
extern "C" {
#endif
@ -125,7 +119,7 @@ static PyObject *_wrap_delete_wxGLContext(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete_wxGLContext(_arg0);
delete_wxGLContext(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -153,7 +147,7 @@ static PyObject *_wrap_wxGLContext_SetCurrent(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxGLContext_SetCurrent(_arg0);
wxGLContext_SetCurrent(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -182,7 +176,7 @@ static PyObject *_wrap_wxGLContext_SetColour(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxGLContext_SetColour(_arg0,_arg1);
wxGLContext_SetColour(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -210,7 +204,7 @@ static PyObject *_wrap_wxGLContext_SwapBuffers(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxGLContext_SwapBuffers(_arg0);
wxGLContext_SwapBuffers(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -239,7 +233,7 @@ static PyObject *_wrap_wxGLContext_GetWindow(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxWindow *)wxGLContext_GetWindow(_arg0);
_result = (wxWindow *)wxGLContext_GetWindow(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -338,7 +332,7 @@ static PyObject *_wrap_new_wxGLCanvas(PyObject *self, PyObject *args, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxGLCanvas *)new_wxGLCanvas(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7);
_result = (wxGLCanvas *)new_wxGLCanvas(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -431,7 +425,7 @@ static PyObject *_wrap_new_wxGLCanvasWithContext(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxGLCanvas *)new_wxGLCanvasWithContext(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,*_arg8);
_result = (wxGLCanvas *)new_wxGLCanvasWithContext(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,*_arg8);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -467,7 +461,7 @@ static PyObject *_wrap_wxGLCanvas_SetCurrent(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxGLCanvas_SetCurrent(_arg0);
wxGLCanvas_SetCurrent(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -496,7 +490,7 @@ static PyObject *_wrap_wxGLCanvas_SetColour(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxGLCanvas_SetColour(_arg0,_arg1);
wxGLCanvas_SetColour(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -524,7 +518,7 @@ static PyObject *_wrap_wxGLCanvas_SwapBuffers(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxGLCanvas_SwapBuffers(_arg0);
wxGLCanvas_SwapBuffers(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -554,7 +548,7 @@ static PyObject *_wrap_wxGLCanvas_GetContext(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxGLContext *)wxGLCanvas_GetContext(_arg0);
_result = (wxGLContext *)wxGLCanvas_GetContext(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;

1122
wxPython/contrib/stc/mac/stc_.cpp
View File

File diff suppressed because it is too large Load Diff

108
wxPython/src/mac/calendar.cpp
View File

@ -84,12 +84,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
#ifdef __cplusplus
extern "C" {
#endif
@ -141,7 +135,7 @@ static PyObject *_wrap_new_wxCalendarDateAttr(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxCalendarDateAttr *)new_wxCalendarDateAttr(*_arg0,*_arg1,*_arg2,*_arg3,_arg4);
_result = (wxCalendarDateAttr *)new_wxCalendarDateAttr(*_arg0,*_arg1,*_arg2,*_arg3,_arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -177,7 +171,7 @@ static PyObject *_wrap_new_wxCalendarDateAttrBorder(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxCalendarDateAttr *)new_wxCalendarDateAttrBorder(_arg0,*_arg1);
_result = (wxCalendarDateAttr *)new_wxCalendarDateAttrBorder(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -218,7 +212,7 @@ static PyObject *_wrap_wxCalendarDateAttr_SetTextColour(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarDateAttr_SetTextColour(_arg0,*_arg1);
wxCalendarDateAttr_SetTextColour(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -254,7 +248,7 @@ static PyObject *_wrap_wxCalendarDateAttr_SetBackgroundColour(PyObject *self, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarDateAttr_SetBackgroundColour(_arg0,*_arg1);
wxCalendarDateAttr_SetBackgroundColour(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -290,7 +284,7 @@ static PyObject *_wrap_wxCalendarDateAttr_SetBorderColour(PyObject *self, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarDateAttr_SetBorderColour(_arg0,*_arg1);
wxCalendarDateAttr_SetBorderColour(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -327,7 +321,7 @@ static PyObject *_wrap_wxCalendarDateAttr_SetFont(PyObject *self, PyObject *args
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarDateAttr_SetFont(_arg0,*_arg1);
wxCalendarDateAttr_SetFont(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -356,7 +350,7 @@ static PyObject *_wrap_wxCalendarDateAttr_SetBorder(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarDateAttr_SetBorder(_arg0,_arg1);
wxCalendarDateAttr_SetBorder(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -387,7 +381,7 @@ static PyObject *_wrap_wxCalendarDateAttr_SetHoliday(PyObject *self, PyObject *a
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarDateAttr_SetHoliday(_arg0,_arg1);
wxCalendarDateAttr_SetHoliday(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -416,7 +410,7 @@ static PyObject *_wrap_wxCalendarDateAttr_HasTextColour(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarDateAttr_HasTextColour(_arg0);
_result = (bool )wxCalendarDateAttr_HasTextColour(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -444,7 +438,7 @@ static PyObject *_wrap_wxCalendarDateAttr_HasBackgroundColour(PyObject *self, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarDateAttr_HasBackgroundColour(_arg0);
_result = (bool )wxCalendarDateAttr_HasBackgroundColour(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -472,7 +466,7 @@ static PyObject *_wrap_wxCalendarDateAttr_HasBorderColour(PyObject *self, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarDateAttr_HasBorderColour(_arg0);
_result = (bool )wxCalendarDateAttr_HasBorderColour(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -500,7 +494,7 @@ static PyObject *_wrap_wxCalendarDateAttr_HasFont(PyObject *self, PyObject *args
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarDateAttr_HasFont(_arg0);
_result = (bool )wxCalendarDateAttr_HasFont(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -528,7 +522,7 @@ static PyObject *_wrap_wxCalendarDateAttr_HasBorder(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarDateAttr_HasBorder(_arg0);
_result = (bool )wxCalendarDateAttr_HasBorder(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -556,7 +550,7 @@ static PyObject *_wrap_wxCalendarDateAttr_IsHoliday(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarDateAttr_IsHoliday(_arg0);
_result = (bool )wxCalendarDateAttr_IsHoliday(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -585,7 +579,7 @@ static PyObject *_wrap_wxCalendarDateAttr_GetTextColour(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxColour (wxCalendarDateAttr_GetTextColour(_arg0));
_result = new wxColour (wxCalendarDateAttr_GetTextColour(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -615,7 +609,7 @@ static PyObject *_wrap_wxCalendarDateAttr_GetBackgroundColour(PyObject *self, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxColour (wxCalendarDateAttr_GetBackgroundColour(_arg0));
_result = new wxColour (wxCalendarDateAttr_GetBackgroundColour(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -645,7 +639,7 @@ static PyObject *_wrap_wxCalendarDateAttr_GetBorderColour(PyObject *self, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxColour (wxCalendarDateAttr_GetBorderColour(_arg0));
_result = new wxColour (wxCalendarDateAttr_GetBorderColour(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -675,7 +669,7 @@ static PyObject *_wrap_wxCalendarDateAttr_GetFont(PyObject *self, PyObject *args
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxFont (wxCalendarDateAttr_GetFont(_arg0));
_result = new wxFont (wxCalendarDateAttr_GetFont(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -704,7 +698,7 @@ static PyObject *_wrap_wxCalendarDateAttr_GetBorder(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxCalendarDateBorder )wxCalendarDateAttr_GetBorder(_arg0);
_result = (wxCalendarDateBorder )wxCalendarDateAttr_GetBorder(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -758,7 +752,7 @@ static PyObject *_wrap_new_wxCalendarEvent(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxCalendarEvent *)new_wxCalendarEvent(_arg0,_arg1);
_result = (wxCalendarEvent *)new_wxCalendarEvent(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -793,7 +787,7 @@ static PyObject *_wrap_wxCalendarEvent_GetDate(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxDateTime & _result_ref = wxCalendarEvent_GetDate(_arg0);
const wxDateTime & _result_ref = wxCalendarEvent_GetDate(_arg0);
_result = (wxDateTime *) &_result_ref;
wxPyEndAllowThreads(__tstate);
@ -828,7 +822,7 @@ static PyObject *_wrap_wxCalendarEvent_GetWeekDay(PyObject *self, PyObject *args
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxDateTime::WeekDay )wxCalendarEvent_GetWeekDay(_arg0);
_result = (wxDateTime::WeekDay )wxCalendarEvent_GetWeekDay(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -919,7 +913,7 @@ static PyObject *_wrap_new_wxCalendarCtrl(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxCalendarCtrl *)new_wxCalendarCtrl(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
_result = (wxCalendarCtrl *)new_wxCalendarCtrl(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -945,7 +939,7 @@ static PyObject *_wrap_new_wxPreCalendarCtrl(PyObject *self, PyObject *args, PyO
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxCalendarCtrl *)new_wxPreCalendarCtrl();
_result = (wxCalendarCtrl *)new_wxPreCalendarCtrl();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1018,7 +1012,7 @@ static PyObject *_wrap_wxCalendarCtrl_Create(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarCtrl_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
_result = (bool )wxCalendarCtrl_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1054,7 +1048,7 @@ static PyObject *_wrap_wxCalendarCtrl_SetDate(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarCtrl_SetDate(_arg0,*_arg1);
wxCalendarCtrl_SetDate(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1084,7 +1078,7 @@ static PyObject *_wrap_wxCalendarCtrl_GetDate(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxDateTime & _result_ref = wxCalendarCtrl_GetDate(_arg0);
const wxDateTime & _result_ref = wxCalendarCtrl_GetDate(_arg0);
_result = (wxDateTime *) &_result_ref;
wxPyEndAllowThreads(__tstate);
@ -1128,7 +1122,7 @@ static PyObject *_wrap_wxCalendarCtrl_SetLowerDateLimit(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarCtrl_SetLowerDateLimit(_arg0,*_arg1);
_result = (bool )wxCalendarCtrl_SetLowerDateLimit(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1157,7 +1151,7 @@ static PyObject *_wrap_wxCalendarCtrl_GetLowerDateLimit(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxDateTime & _result_ref = wxCalendarCtrl_GetLowerDateLimit(_arg0);
const wxDateTime & _result_ref = wxCalendarCtrl_GetLowerDateLimit(_arg0);
_result = (wxDateTime *) &_result_ref;
wxPyEndAllowThreads(__tstate);
@ -1201,7 +1195,7 @@ static PyObject *_wrap_wxCalendarCtrl_SetUpperDateLimit(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarCtrl_SetUpperDateLimit(_arg0,*_arg1);
_result = (bool )wxCalendarCtrl_SetUpperDateLimit(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1230,7 +1224,7 @@ static PyObject *_wrap_wxCalendarCtrl_GetUpperDateLimit(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxDateTime & _result_ref = wxCalendarCtrl_GetUpperDateLimit(_arg0);
const wxDateTime & _result_ref = wxCalendarCtrl_GetUpperDateLimit(_arg0);
_result = (wxDateTime *) &_result_ref;
wxPyEndAllowThreads(__tstate);
@ -1283,7 +1277,7 @@ static PyObject *_wrap_wxCalendarCtrl_SetDateRange(PyObject *self, PyObject *arg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarCtrl_SetDateRange(_arg0,*_arg1,*_arg2);
_result = (bool )wxCalendarCtrl_SetDateRange(_arg0,*_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1313,7 +1307,7 @@ static PyObject *_wrap_wxCalendarCtrl_EnableYearChange(PyObject *self, PyObject
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarCtrl_EnableYearChange(_arg0,_arg1);
wxCalendarCtrl_EnableYearChange(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1344,7 +1338,7 @@ static PyObject *_wrap_wxCalendarCtrl_EnableMonthChange(PyObject *self, PyObject
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarCtrl_EnableMonthChange(_arg0,_arg1);
wxCalendarCtrl_EnableMonthChange(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1375,7 +1369,7 @@ static PyObject *_wrap_wxCalendarCtrl_EnableHolidayDisplay(PyObject *self, PyObj
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarCtrl_EnableHolidayDisplay(_arg0,_arg1);
wxCalendarCtrl_EnableHolidayDisplay(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1419,7 +1413,7 @@ static PyObject *_wrap_wxCalendarCtrl_SetHeaderColours(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarCtrl_SetHeaderColours(_arg0,*_arg1,*_arg2);
wxCalendarCtrl_SetHeaderColours(_arg0,*_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1449,7 +1443,7 @@ static PyObject *_wrap_wxCalendarCtrl_GetHeaderColourFg(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxColour (wxCalendarCtrl_GetHeaderColourFg(_arg0));
_result = new wxColour (wxCalendarCtrl_GetHeaderColourFg(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1479,7 +1473,7 @@ static PyObject *_wrap_wxCalendarCtrl_GetHeaderColourBg(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxColour (wxCalendarCtrl_GetHeaderColourBg(_arg0));
_result = new wxColour (wxCalendarCtrl_GetHeaderColourBg(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1523,7 +1517,7 @@ static PyObject *_wrap_wxCalendarCtrl_SetHighlightColours(PyObject *self, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarCtrl_SetHighlightColours(_arg0,*_arg1,*_arg2);
wxCalendarCtrl_SetHighlightColours(_arg0,*_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1553,7 +1547,7 @@ static PyObject *_wrap_wxCalendarCtrl_GetHighlightColourFg(PyObject *self, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxColour (wxCalendarCtrl_GetHighlightColourFg(_arg0));
_result = new wxColour (wxCalendarCtrl_GetHighlightColourFg(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1583,7 +1577,7 @@ static PyObject *_wrap_wxCalendarCtrl_GetHighlightColourBg(PyObject *self, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxColour (wxCalendarCtrl_GetHighlightColourBg(_arg0));
_result = new wxColour (wxCalendarCtrl_GetHighlightColourBg(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1627,7 +1621,7 @@ static PyObject *_wrap_wxCalendarCtrl_SetHolidayColours(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarCtrl_SetHolidayColours(_arg0,*_arg1,*_arg2);
wxCalendarCtrl_SetHolidayColours(_arg0,*_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1657,7 +1651,7 @@ static PyObject *_wrap_wxCalendarCtrl_GetHolidayColourFg(PyObject *self, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxColour (wxCalendarCtrl_GetHolidayColourFg(_arg0));
_result = new wxColour (wxCalendarCtrl_GetHolidayColourFg(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1687,7 +1681,7 @@ static PyObject *_wrap_wxCalendarCtrl_GetHolidayColourBg(PyObject *self, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxColour (wxCalendarCtrl_GetHolidayColourBg(_arg0));
_result = new wxColour (wxCalendarCtrl_GetHolidayColourBg(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1718,7 +1712,7 @@ static PyObject *_wrap_wxCalendarCtrl_GetAttr(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxCalendarDateAttr *)wxCalendarCtrl_GetAttr(_arg0,_arg1);
_result = (wxCalendarDateAttr *)wxCalendarCtrl_GetAttr(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1761,7 +1755,7 @@ static PyObject *_wrap_wxCalendarCtrl_SetAttr(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarCtrl_SetAttr(_arg0,_arg1,_arg2);
wxCalendarCtrl_SetAttr(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1790,7 +1784,7 @@ static PyObject *_wrap_wxCalendarCtrl_SetHoliday(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarCtrl_SetHoliday(_arg0,_arg1);
wxCalendarCtrl_SetHoliday(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1819,7 +1813,7 @@ static PyObject *_wrap_wxCalendarCtrl_ResetAttr(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxCalendarCtrl_ResetAttr(_arg0,_arg1);
wxCalendarCtrl_ResetAttr(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1874,7 +1868,7 @@ static PyObject *_wrap_wxCalendarCtrl_HitTest(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxCalendarHitTestResult )wxCalendarCtrl_HitTest(_arg0,*_arg1,_arg2,_arg3);
_result = (wxCalendarHitTestResult )wxCalendarCtrl_HitTest(_arg0,*_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1905,7 +1899,7 @@ static PyObject *_wrap_wxCalendarCtrl_Enable(PyObject *self, PyObject *args, PyO
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarCtrl_Enable(_arg0,_arg1);
_result = (bool )wxCalendarCtrl_Enable(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1936,7 +1930,7 @@ static PyObject *_wrap_wxCalendarCtrl_Show(PyObject *self, PyObject *args, PyObj
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxCalendarCtrl_Show(_arg0,_arg1);
_result = (bool )wxCalendarCtrl_Show(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;

582
wxPython/src/mac/cmndlgs.cpp
View File

File diff suppressed because it is too large Load Diff

1135
wxPython/src/mac/controls.cpp
View File

File diff suppressed because it is too large Load Diff

1084
wxPython/src/mac/controls2.cpp
View File

File diff suppressed because it is too large Load Diff

486
wxPython/src/mac/events.cpp
View File

File diff suppressed because it is too large Load Diff

600
wxPython/src/mac/filesys.cpp
View File

File diff suppressed because it is too large Load Diff

301
wxPython/src/mac/frames.cpp
View File

@ -85,12 +85,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
#ifdef __cplusplus
extern "C" {
#endif
@ -149,22 +143,9 @@ static PyObject *_wrap_new_wxTopLevelWindow(PyObject *self, PyObject *args, PyOb
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg2 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
#endif
}
if (_obj3)
{
@ -180,7 +161,7 @@ static PyObject *_wrap_new_wxTopLevelWindow(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxTopLevelWindow *)new_wxTopLevelWindow(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
_result = (wxTopLevelWindow *)new_wxTopLevelWindow(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -210,7 +191,7 @@ static PyObject *_wrap_new_wxPreTopLevelWindow(PyObject *self, PyObject *args, P
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxTopLevelWindow *)new_wxPreTopLevelWindow();
_result = (wxTopLevelWindow *)new_wxPreTopLevelWindow();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -263,22 +244,9 @@ static PyObject *_wrap_wxTopLevelWindow_Create(PyObject *self, PyObject *args, P
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg3 = wxString_in_helper(_obj3);
if (_arg3 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg3 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
#endif
}
if (_obj4)
{
@ -294,7 +262,7 @@ static PyObject *_wrap_wxTopLevelWindow_Create(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxTopLevelWindow_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
_result = (bool )wxTopLevelWindow_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -328,7 +296,7 @@ static PyObject *_wrap_wxTopLevelWindow_Maximize(PyObject *self, PyObject *args,
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxTopLevelWindow_Maximize(_arg0,_arg1);
wxTopLevelWindow_Maximize(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -356,7 +324,7 @@ static PyObject *_wrap_wxTopLevelWindow_Restore(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxTopLevelWindow_Restore(_arg0);
wxTopLevelWindow_Restore(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -387,7 +355,7 @@ static PyObject *_wrap_wxTopLevelWindow_Iconize(PyObject *self, PyObject *args,
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxTopLevelWindow_Iconize(_arg0,_arg1);
wxTopLevelWindow_Iconize(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -416,7 +384,7 @@ static PyObject *_wrap_wxTopLevelWindow_IsMaximized(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxTopLevelWindow_IsMaximized(_arg0);
_result = (bool )wxTopLevelWindow_IsMaximized(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -444,7 +412,7 @@ static PyObject *_wrap_wxTopLevelWindow_IsIconized(PyObject *self, PyObject *arg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxTopLevelWindow_IsIconized(_arg0);
_result = (bool )wxTopLevelWindow_IsIconized(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -473,7 +441,7 @@ static PyObject *_wrap_wxTopLevelWindow_GetIcon(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxIcon (wxTopLevelWindow_GetIcon(_arg0));
_result = new wxIcon (wxTopLevelWindow_GetIcon(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -510,7 +478,7 @@ static PyObject *_wrap_wxTopLevelWindow_SetIcon(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxTopLevelWindow_SetIcon(_arg0,*_arg1);
wxTopLevelWindow_SetIcon(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -543,7 +511,7 @@ static PyObject *_wrap_wxTopLevelWindow_ShowFullScreen(PyObject *self, PyObject
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxTopLevelWindow_ShowFullScreen(_arg0,_arg1,_arg2);
_result = (bool )wxTopLevelWindow_ShowFullScreen(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -571,7 +539,7 @@ static PyObject *_wrap_wxTopLevelWindow_IsFullScreen(PyObject *self, PyObject *a
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxTopLevelWindow_IsFullScreen(_arg0);
_result = (bool )wxTopLevelWindow_IsFullScreen(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -599,26 +567,13 @@ static PyObject *_wrap_wxTopLevelWindow_SetTitle(PyObject *self, PyObject *args,
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
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_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxTopLevelWindow_SetTitle(_arg0,*_arg1);
wxTopLevelWindow_SetTitle(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -651,12 +606,16 @@ static PyObject *_wrap_wxTopLevelWindow_GetTitle(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxTopLevelWindow_GetTitle(_arg0));
_result = new wxString (wxTopLevelWindow_GetTitle(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
{
delete _result;
@ -727,22 +686,9 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args, PyObject *kwa
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg2 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
#endif
}
if (_obj3)
{
@ -758,7 +704,7 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args, PyObject *kwa
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxFrame *)new_wxFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
_result = (wxFrame *)new_wxFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -788,7 +734,7 @@ static PyObject *_wrap_new_wxPreFrame(PyObject *self, PyObject *args, PyObject *
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxFrame *)new_wxPreFrame();
_result = (wxFrame *)new_wxPreFrame();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -841,22 +787,9 @@ static PyObject *_wrap_wxFrame_Create(PyObject *self, PyObject *args, PyObject *
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg3 = wxString_in_helper(_obj3);
if (_arg3 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg3 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
#endif
}
if (_obj4)
{
@ -872,7 +805,7 @@ static PyObject *_wrap_wxFrame_Create(PyObject *self, PyObject *args, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxFrame_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
_result = (bool )wxFrame_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -905,7 +838,7 @@ static PyObject *_wrap_wxFrame_GetClientAreaOrigin(PyObject *self, PyObject *arg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxPoint (wxFrame_GetClientAreaOrigin(_arg0));
_result = new wxPoint (wxFrame_GetClientAreaOrigin(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -942,7 +875,7 @@ static PyObject *_wrap_wxFrame_SetMenuBar(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFrame_SetMenuBar(_arg0,_arg1);
wxFrame_SetMenuBar(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -971,7 +904,7 @@ static PyObject *_wrap_wxFrame_GetMenuBar(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMenuBar *)wxFrame_GetMenuBar(_arg0);
_result = (wxMenuBar *)wxFrame_GetMenuBar(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1000,7 +933,7 @@ static PyObject *_wrap_wxFrame_Command(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxFrame_Command(_arg0,_arg1);
_result = (bool )wxFrame_Command(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1029,7 +962,7 @@ static PyObject *_wrap_wxFrame_ProcessCommand(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxFrame_ProcessCommand(_arg0,_arg1);
_result = (bool )wxFrame_ProcessCommand(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1061,7 +994,7 @@ static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxStatusBar *)wxFrame_CreateStatusBar(_arg0,_arg1,_arg2,_arg3,_arg4);
_result = (wxStatusBar *)wxFrame_CreateStatusBar(_arg0,_arg1,_arg2,_arg3,_arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1089,7 +1022,7 @@ static PyObject *_wrap_wxFrame_GetStatusBar(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxStatusBar *)wxFrame_GetStatusBar(_arg0);
_result = (wxStatusBar *)wxFrame_GetStatusBar(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1125,7 +1058,7 @@ static PyObject *_wrap_wxFrame_SetStatusBar(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFrame_SetStatusBar(_arg0,_arg1);
wxFrame_SetStatusBar(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1155,26 +1088,13 @@ static PyObject *_wrap_wxFrame_SetStatusText(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);
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
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_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFrame_SetStatusText(_arg0,*_arg1,_arg2);
wxFrame_SetStatusText(_arg0,*_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1224,7 +1144,7 @@ static PyObject *_wrap_wxFrame_SetStatusWidths(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFrame_SetStatusWidths(_arg0,_arg1,_arg2);
wxFrame_SetStatusWidths(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1259,7 +1179,7 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxToolBar *)wxFrame_CreateToolBar(_arg0,_arg1,_arg2,_arg3);
_result = (wxToolBar *)wxFrame_CreateToolBar(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1287,7 +1207,7 @@ static PyObject *_wrap_wxFrame_GetToolBar(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxToolBar *)wxFrame_GetToolBar(_arg0);
_result = (wxToolBar *)wxFrame_GetToolBar(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1323,7 +1243,7 @@ static PyObject *_wrap_wxFrame_SetToolBar(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFrame_SetToolBar(_arg0,_arg1);
wxFrame_SetToolBar(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1395,22 +1315,9 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args, PyObject *kw
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg2 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
#endif
}
if (_obj3)
{
@ -1426,7 +1333,7 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args, PyObject *kw
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxDialog *)new_wxDialog(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
_result = (wxDialog *)new_wxDialog(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1456,7 +1363,7 @@ static PyObject *_wrap_new_wxPreDialog(PyObject *self, PyObject *args, PyObject
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxDialog *)new_wxPreDialog();
_result = (wxDialog *)new_wxPreDialog();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1509,22 +1416,9 @@ static PyObject *_wrap_wxDialog_Create(PyObject *self, PyObject *args, PyObject
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg3 = wxString_in_helper(_obj3);
if (_arg3 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg3 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
#endif
}
if (_obj4)
{
@ -1540,7 +1434,7 @@ static PyObject *_wrap_wxDialog_Create(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxDialog_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
_result = (bool )wxDialog_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1572,7 +1466,7 @@ static PyObject *_wrap_wxDialog_Centre(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDialog_Centre(_arg0,_arg1);
wxDialog_Centre(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1601,7 +1495,7 @@ static PyObject *_wrap_wxDialog_EndModal(PyObject *self, PyObject *args, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDialog_EndModal(_arg0,_arg1);
wxDialog_EndModal(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1632,7 +1526,7 @@ static PyObject *_wrap_wxDialog_SetModal(PyObject *self, PyObject *args, PyObjec
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDialog_SetModal(_arg0,_arg1);
wxDialog_SetModal(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1661,7 +1555,7 @@ static PyObject *_wrap_wxDialog_IsModal(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxDialog_IsModal(_arg0);
_result = (bool )wxDialog_IsModal(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1689,7 +1583,7 @@ static PyObject *_wrap_wxDialog_ShowModal(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxDialog_ShowModal(_arg0);
_result = (int )wxDialog_ShowModal(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1717,7 +1611,7 @@ static PyObject *_wrap_wxDialog_GetReturnCode(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxDialog_GetReturnCode(_arg0);
_result = (int )wxDialog_GetReturnCode(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1745,7 +1639,7 @@ static PyObject *_wrap_wxDialog_SetReturnCode(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDialog_SetReturnCode(_arg0,_arg1);
wxDialog_SetReturnCode(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1775,26 +1669,13 @@ static PyObject *_wrap_wxDialog_CreateTextSizer(PyObject *self, PyObject *args,
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
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_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSizer *)wxDialog_CreateTextSizer(_arg0,*_arg1);
_result = (wxSizer *)wxDialog_CreateTextSizer(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1827,7 +1708,7 @@ static PyObject *_wrap_wxDialog_CreateButtonSizer(PyObject *self, PyObject *args
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSizer *)wxDialog_CreateButtonSizer(_arg0,_arg1);
_result = (wxSizer *)wxDialog_CreateButtonSizer(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1906,22 +1787,9 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args, PyObject
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg2 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
#endif
}
if (_obj3)
{
@ -1937,7 +1805,7 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMiniFrame *)new_wxMiniFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
_result = (wxMiniFrame *)new_wxMiniFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1967,7 +1835,7 @@ static PyObject *_wrap_new_wxPreMiniFrame(PyObject *self, PyObject *args, PyObje
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMiniFrame *)new_wxPreMiniFrame();
_result = (wxMiniFrame *)new_wxPreMiniFrame();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2020,22 +1888,9 @@ static PyObject *_wrap_wxMiniFrame_Create(PyObject *self, PyObject *args, PyObje
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg3 = wxString_in_helper(_obj3);
if (_arg3 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg3 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
#endif
}
if (_obj4)
{
@ -2051,7 +1906,7 @@ static PyObject *_wrap_wxMiniFrame_Create(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxMiniFrame_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
_result = (bool )wxMiniFrame_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2137,7 +1992,7 @@ static PyObject *_wrap_new_wxSplashScreenWindow(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSplashScreenWindow *)new_wxSplashScreenWindow(*_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5);
_result = (wxSplashScreenWindow *)new_wxSplashScreenWindow(*_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2179,7 +2034,7 @@ static PyObject *_wrap_wxSplashScreenWindow_SetBitmap(PyObject *self, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSplashScreenWindow_SetBitmap(_arg0,*_arg1);
wxSplashScreenWindow_SetBitmap(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2209,7 +2064,7 @@ static PyObject *_wrap_wxSplashScreenWindow_GetBitmap(PyObject *self, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxBitmap & _result_ref = wxSplashScreenWindow_GetBitmap(_arg0);
wxBitmap & _result_ref = wxSplashScreenWindow_GetBitmap(_arg0);
_result = (wxBitmap *) &_result_ref;
wxPyEndAllowThreads(__tstate);
@ -2316,7 +2171,7 @@ static PyObject *_wrap_new_wxSplashScreen(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSplashScreen *)new_wxSplashScreen(*_arg0,_arg1,_arg2,_arg3,_arg4,*_arg5,*_arg6,_arg7);
_result = (wxSplashScreen *)new_wxSplashScreen(*_arg0,_arg1,_arg2,_arg3,_arg4,*_arg5,*_arg6,_arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2350,7 +2205,7 @@ static PyObject *_wrap_wxSplashScreen_GetSplashStyle(PyObject *self, PyObject *a
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (long )wxSplashScreen_GetSplashStyle(_arg0);
_result = (long )wxSplashScreen_GetSplashStyle(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2379,7 +2234,7 @@ static PyObject *_wrap_wxSplashScreen_GetSplashWindow(PyObject *self, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSplashScreenWindow *)wxSplashScreen_GetSplashWindow(_arg0);
_result = (wxSplashScreenWindow *)wxSplashScreen_GetSplashWindow(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2413,7 +2268,7 @@ static PyObject *_wrap_wxSplashScreen_GetTimeout(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSplashScreen_GetTimeout(_arg0);
_result = (int )wxSplashScreen_GetTimeout(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;

1078
wxPython/src/mac/gdi.cpp
View File

File diff suppressed because it is too large Load Diff

1218
wxPython/src/mac/grid.cpp
View File

File diff suppressed because it is too large Load Diff

132
wxPython/src/mac/help.cpp
View File

@ -84,12 +84,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
#ifdef __cplusplus
extern "C" {
#endif
@ -140,7 +134,7 @@ static PyObject *_wrap_new_wxHelpEvent(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxHelpEvent *)new_wxHelpEvent(_arg0,_arg1,*_arg2);
_result = (wxHelpEvent *)new_wxHelpEvent(_arg0,_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -175,7 +169,7 @@ static PyObject *_wrap_wxHelpEvent_GetPosition(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxPoint & _result_ref = wxHelpEvent_GetPosition(_arg0);
const wxPoint & _result_ref = wxHelpEvent_GetPosition(_arg0);
_result = (wxPoint *) &_result_ref;
wxPyEndAllowThreads(__tstate);
@ -217,7 +211,7 @@ static PyObject *_wrap_wxHelpEvent_SetPosition(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxHelpEvent_SetPosition(_arg0,*_arg1);
wxHelpEvent_SetPosition(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -246,13 +240,17 @@ static PyObject *_wrap_wxHelpEvent_GetLink(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxString & _result_ref = wxHelpEvent_GetLink(_arg0);
const wxString & _result_ref = wxHelpEvent_GetLink(_arg0);
_result = (wxString *) &_result_ref;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
return _resultobj;
}
@ -277,26 +275,13 @@ static PyObject *_wrap_wxHelpEvent_SetLink(PyObject *self, PyObject *args, PyObj
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
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_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxHelpEvent_SetLink(_arg0,*_arg1);
wxHelpEvent_SetLink(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -329,13 +314,17 @@ static PyObject *_wrap_wxHelpEvent_GetTarget(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxString & _result_ref = wxHelpEvent_GetTarget(_arg0);
const wxString & _result_ref = wxHelpEvent_GetTarget(_arg0);
_result = (wxString *) &_result_ref;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
return _resultobj;
}
@ -360,26 +349,13 @@ static PyObject *_wrap_wxHelpEvent_SetTarget(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);
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
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_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxHelpEvent_SetTarget(_arg0,*_arg1);
wxHelpEvent_SetTarget(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -439,7 +415,7 @@ static PyObject *_wrap_new_wxContextMenuEvent(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxContextMenuEvent *)new_wxContextMenuEvent(_arg0,_arg1,*_arg2);
_result = (wxContextMenuEvent *)new_wxContextMenuEvent(_arg0,_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -474,7 +450,7 @@ static PyObject *_wrap_wxContextMenuEvent_GetPosition(PyObject *self, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxPoint & _result_ref = wxContextMenuEvent_GetPosition(_arg0);
const wxPoint & _result_ref = wxContextMenuEvent_GetPosition(_arg0);
_result = (wxPoint *) &_result_ref;
wxPyEndAllowThreads(__tstate);
@ -516,7 +492,7 @@ static PyObject *_wrap_wxContextMenuEvent_SetPosition(PyObject *self, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxContextMenuEvent_SetPosition(_arg0,*_arg1);
wxContextMenuEvent_SetPosition(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -557,7 +533,7 @@ static PyObject *_wrap_new_wxContextHelp(PyObject *self, PyObject *args, PyObjec
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxContextHelp *)new_wxContextHelp(_arg0,_arg1);
_result = (wxContextHelp *)new_wxContextHelp(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -590,7 +566,7 @@ static PyObject *_wrap_delete_wxContextHelp(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete_wxContextHelp(_arg0);
delete_wxContextHelp(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -628,7 +604,7 @@ static PyObject *_wrap_wxContextHelp_BeginContextHelp(PyObject *self, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxContextHelp_BeginContextHelp(_arg0,_arg1);
_result = (bool )wxContextHelp_BeginContextHelp(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -656,7 +632,7 @@ static PyObject *_wrap_wxContextHelp_EndContextHelp(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxContextHelp_EndContextHelp(_arg0);
_result = (bool )wxContextHelp_EndContextHelp(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -753,7 +729,7 @@ static PyObject *_wrap_new_wxContextHelpButton(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxContextHelpButton *)new_wxContextHelpButton(_arg0,_arg1,*_arg2,*_arg3,_arg4);
_result = (wxContextHelpButton *)new_wxContextHelpButton(_arg0,_arg1,*_arg2,*_arg3,_arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -787,7 +763,7 @@ static PyObject *_wrap_wxHelpProvider_Set(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxHelpProvider *)wxHelpProvider::Set(_arg0);
_result = (wxHelpProvider *)wxHelpProvider::Set(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -812,7 +788,7 @@ static PyObject *_wrap_wxHelpProvider_Get(PyObject *self, PyObject *args, PyObje
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxHelpProvider *)wxHelpProvider::Get();
_result = (wxHelpProvider *)wxHelpProvider::Get();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -855,12 +831,16 @@ static PyObject *_wrap_wxHelpProvider_GetHelp(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxHelpProvider_GetHelp(_arg0,_arg1));
_result = new wxString (wxHelpProvider_GetHelp(_arg0,_arg1));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
{
delete _result;
@ -897,7 +877,7 @@ static PyObject *_wrap_wxHelpProvider_ShowHelp(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxHelpProvider_ShowHelp(_arg0,_arg1);
_result = (bool )wxHelpProvider_ShowHelp(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -934,26 +914,13 @@ static PyObject *_wrap_wxHelpProvider_AddHelp(PyObject *self, PyObject *args, Py
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg2 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxHelpProvider_AddHelp(_arg0,_arg1,*_arg2);
wxHelpProvider_AddHelp(_arg0,_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -987,26 +954,13 @@ static PyObject *_wrap_wxHelpProvider_AddHelpById(PyObject *self, PyObject *args
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg2 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxHelpProvider_AddHelpById(_arg0,_arg1,*_arg2);
wxHelpProvider_AddHelpById(_arg0,_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1038,7 +992,7 @@ static PyObject *_wrap_wxHelpProvider_Destroy(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxHelpProvider_Destroy(_arg0);
wxHelpProvider_Destroy(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1067,7 +1021,7 @@ static PyObject *_wrap_new_wxSimpleHelpProvider(PyObject *self, PyObject *args,
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSimpleHelpProvider *)new_wxSimpleHelpProvider();
_result = (wxSimpleHelpProvider *)new_wxSimpleHelpProvider();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;

978
wxPython/src/mac/html.cpp
View File

File diff suppressed because it is too large Load Diff

781
wxPython/src/mac/htmlhelp.cpp
View File

File diff suppressed because it is too large Load Diff

580
wxPython/src/mac/image.cpp
View File

File diff suppressed because it is too large Load Diff

114
wxPython/src/mac/mdi.cpp
View File

@ -83,12 +83,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
#ifdef __cplusplus
extern "C" {
#endif
@ -163,22 +157,9 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args, PyOb
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg2 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
#endif
}
if (_obj3)
{
@ -194,7 +175,7 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMDIParentFrame *)new_wxMDIParentFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
_result = (wxMDIParentFrame *)new_wxMDIParentFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -224,7 +205,7 @@ static PyObject *_wrap_new_wxPreMDIParentFrame(PyObject *self, PyObject *args, P
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMDIParentFrame *)new_wxPreMDIParentFrame();
_result = (wxMDIParentFrame *)new_wxPreMDIParentFrame();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -277,22 +258,9 @@ static PyObject *_wrap_wxMDIParentFrame_Create(PyObject *self, PyObject *args, P
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg3 = wxString_in_helper(_obj3);
if (_arg3 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg3 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
#endif
}
if (_obj4)
{
@ -308,7 +276,7 @@ static PyObject *_wrap_wxMDIParentFrame_Create(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxMDIParentFrame_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
_result = (bool )wxMDIParentFrame_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -339,7 +307,7 @@ static PyObject *_wrap_wxMDIParentFrame_ActivateNext(PyObject *self, PyObject *a
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxMDIParentFrame_ActivateNext(_arg0);
wxMDIParentFrame_ActivateNext(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -367,7 +335,7 @@ static PyObject *_wrap_wxMDIParentFrame_ActivatePrevious(PyObject *self, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxMDIParentFrame_ActivatePrevious(_arg0);
wxMDIParentFrame_ActivatePrevious(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -395,7 +363,7 @@ static PyObject *_wrap_wxMDIParentFrame_ArrangeIcons(PyObject *self, PyObject *a
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxMDIParentFrame_ArrangeIcons(_arg0);
wxMDIParentFrame_ArrangeIcons(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -423,7 +391,7 @@ static PyObject *_wrap_wxMDIParentFrame_Cascade(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxMDIParentFrame_Cascade(_arg0);
wxMDIParentFrame_Cascade(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -452,7 +420,7 @@ static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMDIChildFrame *)wxMDIParentFrame_GetActiveChild(_arg0);
_result = (wxMDIChildFrame *)wxMDIParentFrame_GetActiveChild(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -480,7 +448,7 @@ static PyObject *_wrap_wxMDIParentFrame_GetClientWindow(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMDIClientWindow *)wxMDIParentFrame_GetClientWindow(_arg0);
_result = (wxMDIClientWindow *)wxMDIParentFrame_GetClientWindow(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -508,7 +476,7 @@ static PyObject *_wrap_wxMDIParentFrame_GetToolBar(PyObject *self, PyObject *arg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxWindow *)wxMDIParentFrame_GetToolBar(_arg0);
_result = (wxWindow *)wxMDIParentFrame_GetToolBar(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -535,7 +503,7 @@ static PyObject *_wrap_wxMDIParentFrame_Tile(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxMDIParentFrame_Tile(_arg0);
wxMDIParentFrame_Tile(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -615,22 +583,9 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args, PyObj
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg2 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
#endif
}
if (_obj3)
{
@ -646,7 +601,7 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMDIChildFrame *)new_wxMDIChildFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
_result = (wxMDIChildFrame *)new_wxMDIChildFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -676,7 +631,7 @@ static PyObject *_wrap_new_wxPreMDIChildFrame(PyObject *self, PyObject *args, Py
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMDIChildFrame *)new_wxPreMDIChildFrame();
_result = (wxMDIChildFrame *)new_wxPreMDIChildFrame();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -729,22 +684,9 @@ static PyObject *_wrap_wxMDIChildFrame_Create(PyObject *self, PyObject *args, Py
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg3 = wxString_in_helper(_obj3);
if (_arg3 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg3 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
#endif
}
if (_obj4)
{
@ -760,7 +702,7 @@ static PyObject *_wrap_wxMDIChildFrame_Create(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxMDIChildFrame_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
_result = (bool )wxMDIChildFrame_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -791,7 +733,7 @@ static PyObject *_wrap_wxMDIChildFrame_Activate(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxMDIChildFrame_Activate(_arg0);
wxMDIChildFrame_Activate(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -822,7 +764,7 @@ static PyObject *_wrap_wxMDIChildFrame_Maximize(PyObject *self, PyObject *args,
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxMDIChildFrame_Maximize(_arg0,_arg1);
wxMDIChildFrame_Maximize(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -850,7 +792,7 @@ static PyObject *_wrap_wxMDIChildFrame_Restore(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxMDIChildFrame_Restore(_arg0);
wxMDIChildFrame_Restore(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -905,7 +847,7 @@ static PyObject *_wrap_new_wxMDIClientWindow(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMDIClientWindow *)new_wxMDIClientWindow(_arg0,_arg1);
_result = (wxMDIClientWindow *)new_wxMDIClientWindow(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -931,7 +873,7 @@ static PyObject *_wrap_new_wxPreMDIClientWindow(PyObject *self, PyObject *args,
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMDIClientWindow *)new_wxPreMDIClientWindow();
_result = (wxMDIClientWindow *)new_wxPreMDIClientWindow();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -975,7 +917,7 @@ static PyObject *_wrap_wxMDIClientWindow_Create(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxMDIClientWindow_Create(_arg0,_arg1,_arg2);
_result = (bool )wxMDIClientWindow_Create(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;

450
wxPython/src/mac/misc.cpp
View File

File diff suppressed because it is too large Load Diff

1675
wxPython/src/mac/misc2.cpp
View File

File diff suppressed because it is too large Load Diff

470
wxPython/src/mac/printfw.cpp
View File

File diff suppressed because it is too large Load Diff

174
wxPython/src/mac/sizers.cpp
View File

@ -86,12 +86,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 wxPySizer : public wxSizer {
DECLARE_DYNAMIC_CLASS(wxPySizer);
public:
@ -137,7 +131,7 @@ static PyObject *_wrap_wxSizerItem_DeleteWindows(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizerItem_DeleteWindows(_arg0);
wxSizerItem_DeleteWindows(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -167,7 +161,7 @@ static PyObject *_wrap_wxSizerItem_GetPosition(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxPoint (wxSizerItem_GetPosition(_arg0));
_result = new wxPoint (wxSizerItem_GetPosition(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -197,7 +191,7 @@ static PyObject *_wrap_wxSizerItem_GetSize(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxSize (wxSizerItem_GetSize(_arg0));
_result = new wxSize (wxSizerItem_GetSize(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -227,7 +221,7 @@ static PyObject *_wrap_wxSizerItem_CalcMin(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxSize (wxSizerItem_CalcMin(_arg0));
_result = new wxSize (wxSizerItem_CalcMin(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -271,7 +265,7 @@ static PyObject *_wrap_wxSizerItem_SetDimension(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizerItem_SetDimension(_arg0,*_arg1,*_arg2);
wxSizerItem_SetDimension(_arg0,*_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -301,7 +295,7 @@ static PyObject *_wrap_wxSizerItem_SetRatioWH(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizerItem_SetRatioWH(_arg0,_arg1,_arg2);
wxSizerItem_SetRatioWH(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -337,7 +331,7 @@ static PyObject *_wrap_wxSizerItem_SetRatioSize(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizerItem_SetRatioSize(_arg0,*_arg1);
wxSizerItem_SetRatioSize(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -366,7 +360,7 @@ static PyObject *_wrap_wxSizerItem_SetRatio(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizerItem_SetRatio(_arg0,_arg1);
wxSizerItem_SetRatio(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -395,7 +389,7 @@ static PyObject *_wrap_wxSizerItem_GetRatio(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (float )wxSizerItem_GetRatio(_arg0);
_result = (float )wxSizerItem_GetRatio(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -423,7 +417,7 @@ static PyObject *_wrap_wxSizerItem_IsWindow(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSizerItem_IsWindow(_arg0);
_result = (bool )wxSizerItem_IsWindow(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -451,7 +445,7 @@ static PyObject *_wrap_wxSizerItem_IsSizer(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSizerItem_IsSizer(_arg0);
_result = (bool )wxSizerItem_IsSizer(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -479,7 +473,7 @@ static PyObject *_wrap_wxSizerItem_IsSpacer(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSizerItem_IsSpacer(_arg0);
_result = (bool )wxSizerItem_IsSpacer(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -507,7 +501,7 @@ static PyObject *_wrap_wxSizerItem_GetWindow(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxWindow *)wxSizerItem_GetWindow(_arg0);
_result = (wxWindow *)wxSizerItem_GetWindow(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -543,7 +537,7 @@ static PyObject *_wrap_wxSizerItem_SetWindow(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizerItem_SetWindow(_arg0,_arg1);
wxSizerItem_SetWindow(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -572,7 +566,7 @@ static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSizer *)wxSizerItem_GetSizer(_arg0);
_result = (wxSizer *)wxSizerItem_GetSizer(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -608,7 +602,7 @@ static PyObject *_wrap_wxSizerItem_SetSizer(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizerItem_SetSizer(_arg0,_arg1);
wxSizerItem_SetSizer(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -637,7 +631,7 @@ static PyObject *_wrap_wxSizerItem_GetOption(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSizerItem_GetOption(_arg0);
_result = (int )wxSizerItem_GetOption(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -665,7 +659,7 @@ static PyObject *_wrap_wxSizerItem_GetFlag(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSizerItem_GetFlag(_arg0);
_result = (int )wxSizerItem_GetFlag(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -693,7 +687,7 @@ static PyObject *_wrap_wxSizerItem_GetBorder(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSizerItem_GetBorder(_arg0);
_result = (int )wxSizerItem_GetBorder(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -722,7 +716,7 @@ static PyObject *_wrap_wxSizerItem_SetInitSize(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizerItem_SetInitSize(_arg0,_arg1,_arg2);
wxSizerItem_SetInitSize(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -751,7 +745,7 @@ static PyObject *_wrap_wxSizerItem_SetOption(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizerItem_SetOption(_arg0,_arg1);
wxSizerItem_SetOption(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -780,7 +774,7 @@ static PyObject *_wrap_wxSizerItem_SetFlag(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizerItem_SetFlag(_arg0,_arg1);
wxSizerItem_SetFlag(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -809,7 +803,7 @@ static PyObject *_wrap_wxSizerItem_SetBorder(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizerItem_SetBorder(_arg0,_arg1);
wxSizerItem_SetBorder(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -847,7 +841,7 @@ static PyObject *_wrap_wxSizerItem_GetUserData(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (PyObject *)wxSizerItem_GetUserData(_arg0);
_result = (PyObject *)wxSizerItem_GetUserData(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -891,7 +885,7 @@ static PyObject *_wrap_wxSizer__setOORInfo(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer__setOORInfo(_arg0,_arg1);
wxSizer__setOORInfo(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -919,7 +913,7 @@ static PyObject *_wrap_wxSizer_Destroy(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_Destroy(_arg0);
wxSizer_Destroy(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -969,7 +963,7 @@ static PyObject *_wrap_wxSizer_AddWindow(PyObject *self, PyObject *args, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_AddWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
wxSizer_AddWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1019,7 +1013,7 @@ static PyObject *_wrap_wxSizer_AddSizer(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_AddSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
wxSizer_AddSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1062,7 +1056,7 @@ static PyObject *_wrap_wxSizer_AddSpacer(PyObject *self, PyObject *args, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_AddSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
wxSizer_AddSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1113,7 +1107,7 @@ static PyObject *_wrap_wxSizer_InsertWindow(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_InsertWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
wxSizer_InsertWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1164,7 +1158,7 @@ static PyObject *_wrap_wxSizer_InsertSizer(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_InsertSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
wxSizer_InsertSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1208,7 +1202,7 @@ static PyObject *_wrap_wxSizer_InsertSpacer(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_InsertSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7);
wxSizer_InsertSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1258,7 +1252,7 @@ static PyObject *_wrap_wxSizer_PrependWindow(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_PrependWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
wxSizer_PrependWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1308,7 +1302,7 @@ static PyObject *_wrap_wxSizer_PrependSizer(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_PrependSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
wxSizer_PrependSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1351,7 +1345,7 @@ static PyObject *_wrap_wxSizer_PrependSpacer(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_PrependSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
wxSizer_PrependSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1389,7 +1383,7 @@ static PyObject *_wrap_wxSizer_RemoveWindow(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSizer_RemoveWindow(_arg0,_arg1);
_result = (bool )wxSizer_RemoveWindow(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1426,7 +1420,7 @@ static PyObject *_wrap_wxSizer_RemoveSizer(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSizer_RemoveSizer(_arg0,_arg1);
_result = (bool )wxSizer_RemoveSizer(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1455,7 +1449,7 @@ static PyObject *_wrap_wxSizer_RemovePos(PyObject *self, PyObject *args, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSizer_RemovePos(_arg0,_arg1);
_result = (bool )wxSizer_RemovePos(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1486,7 +1480,7 @@ static PyObject *_wrap_wxSizer_SetDimension(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_SetDimension(_arg0,_arg1,_arg2,_arg3,_arg4);
wxSizer_SetDimension(_arg0,_arg1,_arg2,_arg3,_arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1522,7 +1516,7 @@ static PyObject *_wrap_wxSizer_SetMinSize(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_SetMinSize(_arg0,*_arg1);
wxSizer_SetMinSize(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1561,7 +1555,7 @@ static PyObject *_wrap_wxSizer_SetItemMinSizeWindow(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_SetItemMinSizeWindow(_arg0,_arg1,_arg2,_arg3);
wxSizer_SetItemMinSizeWindow(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1600,7 +1594,7 @@ static PyObject *_wrap_wxSizer_SetItemMinSizeSizer(PyObject *self, PyObject *arg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_SetItemMinSizeSizer(_arg0,_arg1,_arg2,_arg3);
wxSizer_SetItemMinSizeSizer(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1631,7 +1625,7 @@ static PyObject *_wrap_wxSizer_SetItemMinSizePos(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_SetItemMinSizePos(_arg0,_arg1,_arg2,_arg3);
wxSizer_SetItemMinSizePos(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1661,7 +1655,7 @@ static PyObject *_wrap_wxSizer_GetSize(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxSize (wxSizer_GetSize(_arg0));
_result = new wxSize (wxSizer_GetSize(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1691,7 +1685,7 @@ static PyObject *_wrap_wxSizer_GetPosition(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxPoint (wxSizer_GetPosition(_arg0));
_result = new wxPoint (wxSizer_GetPosition(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1721,7 +1715,7 @@ static PyObject *_wrap_wxSizer_GetMinSize(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxSize (wxSizer_GetMinSize(_arg0));
_result = new wxSize (wxSizer_GetMinSize(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1749,7 +1743,7 @@ static PyObject *_wrap_wxSizer_Layout(PyObject *self, PyObject *args, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_Layout(_arg0);
wxSizer_Layout(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1786,7 +1780,7 @@ static PyObject *_wrap_wxSizer_Fit(PyObject *self, PyObject *args, PyObject *kwa
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_Fit(_arg0,_arg1);
wxSizer_Fit(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1823,7 +1817,7 @@ static PyObject *_wrap_wxSizer_SetSizeHints(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_SetSizeHints(_arg0,_arg1);
wxSizer_SetSizeHints(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1854,7 +1848,7 @@ static PyObject *_wrap_wxSizer_Clear(PyObject *self, PyObject *args, PyObject *k
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_Clear(_arg0,_arg1);
wxSizer_Clear(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1882,7 +1876,7 @@ static PyObject *_wrap_wxSizer_DeleteWindows(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_DeleteWindows(_arg0);
wxSizer_DeleteWindows(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1914,7 +1908,7 @@ static PyObject *_wrap_wxSizer_GetChildren(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (PyObject *)wxSizer_GetChildren(_arg0);
_result = (PyObject *)wxSizer_GetChildren(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1952,7 +1946,7 @@ static PyObject *_wrap_new_wxPySizer(PyObject *self, PyObject *args, PyObject *k
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxPySizer *)new_wxPySizer();
_result = (wxPySizer *)new_wxPySizer();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1995,7 +1989,7 @@ static PyObject *_wrap_wxPySizer__setCallbackInfo(PyObject *self, PyObject *args
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPySizer__setCallbackInfo(_arg0,_arg1,_arg2);
wxPySizer__setCallbackInfo(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2033,7 +2027,7 @@ static PyObject *_wrap_new_wxBoxSizer(PyObject *self, PyObject *args, PyObject *
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxBoxSizer *)new_wxBoxSizer(_arg0);
_result = (wxBoxSizer *)new_wxBoxSizer(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2067,7 +2061,7 @@ static PyObject *_wrap_wxBoxSizer_GetOrientation(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxBoxSizer_GetOrientation(_arg0);
_result = (int )wxBoxSizer_GetOrientation(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2094,7 +2088,7 @@ static PyObject *_wrap_wxBoxSizer_RecalcSizes(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxBoxSizer_RecalcSizes(_arg0);
wxBoxSizer_RecalcSizes(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2124,7 +2118,7 @@ static PyObject *_wrap_wxBoxSizer_CalcMin(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxSize (wxBoxSizer_CalcMin(_arg0));
_result = new wxSize (wxBoxSizer_CalcMin(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2179,7 +2173,7 @@ static PyObject *_wrap_new_wxStaticBoxSizer(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxStaticBoxSizer *)new_wxStaticBoxSizer(_arg0,_arg1);
_result = (wxStaticBoxSizer *)new_wxStaticBoxSizer(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2213,7 +2207,7 @@ static PyObject *_wrap_wxStaticBoxSizer_GetStaticBox(PyObject *self, PyObject *a
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxStaticBox *)wxStaticBoxSizer_GetStaticBox(_arg0);
_result = (wxStaticBox *)wxStaticBoxSizer_GetStaticBox(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2240,7 +2234,7 @@ static PyObject *_wrap_wxStaticBoxSizer_RecalcSizes(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxStaticBoxSizer_RecalcSizes(_arg0);
wxStaticBoxSizer_RecalcSizes(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2270,7 +2264,7 @@ static PyObject *_wrap_wxStaticBoxSizer_CalcMin(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxSize (wxStaticBoxSizer_CalcMin(_arg0));
_result = new wxSize (wxStaticBoxSizer_CalcMin(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2316,7 +2310,7 @@ static PyObject *_wrap_new_wxNotebookSizer(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxNotebookSizer *)new_wxNotebookSizer(_arg0);
_result = (wxNotebookSizer *)new_wxNotebookSizer(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2349,7 +2343,7 @@ static PyObject *_wrap_wxNotebookSizer_RecalcSizes(PyObject *self, PyObject *arg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebookSizer_RecalcSizes(_arg0);
wxNotebookSizer_RecalcSizes(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2379,7 +2373,7 @@ static PyObject *_wrap_wxNotebookSizer_CalcMin(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxSize (wxNotebookSizer_CalcMin(_arg0));
_result = new wxSize (wxNotebookSizer_CalcMin(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2408,7 +2402,7 @@ static PyObject *_wrap_wxNotebookSizer_GetNotebook(PyObject *self, PyObject *arg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxNotebook *)wxNotebookSizer_GetNotebook(_arg0);
_result = (wxNotebook *)wxNotebookSizer_GetNotebook(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2448,7 +2442,7 @@ static PyObject *_wrap_new_wxGridSizer(PyObject *self, PyObject *args, PyObject
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxGridSizer *)new_wxGridSizer(_arg0,_arg1,_arg2,_arg3);
_result = (wxGridSizer *)new_wxGridSizer(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2481,7 +2475,7 @@ static PyObject *_wrap_wxGridSizer_RecalcSizes(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxGridSizer_RecalcSizes(_arg0);
wxGridSizer_RecalcSizes(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2511,7 +2505,7 @@ static PyObject *_wrap_wxGridSizer_CalcMin(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxSize (wxGridSizer_CalcMin(_arg0));
_result = new wxSize (wxGridSizer_CalcMin(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2540,7 +2534,7 @@ static PyObject *_wrap_wxGridSizer_SetCols(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxGridSizer_SetCols(_arg0,_arg1);
wxGridSizer_SetCols(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2569,7 +2563,7 @@ static PyObject *_wrap_wxGridSizer_SetRows(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxGridSizer_SetRows(_arg0,_arg1);
wxGridSizer_SetRows(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2598,7 +2592,7 @@ static PyObject *_wrap_wxGridSizer_SetVGap(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxGridSizer_SetVGap(_arg0,_arg1);
wxGridSizer_SetVGap(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2627,7 +2621,7 @@ static PyObject *_wrap_wxGridSizer_SetHGap(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxGridSizer_SetHGap(_arg0,_arg1);
wxGridSizer_SetHGap(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2656,7 +2650,7 @@ static PyObject *_wrap_wxGridSizer_GetCols(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxGridSizer_GetCols(_arg0);
_result = (int )wxGridSizer_GetCols(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2684,7 +2678,7 @@ static PyObject *_wrap_wxGridSizer_GetRows(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxGridSizer_GetRows(_arg0);
_result = (int )wxGridSizer_GetRows(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2712,7 +2706,7 @@ static PyObject *_wrap_wxGridSizer_GetVGap(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxGridSizer_GetVGap(_arg0);
_result = (int )wxGridSizer_GetVGap(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2740,7 +2734,7 @@ static PyObject *_wrap_wxGridSizer_GetHGap(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxGridSizer_GetHGap(_arg0);
_result = (int )wxGridSizer_GetHGap(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2788,7 +2782,7 @@ static PyObject *_wrap_new_wxFlexGridSizer(PyObject *self, PyObject *args, PyObj
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxFlexGridSizer *)new_wxFlexGridSizer(_arg0,_arg1,_arg2,_arg3);
_result = (wxFlexGridSizer *)new_wxFlexGridSizer(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2821,7 +2815,7 @@ static PyObject *_wrap_wxFlexGridSizer_RecalcSizes(PyObject *self, PyObject *arg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFlexGridSizer_RecalcSizes(_arg0);
wxFlexGridSizer_RecalcSizes(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2851,7 +2845,7 @@ static PyObject *_wrap_wxFlexGridSizer_CalcMin(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxSize (wxFlexGridSizer_CalcMin(_arg0));
_result = new wxSize (wxFlexGridSizer_CalcMin(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2880,7 +2874,7 @@ static PyObject *_wrap_wxFlexGridSizer_AddGrowableRow(PyObject *self, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFlexGridSizer_AddGrowableRow(_arg0,_arg1);
wxFlexGridSizer_AddGrowableRow(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2909,7 +2903,7 @@ static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableRow(PyObject *self, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFlexGridSizer_RemoveGrowableRow(_arg0,_arg1);
wxFlexGridSizer_RemoveGrowableRow(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2938,7 +2932,7 @@ static PyObject *_wrap_wxFlexGridSizer_AddGrowableCol(PyObject *self, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFlexGridSizer_AddGrowableCol(_arg0,_arg1);
wxFlexGridSizer_AddGrowableCol(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2967,7 +2961,7 @@ static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableCol(PyObject *self, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFlexGridSizer_RemoveGrowableCol(_arg0,_arg1);
wxFlexGridSizer_RemoveGrowableCol(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;

448
wxPython/src/mac/stattool.cpp
View File

File diff suppressed because it is too large Load Diff

55
wxPython/src/mac/streams.cpp
View File

@ -86,12 +86,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
#ifdef __cplusplus
extern "C" {
#endif
@ -119,7 +113,7 @@ static PyObject *_wrap_new_wxInputStream(PyObject *self, PyObject *args, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxPyInputStream *)new_wxPyInputStream(_arg0);
_result = (wxPyInputStream *)new_wxPyInputStream(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -152,7 +146,7 @@ static PyObject *_wrap_wxInputStream_close(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxInputStream_close(_arg0);
wxInputStream_close(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -180,7 +174,7 @@ static PyObject *_wrap_wxInputStream_flush(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxInputStream_flush(_arg0);
wxInputStream_flush(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -209,7 +203,7 @@ static PyObject *_wrap_wxInputStream_eof(PyObject *self, PyObject *args, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxInputStream_eof(_arg0);
_result = (bool )wxInputStream_eof(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -238,12 +232,16 @@ static PyObject *_wrap_wxInputStream_read(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxString *)wxInputStream_read(_arg0,_arg1);
_result = (wxString *)wxInputStream_read(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
return _resultobj;
}
@ -269,12 +267,16 @@ static PyObject *_wrap_wxInputStream_readline(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxString *)wxInputStream_readline(_arg0,_arg1);
_result = (wxString *)wxInputStream_readline(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
return _resultobj;
}
@ -300,7 +302,7 @@ static PyObject *_wrap_wxInputStream_readlines(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxStringPtrList *)wxInputStream_readlines(_arg0,_arg1);
_result = (wxStringPtrList *)wxInputStream_readlines(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -310,7 +312,11 @@ static PyObject *_wrap_wxInputStream_readlines(PyObject *self, PyObject *args, P
wxStringPtrList::Node *node = _result->GetFirst();
for (int i=0; node; i++) {
wxString *s = node->GetData();
#if wxUSE_UNICODE
PyList_SetItem(_resultobj, i, PyUnicode_FromUnicode(s->c_str(), s->Len()));
#else
PyList_SetItem(_resultobj, i, PyString_FromStringAndSize(s->c_str(), s->Len()));
#endif
node = node->GetNext();
delete s;
}
@ -343,7 +349,7 @@ static PyObject *_wrap_wxInputStream_seek(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxInputStream_seek(_arg0,_arg1,_arg2);
wxInputStream_seek(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -372,7 +378,7 @@ static PyObject *_wrap_wxInputStream_tell(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxInputStream_tell(_arg0);
_result = (int )wxInputStream_tell(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -402,26 +408,13 @@ static PyObject *_wrap_wxOutputStream_write(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);
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
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_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxOutputStream_write(_arg0,*_arg1);
wxOutputStream_write(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;

1096
wxPython/src/mac/utils.cpp
View File

File diff suppressed because it is too large Load Diff

1181
wxPython/src/mac/windows.cpp
View File

File diff suppressed because it is too large Load Diff

173
wxPython/src/mac/windows2.cpp
View File

@ -92,12 +92,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
#ifdef __cplusplus
extern "C" {
#endif
@ -149,7 +143,7 @@ static PyObject *_wrap_new_wxNotebookEvent(PyObject *self, PyObject *args, PyObj
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxNotebookEvent *)new_wxNotebookEvent(_arg0,_arg1,_arg2,_arg3);
_result = (wxNotebookEvent *)new_wxNotebookEvent(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -183,7 +177,7 @@ static PyObject *_wrap_wxNotebookEvent_GetSelection(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxNotebookEvent_GetSelection(_arg0);
_result = (int )wxNotebookEvent_GetSelection(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -211,7 +205,7 @@ static PyObject *_wrap_wxNotebookEvent_GetOldSelection(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxNotebookEvent_GetOldSelection(_arg0);
_result = (int )wxNotebookEvent_GetOldSelection(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -239,7 +233,7 @@ static PyObject *_wrap_wxNotebookEvent_SetOldSelection(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebookEvent_SetOldSelection(_arg0,_arg1);
wxNotebookEvent_SetOldSelection(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -268,7 +262,7 @@ static PyObject *_wrap_wxNotebookEvent_SetSelection(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebookEvent_SetSelection(_arg0,_arg1);
wxNotebookEvent_SetSelection(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -351,7 +345,7 @@ static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxNotebook *)new_wxNotebook(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
_result = (wxNotebook *)new_wxNotebook(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -377,7 +371,7 @@ static PyObject *_wrap_new_wxPreNotebook(PyObject *self, PyObject *args, PyObjec
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxNotebook *)new_wxPreNotebook();
_result = (wxNotebook *)new_wxPreNotebook();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -441,7 +435,7 @@ static PyObject *_wrap_wxNotebook_Create(PyObject *self, PyObject *args, PyObjec
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxNotebook_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6);
_result = (bool )wxNotebook_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -469,7 +463,7 @@ static PyObject *_wrap_wxNotebook_GetPageCount(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxNotebook_GetPageCount(_arg0);
_result = (int )wxNotebook_GetPageCount(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -498,7 +492,7 @@ static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxNotebook_SetSelection(_arg0,_arg1);
_result = (int )wxNotebook_SetSelection(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -528,7 +522,7 @@ static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *arg
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebook_AdvanceSelection(_arg0,_arg1);
wxNotebook_AdvanceSelection(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -557,7 +551,7 @@ static PyObject *_wrap_wxNotebook_GetSelection(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxNotebook_GetSelection(_arg0);
_result = (int )wxNotebook_GetSelection(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -587,26 +581,13 @@ static PyObject *_wrap_wxNotebook_SetPageText(PyObject *self, PyObject *args, Py
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg2 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxNotebook_SetPageText(_arg0,_arg1,*_arg2);
_result = (bool )wxNotebook_SetPageText(_arg0,_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -639,12 +620,16 @@ static PyObject *_wrap_wxNotebook_GetPageText(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxNotebook_GetPageText(_arg0,_arg1));
_result = new wxString (wxNotebook_GetPageText(_arg0,_arg1));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
{
delete _result;
@ -680,7 +665,7 @@ static PyObject *_wrap_wxNotebook_SetImageList(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebook_SetImageList(_arg0,_arg1);
wxNotebook_SetImageList(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -717,7 +702,7 @@ static PyObject *_wrap_wxNotebook_AssignImageList(PyObject *self, PyObject *args
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebook_AssignImageList(_arg0,_arg1);
wxNotebook_AssignImageList(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -746,7 +731,7 @@ static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxImageList *)wxNotebook_GetImageList(_arg0);
_result = (wxImageList *)wxNotebook_GetImageList(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -775,7 +760,7 @@ static PyObject *_wrap_wxNotebook_GetPageImage(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxNotebook_GetPageImage(_arg0,_arg1);
_result = (int )wxNotebook_GetPageImage(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -805,7 +790,7 @@ static PyObject *_wrap_wxNotebook_SetPageImage(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxNotebook_SetPageImage(_arg0,_arg1,_arg2);
_result = (bool )wxNotebook_SetPageImage(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -833,7 +818,7 @@ static PyObject *_wrap_wxNotebook_GetRowCount(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxNotebook_GetRowCount(_arg0);
_result = (int )wxNotebook_GetRowCount(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -868,7 +853,7 @@ static PyObject *_wrap_wxNotebook_SetPageSize(PyObject *self, PyObject *args, Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebook_SetPageSize(_arg0,*_arg1);
wxNotebook_SetPageSize(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -904,7 +889,7 @@ static PyObject *_wrap_wxNotebook_SetPadding(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebook_SetPadding(_arg0,*_arg1);
wxNotebook_SetPadding(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -934,7 +919,7 @@ static PyObject *_wrap_wxNotebook_DeletePage(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxNotebook_DeletePage(_arg0,_arg1);
_result = (bool )wxNotebook_DeletePage(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -963,7 +948,7 @@ static PyObject *_wrap_wxNotebook_RemovePage(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxNotebook_RemovePage(_arg0,_arg1);
_result = (bool )wxNotebook_RemovePage(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -991,7 +976,7 @@ static PyObject *_wrap_wxNotebook_DeleteAllPages(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxNotebook_DeleteAllPages(_arg0);
_result = (bool )wxNotebook_DeleteAllPages(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1031,26 +1016,13 @@ static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args, PyObje
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg2 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxNotebook_AddPage(_arg0,_arg1,*_arg2,_arg3,_arg4);
_result = (bool )wxNotebook_AddPage(_arg0,_arg1,*_arg2,_arg3,_arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1096,27 +1068,14 @@ static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args, PyO
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
_arg3 = wxString_in_helper(_obj3);
if (_arg3 == NULL)
return NULL;
}
if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg3 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj3)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
#endif
}
_arg4 = (bool ) tempbool4;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxNotebook_InsertPage(_arg0,_arg1,_arg2,*_arg3,_arg4,_arg5);
_result = (bool )wxNotebook_InsertPage(_arg0,_arg1,_arg2,*_arg3,_arg4,_arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1149,7 +1108,7 @@ static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1);
_result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1179,7 +1138,7 @@ static PyObject *_wrap_wxNotebook_ResizeChildren(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebook_ResizeChildren(_arg0);
wxNotebook_ResizeChildren(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1234,7 +1193,7 @@ static PyObject *_wrap_new_wxSplitterEvent(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSplitterEvent *)new_wxSplitterEvent(_arg0,_arg1);
_result = (wxSplitterEvent *)new_wxSplitterEvent(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1268,7 +1227,7 @@ static PyObject *_wrap_wxSplitterEvent_GetSashPosition(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSplitterEvent_GetSashPosition(_arg0);
_result = (int )wxSplitterEvent_GetSashPosition(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1296,7 +1255,7 @@ static PyObject *_wrap_wxSplitterEvent_GetX(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSplitterEvent_GetX(_arg0);
_result = (int )wxSplitterEvent_GetX(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1324,7 +1283,7 @@ static PyObject *_wrap_wxSplitterEvent_GetY(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSplitterEvent_GetY(_arg0);
_result = (int )wxSplitterEvent_GetY(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1352,7 +1311,7 @@ static PyObject *_wrap_wxSplitterEvent_GetWindowBeingRemoved(PyObject *self, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxWindow *)wxSplitterEvent_GetWindowBeingRemoved(_arg0);
_result = (wxWindow *)wxSplitterEvent_GetWindowBeingRemoved(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1380,7 +1339,7 @@ static PyObject *_wrap_wxSplitterEvent_SetSashPosition(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSplitterEvent_SetSashPosition(_arg0,_arg1);
wxSplitterEvent_SetSashPosition(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1455,7 +1414,7 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSplitterWindow *)new_wxSplitterWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
_result = (wxSplitterWindow *)new_wxSplitterWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1481,7 +1440,7 @@ static PyObject *_wrap_new_wxPreSplitterWindow(PyObject *self, PyObject *args, P
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSplitterWindow *)new_wxPreSplitterWindow();
_result = (wxSplitterWindow *)new_wxPreSplitterWindow();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1545,7 +1504,7 @@ static PyObject *_wrap_wxSplitterWindow_Create(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSplitterWindow_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6);
_result = (bool )wxSplitterWindow_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1573,7 +1532,7 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow1(PyObject *self, PyObject *arg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxWindow *)wxSplitterWindow_GetWindow1(_arg0);
_result = (wxWindow *)wxSplitterWindow_GetWindow1(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1601,7 +1560,7 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow2(PyObject *self, PyObject *arg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxWindow *)wxSplitterWindow_GetWindow2(_arg0);
_result = (wxWindow *)wxSplitterWindow_GetWindow2(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1629,7 +1588,7 @@ static PyObject *_wrap_wxSplitterWindow_SetSplitMode(PyObject *self, PyObject *a
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSplitterWindow_SetSplitMode(_arg0,_arg1);
wxSplitterWindow_SetSplitMode(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1658,7 +1617,7 @@ static PyObject *_wrap_wxSplitterWindow_GetSplitMode(PyObject *self, PyObject *a
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSplitterWindow_GetSplitMode(_arg0);
_result = (int )wxSplitterWindow_GetSplitMode(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1694,7 +1653,7 @@ static PyObject *_wrap_wxSplitterWindow_Initialize(PyObject *self, PyObject *arg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSplitterWindow_Initialize(_arg0,_arg1);
wxSplitterWindow_Initialize(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1742,7 +1701,7 @@ static PyObject *_wrap_wxSplitterWindow_SplitVertically(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSplitterWindow_SplitVertically(_arg0,_arg1,_arg2,_arg3);
_result = (bool )wxSplitterWindow_SplitVertically(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1789,7 +1748,7 @@ static PyObject *_wrap_wxSplitterWindow_SplitHorizontally(PyObject *self, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSplitterWindow_SplitHorizontally(_arg0,_arg1,_arg2,_arg3);
_result = (bool )wxSplitterWindow_SplitHorizontally(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1826,7 +1785,7 @@ static PyObject *_wrap_wxSplitterWindow_Unsplit(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSplitterWindow_Unsplit(_arg0,_arg1);
_result = (bool )wxSplitterWindow_Unsplit(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1872,7 +1831,7 @@ static PyObject *_wrap_wxSplitterWindow_ReplaceWindow(PyObject *self, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSplitterWindow_ReplaceWindow(_arg0,_arg1,_arg2);
_result = (bool )wxSplitterWindow_ReplaceWindow(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1900,7 +1859,7 @@ static PyObject *_wrap_wxSplitterWindow_IsSplit(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSplitterWindow_IsSplit(_arg0);
_result = (bool )wxSplitterWindow_IsSplit(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1928,7 +1887,7 @@ static PyObject *_wrap_wxSplitterWindow_SetSashSize(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSplitterWindow_SetSashSize(_arg0,_arg1);
wxSplitterWindow_SetSashSize(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1957,7 +1916,7 @@ static PyObject *_wrap_wxSplitterWindow_SetBorderSize(PyObject *self, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSplitterWindow_SetBorderSize(_arg0,_arg1);
wxSplitterWindow_SetBorderSize(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1986,7 +1945,7 @@ static PyObject *_wrap_wxSplitterWindow_GetSashSize(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSplitterWindow_GetSashSize(_arg0);
_result = (int )wxSplitterWindow_GetSashSize(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2014,7 +1973,7 @@ static PyObject *_wrap_wxSplitterWindow_GetBorderSize(PyObject *self, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSplitterWindow_GetBorderSize(_arg0);
_result = (int )wxSplitterWindow_GetBorderSize(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2045,7 +2004,7 @@ static PyObject *_wrap_wxSplitterWindow_SetSashPosition(PyObject *self, PyObject
_arg2 = (bool ) tempbool2;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSplitterWindow_SetSashPosition(_arg0,_arg1,_arg2);
wxSplitterWindow_SetSashPosition(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2074,7 +2033,7 @@ static PyObject *_wrap_wxSplitterWindow_GetSashPosition(PyObject *self, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSplitterWindow_GetSashPosition(_arg0);
_result = (int )wxSplitterWindow_GetSashPosition(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2102,7 +2061,7 @@ static PyObject *_wrap_wxSplitterWindow_SetMinimumPaneSize(PyObject *self, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSplitterWindow_SetMinimumPaneSize(_arg0,_arg1);
wxSplitterWindow_SetMinimumPaneSize(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2131,7 +2090,7 @@ static PyObject *_wrap_wxSplitterWindow_GetMinimumPaneSize(PyObject *self, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSplitterWindow_GetMinimumPaneSize(_arg0);
_result = (int )wxSplitterWindow_GetMinimumPaneSize(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;

118
wxPython/src/mac/windows3.cpp
View File

@ -89,12 +89,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
#ifdef __cplusplus
extern "C" {
#endif
@ -136,7 +130,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;
@ -170,7 +164,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;
@ -199,7 +193,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;
@ -234,7 +228,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;
@ -264,7 +258,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;
@ -293,7 +287,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;
@ -322,7 +316,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;
@ -396,7 +390,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;
@ -422,7 +416,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;
@ -486,7 +480,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;
@ -515,7 +509,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;
@ -543,7 +537,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;
@ -572,7 +566,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;
@ -600,7 +594,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;
@ -628,7 +622,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;
@ -656,7 +650,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;
@ -684,7 +678,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;
@ -712,7 +706,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;
@ -741,7 +735,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;
@ -769,7 +763,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;
@ -798,7 +792,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;
@ -827,7 +821,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;
@ -856,7 +850,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;
@ -885,7 +879,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;
@ -914,7 +908,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;
@ -946,7 +940,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;
@ -978,7 +972,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;
@ -1016,7 +1010,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;
@ -1050,7 +1044,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;
@ -1079,7 +1073,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;
@ -1107,7 +1101,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;
@ -1136,7 +1130,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;
@ -1171,7 +1165,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;
@ -1201,7 +1195,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;
@ -1230,7 +1224,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;
@ -1259,7 +1253,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;
@ -1287,7 +1281,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;
@ -1316,7 +1310,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;
@ -1353,7 +1347,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;
@ -1387,7 +1381,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;
@ -1416,7 +1410,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;
@ -1451,7 +1445,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;
@ -1481,7 +1475,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;
@ -1564,7 +1558,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;
@ -1590,7 +1584,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;
@ -1654,7 +1648,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;
@ -1682,7 +1676,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;
@ -1710,7 +1704,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;
@ -1738,7 +1732,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;
@ -1774,7 +1768,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;
@ -1803,7 +1797,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;
@ -1832,7 +1826,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;
@ -1865,7 +1859,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;
@ -1912,7 +1906,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;
@ -1958,7 +1952,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;
@ -2004,7 +1998,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;

139
wxPython/src/mac/wx.cpp
View File

@ -84,12 +84,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
#include <ctype.h>
@ -652,6 +646,7 @@ static wxPyCoreAPI API = {
wxPyConstructObject,
wxPy_ConvertList,
wxString_in_helper,
byte_LIST_helper,
int_LIST_helper,
long_LIST_helper,
@ -701,7 +696,7 @@ static PyObject *_wrap_ptrcast(PyObject *self, PyObject *args, PyObject *kwargs)
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (PyObject *)ptrcast(_arg0,_arg1);
_result = (PyObject *)ptrcast(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -728,7 +723,7 @@ static PyObject *_wrap_ptrvalue(PyObject *self, PyObject *args, PyObject *kwargs
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (PyObject *)ptrvalue(_arg0,_arg1,_arg2);
_result = (PyObject *)ptrvalue(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -760,7 +755,7 @@ static PyObject *_wrap_ptrset(PyObject *self, PyObject *args, PyObject *kwargs)
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (PyObject *)ptrset(_arg0,_arg1,_arg2,_arg3);
_result = (PyObject *)ptrset(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -788,7 +783,7 @@ static PyObject *_wrap_ptrcreate(PyObject *self, PyObject *args, PyObject *kwarg
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (PyObject *)ptrcreate(_arg0,_arg1,_arg2);
_result = (PyObject *)ptrcreate(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -813,7 +808,7 @@ static PyObject *_wrap_ptrfree(PyObject *self, PyObject *args, PyObject *kwargs)
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (PyObject *)ptrfree(_arg0);
_result = (PyObject *)ptrfree(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -839,7 +834,7 @@ static PyObject *_wrap_ptradd(PyObject *self, PyObject *args, PyObject *kwargs)
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (PyObject *)ptradd(_arg0,_arg1);
_result = (PyObject *)ptradd(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -860,7 +855,7 @@ static PyObject *_wrap_ptrmap(PyObject *self, PyObject *args, PyObject *kwargs)
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
ptrmap(_arg0,_arg1);
ptrmap(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -910,7 +905,7 @@ static PyObject *_wrap_wxGetApp(PyObject *self, PyObject *args, PyObject *kwargs
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxPyApp *)wxGetApp();
_result = (wxPyApp *)wxGetApp();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -933,7 +928,7 @@ static PyObject *_wrap_wxApp_CleanUp(PyObject *self, PyObject *args, PyObject *k
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxApp_CleanUp();
wxApp_CleanUp();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -974,7 +969,7 @@ static PyObject *_wrap_new_wxPyApp(PyObject *self, PyObject *args, PyObject *kwa
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxPyApp *)new_wxPyApp();
_result = (wxPyApp *)new_wxPyApp();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1007,7 +1002,7 @@ static PyObject *_wrap_delete_wxPyApp(PyObject *self, PyObject *args, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete_wxPyApp(_arg0);
delete_wxPyApp(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1036,12 +1031,16 @@ static PyObject *_wrap_wxPyApp_GetAppName(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxPyApp_GetAppName(_arg0));
_result = new wxString (wxPyApp_GetAppName(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
{
delete _result;
@ -1069,12 +1068,16 @@ static PyObject *_wrap_wxPyApp_GetClassName(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxPyApp_GetClassName(_arg0));
_result = new wxString (wxPyApp_GetClassName(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
{
delete _result;
@ -1102,7 +1105,7 @@ static PyObject *_wrap_wxPyApp_GetExitOnFrameDelete(PyObject *self, PyObject *ar
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxPyApp_GetExitOnFrameDelete(_arg0);
_result = (bool )wxPyApp_GetExitOnFrameDelete(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1130,7 +1133,7 @@ static PyObject *_wrap_wxPyApp_GetPrintMode(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxPyApp_GetPrintMode(_arg0);
_result = (int )wxPyApp_GetPrintMode(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1158,7 +1161,7 @@ static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxWindow *)wxPyApp_GetTopWindow(_arg0);
_result = (wxWindow *)wxPyApp_GetTopWindow(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1186,12 +1189,16 @@ static PyObject *_wrap_wxPyApp_GetVendorName(PyObject *self, PyObject *args, PyO
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxPyApp_GetVendorName(_arg0));
_result = new wxString (wxPyApp_GetVendorName(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
{
delete _result;
@ -1219,7 +1226,7 @@ static PyObject *_wrap_wxPyApp_GetUseBestVisual(PyObject *self, PyObject *args,
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxPyApp_GetUseBestVisual(_arg0);
_result = (bool )wxPyApp_GetUseBestVisual(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1246,7 +1253,7 @@ static PyObject *_wrap_wxPyApp_Dispatch(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyApp_Dispatch(_arg0);
wxPyApp_Dispatch(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1274,7 +1281,7 @@ static PyObject *_wrap_wxPyApp_ExitMainLoop(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyApp_ExitMainLoop(_arg0);
wxPyApp_ExitMainLoop(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1303,7 +1310,7 @@ static PyObject *_wrap_wxPyApp_Initialized(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxPyApp_Initialized(_arg0);
_result = (bool )wxPyApp_Initialized(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1331,7 +1338,7 @@ static PyObject *_wrap_wxPyApp_MainLoop(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxPyApp_MainLoop(_arg0);
_result = (int )wxPyApp_MainLoop(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1359,7 +1366,7 @@ static PyObject *_wrap_wxPyApp_Pending(PyObject *self, PyObject *args, PyObject
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxPyApp_Pending(_arg0);
_result = (bool )wxPyApp_Pending(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1387,7 +1394,7 @@ static PyObject *_wrap_wxPyApp_ProcessIdle(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxPyApp_ProcessIdle(_arg0);
_result = (bool )wxPyApp_ProcessIdle(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1415,26 +1422,13 @@ 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);
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
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_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyApp_SetAppName(_arg0,*_arg1);
wxPyApp_SetAppName(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1467,26 +1461,13 @@ 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);
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
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_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyApp_SetClassName(_arg0,*_arg1);
wxPyApp_SetClassName(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1521,7 +1502,7 @@ static PyObject *_wrap_wxPyApp_SetExitOnFrameDelete(PyObject *self, PyObject *ar
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyApp_SetExitOnFrameDelete(_arg0,_arg1);
wxPyApp_SetExitOnFrameDelete(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1550,7 +1531,7 @@ static PyObject *_wrap_wxPyApp_SetPrintMode(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyApp_SetPrintMode(_arg0,_arg1);
wxPyApp_SetPrintMode(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1587,7 +1568,7 @@ static PyObject *_wrap_wxPyApp_SetTopWindow(PyObject *self, PyObject *args, PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyApp_SetTopWindow(_arg0,_arg1);
wxPyApp_SetTopWindow(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1616,26 +1597,13 @@ 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);
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
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_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyApp_SetVendorName(_arg0,*_arg1);
wxPyApp_SetVendorName(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1670,7 +1638,7 @@ static PyObject *_wrap_wxPyApp_SetUseBestVisual(PyObject *self, PyObject *args,
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyApp_SetUseBestVisual(_arg0,_arg1);
wxPyApp_SetUseBestVisual(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -1701,7 +1669,7 @@ static PyObject *_wrap_wxPyApp_GetStdIcon(PyObject *self, PyObject *args, PyObje
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxIcon (wxPyApp_GetStdIcon(_arg0,_arg1));
_result = new wxIcon (wxPyApp_GetStdIcon(_arg0,_arg1));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@ -2634,7 +2602,12 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxMINOR_VERSION", PyInt_FromLong((long)wxMINOR_VERSION ));
PyDict_SetItemString(d,"wxRELEASE_NUMBER", PyInt_FromLong((long)wxRELEASE_NUMBER ));
PyDict_SetItemString(d,"wxVERSION_NUMBER", PyInt_FromLong((long)wxVERSION_NUMBER ));
#if wxUSE_UNICODE
wxString tempStr(wxVERSION_STRING);
PyDict_SetItemString(d,"wxVERSION_STRING", PyUnicode_FromUnicode(tempStr.c_str(), tempStr.Len()));
#else
PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString(wxVERSION_STRING));
#endif
{