SWIGged updates for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7027757362
commit
9f873a51d3
@ -3012,6 +3012,7 @@ static PyObject *_wrap_wxListCtrl_SetBackgroundColour(PyObject *self, PyObject *
|
||||
|
||||
static wxListItem * wxPyListCtrl_GetColumn(wxPyListCtrl *self,int col) {
|
||||
wxListItem item;
|
||||
item.SetMask(0xFFFF);
|
||||
if (self->GetColumn(col, item))
|
||||
return new wxListItem(item);
|
||||
else
|
||||
|
@ -1960,7 +1960,7 @@ static PyObject *_wrap_wxLogFatalError(PyObject *self, PyObject *args, PyObject
|
||||
PyObject * _resultobj;
|
||||
wxString * _arg0;
|
||||
PyObject * _obj0 = 0;
|
||||
char *_kwnames[] = { "szFormat", NULL };
|
||||
char *_kwnames[] = { "msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogFatalError",_kwnames,&_obj0))
|
||||
@ -1989,7 +1989,7 @@ static PyObject *_wrap_wxLogError(PyObject *self, PyObject *args, PyObject *kwar
|
||||
PyObject * _resultobj;
|
||||
wxString * _arg0;
|
||||
PyObject * _obj0 = 0;
|
||||
char *_kwnames[] = { "szFormat", NULL };
|
||||
char *_kwnames[] = { "msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogError",_kwnames,&_obj0))
|
||||
@ -2018,7 +2018,7 @@ static PyObject *_wrap_wxLogWarning(PyObject *self, PyObject *args, PyObject *kw
|
||||
PyObject * _resultobj;
|
||||
wxString * _arg0;
|
||||
PyObject * _obj0 = 0;
|
||||
char *_kwnames[] = { "szFormat", NULL };
|
||||
char *_kwnames[] = { "msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogWarning",_kwnames,&_obj0))
|
||||
@ -2047,7 +2047,7 @@ static PyObject *_wrap_wxLogMessage(PyObject *self, PyObject *args, PyObject *kw
|
||||
PyObject * _resultobj;
|
||||
wxString * _arg0;
|
||||
PyObject * _obj0 = 0;
|
||||
char *_kwnames[] = { "szFormat", NULL };
|
||||
char *_kwnames[] = { "msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogMessage",_kwnames,&_obj0))
|
||||
@ -2076,7 +2076,7 @@ static PyObject *_wrap_wxLogInfo(PyObject *self, PyObject *args, PyObject *kwarg
|
||||
PyObject * _resultobj;
|
||||
wxString * _arg0;
|
||||
PyObject * _obj0 = 0;
|
||||
char *_kwnames[] = { "szFormat", NULL };
|
||||
char *_kwnames[] = { "msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogInfo",_kwnames,&_obj0))
|
||||
@ -2105,7 +2105,7 @@ static PyObject *_wrap_wxLogVerbose(PyObject *self, PyObject *args, PyObject *kw
|
||||
PyObject * _resultobj;
|
||||
wxString * _arg0;
|
||||
PyObject * _obj0 = 0;
|
||||
char *_kwnames[] = { "szFormat", NULL };
|
||||
char *_kwnames[] = { "msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogVerbose",_kwnames,&_obj0))
|
||||
@ -2134,7 +2134,7 @@ static PyObject *_wrap_wxLogStatus(PyObject *self, PyObject *args, PyObject *kwa
|
||||
PyObject * _resultobj;
|
||||
wxString * _arg0;
|
||||
PyObject * _obj0 = 0;
|
||||
char *_kwnames[] = { "szFormat", NULL };
|
||||
char *_kwnames[] = { "msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogStatus",_kwnames,&_obj0))
|
||||
@ -2165,7 +2165,7 @@ static PyObject *_wrap_wxLogStatusFrame(PyObject *self, PyObject *args, PyObject
|
||||
wxString * _arg1;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _obj1 = 0;
|
||||
char *_kwnames[] = { "pFrame","szFormat", NULL };
|
||||
char *_kwnames[] = { "pFrame","msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxLogStatusFrame",_kwnames,&_argo0,&_obj1))
|
||||
@ -2201,7 +2201,7 @@ static PyObject *_wrap_wxLogSysError(PyObject *self, PyObject *args, PyObject *k
|
||||
PyObject * _resultobj;
|
||||
wxString * _arg0;
|
||||
PyObject * _obj0 = 0;
|
||||
char *_kwnames[] = { "szFormat", NULL };
|
||||
char *_kwnames[] = { "msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogSysError",_kwnames,&_obj0))
|
||||
@ -2226,6 +2226,105 @@ static PyObject *_wrap_wxLogSysError(PyObject *self, PyObject *args, PyObject *k
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static PyObject *_wrap_wxLogTrace(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxString * _arg0;
|
||||
PyObject * _obj0 = 0;
|
||||
char *_kwnames[] = { "msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogTrace",_kwnames,&_obj0))
|
||||
return NULL;
|
||||
{
|
||||
_arg0 = wxString_in_helper(_obj0);
|
||||
if (_arg0 == NULL)
|
||||
return NULL;
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxLogTrace(*_arg0);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
{
|
||||
if (_obj0)
|
||||
delete _arg0;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static PyObject *_wrap_wxLogTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxString * _arg0;
|
||||
wxString * _arg1;
|
||||
PyObject * _obj0 = 0;
|
||||
PyObject * _obj1 = 0;
|
||||
char *_kwnames[] = { "mask","msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxLogTraceMask",_kwnames,&_obj0,&_obj1))
|
||||
return NULL;
|
||||
{
|
||||
_arg0 = wxString_in_helper(_obj0);
|
||||
if (_arg0 == NULL)
|
||||
return NULL;
|
||||
}
|
||||
{
|
||||
_arg1 = wxString_in_helper(_obj1);
|
||||
if (_arg1 == NULL)
|
||||
return NULL;
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxLogTrace(*_arg0,*_arg1);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
{
|
||||
if (_obj0)
|
||||
delete _arg0;
|
||||
}
|
||||
{
|
||||
if (_obj1)
|
||||
delete _arg1;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static PyObject *_wrap_wxLogGeneric(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
unsigned long _arg0;
|
||||
wxString * _arg1;
|
||||
PyObject * _obj1 = 0;
|
||||
char *_kwnames[] = { "level","msg", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"lO:wxLogGeneric",_kwnames,&_arg0,&_obj1))
|
||||
return NULL;
|
||||
{
|
||||
_arg1 = wxString_in_helper(_obj1);
|
||||
if (_arg1 == NULL)
|
||||
return NULL;
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxLogGeneric(_arg0,*_arg1);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
{
|
||||
if (_obj1)
|
||||
delete _arg1;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static PyObject *_wrap_wxSafeShowMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxString * _arg0;
|
||||
@ -4557,23 +4656,15 @@ static PyObject *_wrap_wxLog_EnableLogging(PyObject *self, PyObject *args, PyObj
|
||||
|
||||
static PyObject *_wrap_wxLog_OnLog(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxLogLevel * _arg0;
|
||||
unsigned long _arg0;
|
||||
wxString * _arg1;
|
||||
int _arg2 = (int ) 0;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _obj1 = 0;
|
||||
char *_kwnames[] = { "level","szString","t", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxLog_OnLog",_kwnames,&_argo0,&_obj1,&_arg2))
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"lO|i:wxLog_OnLog",_kwnames,&_arg0,&_obj1,&_arg2))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLogLevel_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLog_OnLog. Expected _wxLogLevel_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
_arg1 = wxString_in_helper(_obj1);
|
||||
if (_arg1 == NULL)
|
||||
@ -4581,7 +4672,7 @@ static PyObject *_wrap_wxLog_OnLog(PyObject *self, PyObject *args, PyObject *kwa
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxLog::OnLog(*_arg0,*_arg1,_arg2);
|
||||
wxLog::OnLog(_arg0,*_arg1,_arg2);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
@ -4804,23 +4895,15 @@ static PyObject *_wrap_wxLog_DontCreateOnDemand(PyObject *self, PyObject *args,
|
||||
|
||||
static PyObject *_wrap_wxLog_SetTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxTraceMask * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
long _arg0;
|
||||
char *_kwnames[] = { "ulMask", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLog_SetTraceMask",_kwnames,&_argo0))
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"l:wxLog_SetTraceMask",_kwnames,&_arg0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTraceMask_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLog_SetTraceMask. Expected _wxTraceMask_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxLog::SetTraceMask(*_arg0);
|
||||
wxLog::SetTraceMask(_arg0);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
@ -4989,21 +5072,19 @@ static PyObject *_wrap_wxLog_GetVerbose(PyObject *self, PyObject *args, PyObject
|
||||
|
||||
static PyObject *_wrap_wxLog_GetTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxTraceMask * _result;
|
||||
unsigned long _result;
|
||||
char *_kwnames[] = { NULL };
|
||||
char _ptemp[128];
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxLog_GetTraceMask",_kwnames))
|
||||
return NULL;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
_result = new wxTraceMask (wxLog::GetTraceMask());
|
||||
_result = (unsigned long )wxLog::GetTraceMask();
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxTraceMask_p");
|
||||
_resultobj = Py_BuildValue("s",_ptemp);
|
||||
} _resultobj = Py_BuildValue("l",_result);
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
@ -10354,6 +10435,9 @@ static PyMethodDef misc2cMethods[] = {
|
||||
{ "wxWaveData", (PyCFunction) _wrap_wxWaveData, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxExecute", (PyCFunction) _wrap_wxExecute, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSafeShowMessage", (PyCFunction) _wrap_wxSafeShowMessage, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxLogGeneric", (PyCFunction) _wrap_wxLogGeneric, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxLogTraceMask", (PyCFunction) _wrap_wxLogTraceMask, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxLogTrace", (PyCFunction) _wrap_wxLogTrace, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxLogSysError", (PyCFunction) _wrap_wxLogSysError, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxLogStatusFrame", (PyCFunction) _wrap_wxLogStatusFrame, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxLogStatus", (PyCFunction) _wrap_wxLogStatus, METH_VARARGS | METH_KEYWORDS },
|
||||
@ -10647,6 +10731,14 @@ SWIGEXPORT(void) initmisc2c() {
|
||||
PyDict_SetItemString(d,"wxLOG_Trace", PyInt_FromLong((long) wxLOG_Trace));
|
||||
PyDict_SetItemString(d,"wxLOG_Progress", PyInt_FromLong((long) wxLOG_Progress));
|
||||
PyDict_SetItemString(d,"wxLOG_User", PyInt_FromLong((long) wxLOG_User));
|
||||
PyDict_SetItemString(d,"wxTRACE_MemAlloc", PyString_FromString("memalloc"));
|
||||
PyDict_SetItemString(d,"wxTRACE_Messages", PyString_FromString("messages"));
|
||||
PyDict_SetItemString(d,"wxTRACE_ResAlloc", PyString_FromString("resalloc"));
|
||||
PyDict_SetItemString(d,"wxTRACE_RefCount", PyString_FromString("refcount"));
|
||||
PyDict_SetItemString(d,"wxTraceMemAlloc", PyInt_FromLong((long) wxTraceMemAlloc));
|
||||
PyDict_SetItemString(d,"wxTraceMessages", PyInt_FromLong((long) wxTraceMessages));
|
||||
PyDict_SetItemString(d,"wxTraceResAlloc", PyInt_FromLong((long) wxTraceResAlloc));
|
||||
PyDict_SetItemString(d,"wxTraceRefCount", PyInt_FromLong((long) wxTraceRefCount));
|
||||
PyDict_SetItemString(d,"wxEVT_END_PROCESS", PyInt_FromLong((long) wxEVT_END_PROCESS));
|
||||
PyDict_SetItemString(d,"wxEXEC_ASYNC", PyInt_FromLong((long) wxEXEC_ASYNC));
|
||||
PyDict_SetItemString(d,"wxEXEC_SYNC", PyInt_FromLong((long) wxEXEC_SYNC));
|
||||
@ -10700,6 +10792,7 @@ SWIGEXPORT(void) initmisc2c() {
|
||||
wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
|
||||
wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
|
||||
wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider");
|
||||
|
||||
{
|
||||
int i;
|
||||
for (i = 0; _swig_mapping[i].n1; i++)
|
||||
|
@ -1113,6 +1113,12 @@ wxLogStatusFrame = misc2c.wxLogStatusFrame
|
||||
|
||||
wxLogSysError = misc2c.wxLogSysError
|
||||
|
||||
wxLogTrace = misc2c.wxLogTrace
|
||||
|
||||
wxLogTraceMask = misc2c.wxLogTraceMask
|
||||
|
||||
wxLogGeneric = misc2c.wxLogGeneric
|
||||
|
||||
wxSafeShowMessage = misc2c.wxSafeShowMessage
|
||||
|
||||
wxExecute = misc2c.wxExecute
|
||||
@ -1312,6 +1318,14 @@ wxLOG_Debug = misc2c.wxLOG_Debug
|
||||
wxLOG_Trace = misc2c.wxLOG_Trace
|
||||
wxLOG_Progress = misc2c.wxLOG_Progress
|
||||
wxLOG_User = misc2c.wxLOG_User
|
||||
wxTRACE_MemAlloc = misc2c.wxTRACE_MemAlloc
|
||||
wxTRACE_Messages = misc2c.wxTRACE_Messages
|
||||
wxTRACE_ResAlloc = misc2c.wxTRACE_ResAlloc
|
||||
wxTRACE_RefCount = misc2c.wxTRACE_RefCount
|
||||
wxTraceMemAlloc = misc2c.wxTraceMemAlloc
|
||||
wxTraceMessages = misc2c.wxTraceMessages
|
||||
wxTraceResAlloc = misc2c.wxTraceResAlloc
|
||||
wxTraceRefCount = misc2c.wxTraceRefCount
|
||||
wxEVT_END_PROCESS = misc2c.wxEVT_END_PROCESS
|
||||
wxEXEC_ASYNC = misc2c.wxEXEC_ASYNC
|
||||
wxEXEC_SYNC = misc2c.wxEXEC_SYNC
|
||||
|
Loading…
Reference in New Issue
Block a user