Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWIGged updates for wxMac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-03-21 20:35:45 +00:00
parent 08e70846d5
commit c3bfa1cb28
30 changed files with 4380 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,6 +101,12 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
return target;
}
// Put some wx default wxChar* values into wxStrings.
DECLARE_DEF_STRING(FileSelectorPromptStr);
DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr);
static const wxString wxPyEmptyString(wxT(""));
int wxCaret_GetBlinkTime() {
return wxCaret::GetBlinkTime();
}
@@ -156,7 +162,8 @@ public:
bool found;
wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DoLog")))
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(isi)", level, szString, t)); // TODO: unicode fix
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iOi)", level,
wx2PyString(szString), t));
wxPyEndBlockThreads();
if (! found)
wxLog::DoLog(level, szString, t);
@@ -166,7 +173,8 @@ public:
bool found;
wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString")))
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(si)", szString, t)); // TODO: unicode fix
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)",
wx2PyString(szString), t));
wxPyEndBlockThreads();
if (! found)
wxLog::DoLogString(szString, t);
@@ -287,21 +295,56 @@ extern "C" {
static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
char * _arg0 = (char *) wxFileSelectorPromptStr;
char * _arg1 = (char *) NULL;
char * _arg2 = (char *) NULL;
char * _arg3 = (char *) NULL;
char * _arg4 = (char *) wxFileSelectorDefaultWildcardStr;
wxString * _arg0 = (wxString *) &wxPyFileSelectorPromptStr;
wxString * _arg1 = (wxString *) &wxPyEmptyString;
wxString * _arg2 = (wxString *) &wxPyEmptyString;
wxString * _arg3 = (wxString *) &wxPyEmptyString;
wxString * _arg4 = (wxString *) &wxPyFileSelectorDefaultWildcardStr;
int _arg5 = (int ) 0;
wxWindow * _arg6 = (wxWindow *) NULL;
int _arg7 = (int ) -1;
int _arg8 = (int ) -1;
PyObject * _obj0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
PyObject * _obj3 = 0;
PyObject * _obj4 = 0;
PyObject * _argo6 = 0;
char *_kwnames[] = { "message","default_path","default_filename","default_extension","wildcard","flags","parent","x","y", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|sssssiOii:wxFileSelector",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6,&_arg7,&_arg8))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OOOOOiOii:wxFileSelector",_kwnames,&_obj0,&_obj1,&_obj2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7,&_arg8))
return NULL;
if (_obj0)
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
if (_obj1)
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
if (_obj2)
{
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (_obj3)
{
_arg3 = wxString_in_helper(_obj3);
if (_arg3 == NULL)
return NULL;
}
if (_obj4)
{
_arg4 = wxString_in_helper(_obj4);
if (_arg4 == NULL)
return NULL;
}
if (_argo6) {
if (_argo6 == Py_None) { _arg6 = NULL; }
else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxWindow_p")) {
@@ -311,7 +354,7 @@ static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args, PyObject *
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxFileSelector(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8));
_result = new wxString (wxFileSelector(*_arg0,*_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,_arg8));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@@ -322,6 +365,166 @@ static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args, PyObject *
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
{
if (_obj0)
delete _arg0;
}
{
if (_obj1)
delete _arg1;
}
{
if (_obj2)
delete _arg2;
}
{
if (_obj3)
delete _arg3;
}
{
if (_obj4)
delete _arg4;
}
{
delete _result;
}
return _resultobj;
}
static PyObject *_wrap_wxLoadFileSelector(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxString * _arg0;
wxString * _arg1;
wxString * _arg2 = (wxString *) &wxPyEmptyString;
wxWindow * _arg3 = (wxWindow *) NULL;
PyObject * _obj0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
PyObject * _argo3 = 0;
char *_kwnames[] = { "what","extension","default_name","parent", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|OO:wxLoadFileSelector",_kwnames,&_obj0,&_obj1,&_obj2,&_argo3))
return NULL;
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
if (_obj2)
{
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (_argo3) {
if (_argo3 == Py_None) { _arg3 = NULL; }
else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxLoadFileSelector. Expected _wxWindow_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxLoadFileSelector(*_arg0,*_arg1,*_arg2,_arg3));
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
}
{
if (_obj0)
delete _arg0;
}
{
if (_obj1)
delete _arg1;
}
{
if (_obj2)
delete _arg2;
}
{
delete _result;
}
return _resultobj;
}
static PyObject *_wrap_wxSaveFileSelector(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxString * _arg0;
wxString * _arg1;
wxString * _arg2 = (wxString *) &wxPyEmptyString;
wxWindow * _arg3 = (wxWindow *) NULL;
PyObject * _obj0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
PyObject * _argo3 = 0;
char *_kwnames[] = { "what","extension","default_name","parent", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|OO:wxSaveFileSelector",_kwnames,&_obj0,&_obj1,&_obj2,&_argo3))
return NULL;
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
if (_obj2)
{
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (_argo3) {
if (_argo3 == Py_None) { _arg3 = NULL; }
else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxSaveFileSelector. Expected _wxWindow_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxSaveFileSelector(*_arg0,*_arg1,*_arg2,_arg3));
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
}
{
if (_obj0)
delete _arg0;
}
{
if (_obj1)
delete _arg1;
}
{
if (_obj2)
delete _arg2;
}
{
delete _result;
}
@@ -332,8 +535,8 @@ static PyObject *_wrap_wxGetTextFromUser(PyObject *self, PyObject *args, PyObjec
PyObject * _resultobj;
wxString * _result;
wxString * _arg0;
wxString * _arg1 = (wxString *) &wxEmptyString;
wxString * _arg2 = (wxString *) &wxEmptyString;
wxString * _arg1 = (wxString *) &wxPyEmptyString;
wxString * _arg2 = (wxString *) &wxPyEmptyString;
wxWindow * _arg3 = (wxWindow *) NULL;
int _arg4 = (int ) -1;
int _arg5 = (int ) -1;
@@ -408,8 +611,8 @@ static PyObject *_wrap_wxGetPasswordFromUser(PyObject *self, PyObject *args, PyO
PyObject * _resultobj;
wxString * _result;
wxString * _arg0;
wxString * _arg1 = (wxString *) &wxEmptyString;
wxString * _arg2 = (wxString *) &wxEmptyString;
wxString * _arg1 = (wxString *) &wxPyEmptyString;
wxString * _arg2 = (wxString *) &wxPyEmptyString;
wxWindow * _arg3 = (wxWindow *) NULL;
PyObject * _obj0 = 0;
PyObject * _obj1 = 0;
@@ -642,7 +845,7 @@ static PyObject *_wrap_wxMessageBox(PyObject *self, PyObject *args, PyObject *kw
PyObject * _resultobj;
int _result;
wxString * _arg0;
wxString * _arg1 = (wxString *) &wxEmptyString;
wxString * _arg1 = (wxString *) &wxPyEmptyString;
int _arg2 = (int ) wxOK|wxCENTRE;
wxWindow * _arg3 = (wxWindow *) NULL;
int _arg4 = (int ) -1;
@@ -2968,12 +3171,13 @@ static PyObject *_wrap_wxFontEnumerator_EnumerateEncodings(PyObject *self, PyObj
PyObject * _resultobj;
bool _result;
wxPyFontEnumerator * _arg0;
char * _arg1 = (char *) "";
wxString * _arg1 = (wxString *) &wxPyEmptyString;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","facename", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|s:wxFontEnumerator_EnumerateEncodings",_kwnames,&_argo0,&_arg1))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxFontEnumerator_EnumerateEncodings",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2982,13 +3186,23 @@ static PyObject *_wrap_wxFontEnumerator_EnumerateEncodings(PyObject *self, PyObj
return NULL;
}
}
if (_obj1)
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxFontEnumerator_EnumerateEncodings(_arg0,_arg1);
_result = (bool )wxFontEnumerator_EnumerateEncodings(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
@@ -4813,26 +5027,36 @@ static PyObject *_wrap_wxLog_ClearTraceMasks(PyObject *self, PyObject *args, PyO
static PyObject *_wrap_wxLog_SetTimestamp(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxChar * _arg0;
wxString * _arg0;
PyObject * _obj0 = 0;
char *_kwnames[] = { "ts", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxLog_SetTimestamp",_kwnames,&_arg0))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLog_SetTimestamp",_kwnames,&_obj0))
return NULL;
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxLog::SetTimestamp(_arg0);
wxLog::SetTimestamp(*_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj0)
delete _arg0;
}
return _resultobj;
}
static PyObject *_wrap_wxLog_GetTimestamp(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxChar * _result;
wxString * _result;
char *_kwnames[] = { NULL };
self = self;
@@ -4840,11 +5064,18 @@ static PyObject *_wrap_wxLog_GetTimestamp(PyObject *self, PyObject *args, PyObje
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxChar *)wxLog::GetTimestamp();
const wxString & _result_ref = wxLog::GetTimestamp();
_result = (wxString *) &_result_ref;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("s", _result);
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
return _resultobj;
}
@@ -8406,7 +8637,7 @@ static PyObject *_wrap_wxFileType_GetOpenCommand(PyObject *self, PyObject *args,
PyObject * _result;
wxFileType * _arg0;
wxString * _arg1;
wxString * _arg2 = (wxString *) &wxEmptyString;
wxString * _arg2 = (wxString *) &wxPyEmptyString;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
@@ -8469,7 +8700,7 @@ static PyObject *_wrap_wxFileType_GetPrintCommand(PyObject *self, PyObject *args
PyObject * _result;
wxFileType * _arg0;
wxString * _arg1;
wxString * _arg2 = (wxString *) &wxEmptyString;
wxString * _arg2 = (wxString *) &wxPyEmptyString;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
@@ -8536,7 +8767,7 @@ static PyObject *_wrap_wxFileType_GetAllCommands(PyObject *self, PyObject *args,
PyObject * _result;
wxFileType * _arg0;
wxString * _arg1;
wxString * _arg2 = (wxString *) &wxEmptyString;
wxString * _arg2 = (wxString *) &wxPyEmptyString;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
@@ -8641,7 +8872,7 @@ static PyObject *_wrap_wxFileType_SetDefaultIcon(PyObject *self, PyObject *args,
PyObject * _resultobj;
bool _result;
wxFileType * _arg0;
wxString * _arg1 = (wxString *) &wxEmptyString;
wxString * _arg1 = (wxString *) &wxPyEmptyString;
int _arg2 = (int ) 0;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
@@ -8851,7 +9082,7 @@ static PyObject *_wrap_wxMimeTypesManager_Initialize(PyObject *self, PyObject *a
PyObject * _resultobj;
wxMimeTypesManager * _arg0;
int _arg1 = (int ) (wxMAILCAP_STANDARD);
wxString * _arg2 = (wxString *) &wxEmptyString;
wxString * _arg2 = (wxString *) &wxPyEmptyString;
PyObject * _argo0 = 0;
PyObject * _obj2 = 0;
char *_kwnames[] = { "self","mailcapStyle","extraDir", NULL };
@@ -10025,6 +10256,8 @@ static PyMethodDef misc2cMethods[] = {
{ "wxGetSingleChoice", (PyCFunction) _wrap_wxGetSingleChoice, METH_VARARGS | METH_KEYWORDS },
{ "wxGetPasswordFromUser", (PyCFunction) _wrap_wxGetPasswordFromUser, METH_VARARGS | METH_KEYWORDS },
{ "wxGetTextFromUser", (PyCFunction) _wrap_wxGetTextFromUser, METH_VARARGS | METH_KEYWORDS },
{ "wxSaveFileSelector", (PyCFunction) _wrap_wxSaveFileSelector, METH_VARARGS | METH_KEYWORDS },
{ "wxLoadFileSelector", (PyCFunction) _wrap_wxLoadFileSelector, METH_VARARGS | METH_KEYWORDS },
{ "wxFileSelector", (PyCFunction) _wrap_wxFileSelector, METH_VARARGS | METH_KEYWORDS },
{ NULL, NULL }
};