From 74933d7501fe5c62fdf18707c0af95732fda8ff6 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 27 Oct 2001 01:19:32 +0000 Subject: [PATCH] Since there have to be platform ifdef's in wxSTC for wxMAC then we need to have septarate sets of the swig generated code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/stc/{ => msw}/stc_.cpp | 206 +++++++++++++++++++++++- wxPython/contrib/stc/{ => msw}/stc_.py | 21 +++ wxPython/setup.py | 2 +- 3 files changed, 227 insertions(+), 2 deletions(-) rename wxPython/contrib/stc/{ => msw}/stc_.cpp (98%) rename wxPython/contrib/stc/{ => msw}/stc_.py (98%) diff --git a/wxPython/contrib/stc/stc_.cpp b/wxPython/contrib/stc/msw/stc_.cpp similarity index 98% rename from wxPython/contrib/stc/stc_.cpp rename to wxPython/contrib/stc/msw/stc_.cpp index e3c1b1e79c..8efbd78fd8 100644 --- a/wxPython/contrib/stc/stc_.cpp +++ b/wxPython/contrib/stc/msw/stc_.cpp @@ -1,5 +1,5 @@ /* - * FILE : contrib/stc/stc_.cpp + * FILE : contrib/stc/msw/stc_.cpp * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) @@ -9215,6 +9215,115 @@ static PyObject *_wrap_wxStyledTextEvent_SetY(PyObject *self, PyObject *args, Py return _resultobj; } +#define wxStyledTextEvent_SetDragText(_swigobj,_swigarg0) (_swigobj->SetDragText(_swigarg0)) +static PyObject *_wrap_wxStyledTextEvent_SetDragText(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextEvent * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","val", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStyledTextEvent_SetDragText",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextEvent_SetDragText. Expected _wxStyledTextEvent_p."); + return NULL; + } + } +{ +#if PYTHON_API_VERSION >= 1009 + char* tmpPtr; int tmpSize; + if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1) + 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 +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxStyledTextEvent_SetDragText(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxStyledTextEvent_SetDragAllowMove(_swigobj,_swigarg0) (_swigobj->SetDragAllowMove(_swigarg0)) +static PyObject *_wrap_wxStyledTextEvent_SetDragAllowMove(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextEvent * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","val", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextEvent_SetDragAllowMove",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextEvent_SetDragAllowMove. Expected _wxStyledTextEvent_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxStyledTextEvent_SetDragAllowMove(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxStyledTextEvent_SetDragResult(_swigobj,_swigarg0) (_swigobj->SetDragResult(_swigarg0)) +static PyObject *_wrap_wxStyledTextEvent_SetDragResult(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStyledTextEvent * _arg0; + wxDragResult _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","val", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextEvent_SetDragResult",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextEvent_SetDragResult. Expected _wxStyledTextEvent_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxStyledTextEvent_SetDragResult(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxStyledTextEvent_GetPosition(_swigobj) (_swigobj->GetPosition()) static PyObject *_wrap_wxStyledTextEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -9679,6 +9788,92 @@ static PyObject *_wrap_wxStyledTextEvent_GetY(PyObject *self, PyObject *args, Py return _resultobj; } +#define wxStyledTextEvent_GetDragText(_swigobj) (_swigobj->GetDragText()) +static PyObject *_wrap_wxStyledTextEvent_GetDragText(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _result; + wxStyledTextEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextEvent_GetDragText",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextEvent_GetDragText. Expected _wxStyledTextEvent_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxString (wxStyledTextEvent_GetDragText(_arg0)); + + wxPy_END_ALLOW_THREADS; +}{ + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxStyledTextEvent_GetDragAllowMove(_swigobj) (_swigobj->GetDragAllowMove()) +static PyObject *_wrap_wxStyledTextEvent_GetDragAllowMove(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxStyledTextEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextEvent_GetDragAllowMove",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextEvent_GetDragAllowMove. Expected _wxStyledTextEvent_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxStyledTextEvent_GetDragAllowMove(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxStyledTextEvent_GetDragResult(_swigobj) (_swigobj->GetDragResult()) +static PyObject *_wrap_wxStyledTextEvent_GetDragResult(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDragResult _result; + wxStyledTextEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextEvent_GetDragResult",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextEvent_GetDragResult. Expected _wxStyledTextEvent_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxDragResult )wxStyledTextEvent_GetDragResult(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxStyledTextEvent_GetShift(_swigobj) (_swigobj->GetShift()) static PyObject *_wrap_wxStyledTextEvent_GetShift(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -9801,6 +9996,9 @@ static PyMethodDef stc_cMethods[] = { { "wxStyledTextEvent_GetAlt", (PyCFunction) _wrap_wxStyledTextEvent_GetAlt, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextEvent_GetControl", (PyCFunction) _wrap_wxStyledTextEvent_GetControl, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextEvent_GetShift", (PyCFunction) _wrap_wxStyledTextEvent_GetShift, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextEvent_GetDragResult", (PyCFunction) _wrap_wxStyledTextEvent_GetDragResult, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextEvent_GetDragAllowMove", (PyCFunction) _wrap_wxStyledTextEvent_GetDragAllowMove, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextEvent_GetDragText", (PyCFunction) _wrap_wxStyledTextEvent_GetDragText, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextEvent_GetY", (PyCFunction) _wrap_wxStyledTextEvent_GetY, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextEvent_GetX", (PyCFunction) _wrap_wxStyledTextEvent_GetX, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextEvent_GetListType", (PyCFunction) _wrap_wxStyledTextEvent_GetListType, METH_VARARGS | METH_KEYWORDS }, @@ -9818,6 +10016,9 @@ static PyMethodDef stc_cMethods[] = { { "wxStyledTextEvent_GetModifiers", (PyCFunction) _wrap_wxStyledTextEvent_GetModifiers, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextEvent_GetKey", (PyCFunction) _wrap_wxStyledTextEvent_GetKey, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextEvent_GetPosition", (PyCFunction) _wrap_wxStyledTextEvent_GetPosition, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextEvent_SetDragResult", (PyCFunction) _wrap_wxStyledTextEvent_SetDragResult, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextEvent_SetDragAllowMove", (PyCFunction) _wrap_wxStyledTextEvent_SetDragAllowMove, METH_VARARGS | METH_KEYWORDS }, + { "wxStyledTextEvent_SetDragText", (PyCFunction) _wrap_wxStyledTextEvent_SetDragText, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextEvent_SetY", (PyCFunction) _wrap_wxStyledTextEvent_SetY, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextEvent_SetX", (PyCFunction) _wrap_wxStyledTextEvent_SetX, METH_VARARGS | METH_KEYWORDS }, { "wxStyledTextEvent_SetListType", (PyCFunction) _wrap_wxStyledTextEvent_SetListType, METH_VARARGS | METH_KEYWORDS }, @@ -10755,6 +10956,9 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxEVT_STC_URIDROPPED", PyInt_FromLong((long) wxEVT_STC_URIDROPPED)); PyDict_SetItemString(d,"wxEVT_STC_DWELLSTART", PyInt_FromLong((long) wxEVT_STC_DWELLSTART)); PyDict_SetItemString(d,"wxEVT_STC_DWELLEND", PyInt_FromLong((long) wxEVT_STC_DWELLEND)); + PyDict_SetItemString(d,"wxEVT_STC_START_DRAG", PyInt_FromLong((long) wxEVT_STC_START_DRAG)); + PyDict_SetItemString(d,"wxEVT_STC_DRAG_OVER", PyInt_FromLong((long) wxEVT_STC_DRAG_OVER)); + PyDict_SetItemString(d,"wxEVT_STC_DO_DROP", PyInt_FromLong((long) wxEVT_STC_DO_DROP)); wxClassInfo::CleanUpClasses(); diff --git a/wxPython/contrib/stc/stc_.py b/wxPython/contrib/stc/msw/stc_.py similarity index 98% rename from wxPython/contrib/stc/stc_.py rename to wxPython/contrib/stc/msw/stc_.py index 43305a876e..f2434e5541 100644 --- a/wxPython/contrib/stc/stc_.py +++ b/wxPython/contrib/stc/msw/stc_.py @@ -1002,6 +1002,15 @@ class wxStyledTextEventPtr(wxCommandEventPtr): def SetY(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextEvent_SetY,(self,) + _args, _kwargs) return val + def SetDragText(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextEvent_SetDragText,(self,) + _args, _kwargs) + return val + def SetDragAllowMove(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextEvent_SetDragAllowMove,(self,) + _args, _kwargs) + return val + def SetDragResult(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextEvent_SetDragResult,(self,) + _args, _kwargs) + return val def GetPosition(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextEvent_GetPosition,(self,) + _args, _kwargs) return val @@ -1053,6 +1062,15 @@ class wxStyledTextEventPtr(wxCommandEventPtr): def GetY(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextEvent_GetY,(self,) + _args, _kwargs) return val + def GetDragText(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextEvent_GetDragText,(self,) + _args, _kwargs) + return val + def GetDragAllowMove(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextEvent_GetDragAllowMove,(self,) + _args, _kwargs) + return val + def GetDragResult(self, *_args, **_kwargs): + val = apply(stc_c.wxStyledTextEvent_GetDragResult,(self,) + _args, _kwargs) + return val def GetShift(self, *_args, **_kwargs): val = apply(stc_c.wxStyledTextEvent_GetShift,(self,) + _args, _kwargs) return val @@ -1601,6 +1619,9 @@ wxEVT_STC_USERLISTSELECTION = stc_c.wxEVT_STC_USERLISTSELECTION wxEVT_STC_URIDROPPED = stc_c.wxEVT_STC_URIDROPPED wxEVT_STC_DWELLSTART = stc_c.wxEVT_STC_DWELLSTART wxEVT_STC_DWELLEND = stc_c.wxEVT_STC_DWELLEND +wxEVT_STC_START_DRAG = stc_c.wxEVT_STC_START_DRAG +wxEVT_STC_DRAG_OVER = stc_c.wxEVT_STC_DRAG_OVER +wxEVT_STC_DO_DROP = stc_c.wxEVT_STC_DO_DROP #-------------- USER INCLUDE ----------------------- diff --git a/wxPython/setup.py b/wxPython/setup.py index dfef8c1d50..18a3877a91 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -547,7 +547,7 @@ if not GL_ONLY and BUILD_STC: swig_files = ['stc_.i'] - swig_sources = run_swig(swig_files, location, '', PKGDIR, + swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args + ['-I'+STC_H, '-I'+location], [opj(STC_H, 'stc.h')])