From: Robin Dunn Date: Fri, 17 May 2002 05:36:40 +0000 (+0000) Subject: A few little tweaks, reswigged code for wxMac X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/70b76c7ccd36a372db8a97b525d341ccfbcaa130 A few little tweaks, reswigged code for wxMac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/.cvsignore b/wxPython/.cvsignore index 29d2d156e5..4cc360759b 100644 --- a/wxPython/.cvsignore +++ b/wxPython/.cvsignore @@ -3,6 +3,8 @@ .gdb_history MANIFEST build +build-pkg +build-pkg-debug build.local build.unicode dist diff --git a/wxPython/src/mac/gdi.cpp b/wxPython/src/mac/gdi.cpp index 64db70d54e..8b65db226d 100644 --- a/wxPython/src/mac/gdi.cpp +++ b/wxPython/src/mac/gdi.cpp @@ -3573,6 +3573,45 @@ static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args, PyObject return _resultobj; } +static PyObject * wxPen_GetDashes(wxPen *self) { + wxDash* dashes; + int count = self->GetDashes(&dashes); + wxPyBeginBlockThreads(); + PyObject* retval = PyList_New(0); + for (int x=0; x" % (self.this,) class wxPen(wxPenPtr): diff --git a/wxPython/src/mac/windows.cpp b/wxPython/src/mac/windows.cpp index cc0eedb6bd..e890c28df4 100644 --- a/wxPython/src/mac/windows.cpp +++ b/wxPython/src/mac/windows.cpp @@ -5444,6 +5444,78 @@ static PyObject *_wrap_wxWindow_SetValidator(PyObject *self, PyObject *args, PyO return _resultobj; } +#define wxWindow_SetDropTarget(_swigobj,_swigarg0) (_swigobj->SetDropTarget(_swigarg0)) +static PyObject *_wrap_wxWindow_SetDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _arg0; + wxDropTarget * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","target", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetDropTarget",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetDropTarget. Expected _wxWindow_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDropTarget_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetDropTarget. Expected _wxDropTarget_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxWindow_SetDropTarget(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxWindow_GetDropTarget(_swigobj) (_swigobj->GetDropTarget()) +static PyObject *_wrap_wxWindow_GetDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDropTarget * _result; + wxWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetDropTarget",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetDropTarget. Expected _wxWindow_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxDropTarget *)wxWindow_GetDropTarget(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxDropTarget_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + #define wxWindow_GetBestSize(_swigobj) (_swigobj->GetBestSize()) static PyObject *_wrap_wxWindow_GetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -11155,6 +11227,8 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_SetCaret", (PyCFunction) _wrap_wxWindow_SetCaret, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetMaxSize", (PyCFunction) _wrap_wxWindow_GetMaxSize, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetBestSize", (PyCFunction) _wrap_wxWindow_GetBestSize, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_GetDropTarget", (PyCFunction) _wrap_wxWindow_GetDropTarget, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_SetDropTarget", (PyCFunction) _wrap_wxWindow_SetDropTarget, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetValidator", (PyCFunction) _wrap_wxWindow_SetValidator, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetValidator", (PyCFunction) _wrap_wxWindow_GetValidator, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetContainingSizer", (PyCFunction) _wrap_wxWindow_GetContainingSizer, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/windows.py b/wxPython/src/mac/windows.py index 92b0297ea1..1803ef9da0 100644 --- a/wxPython/src/mac/windows.py +++ b/wxPython/src/mac/windows.py @@ -538,6 +538,14 @@ class wxWindowPtr(wxEvtHandlerPtr): def SetValidator(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_SetValidator,(self,) + _args, _kwargs) return val + def SetDropTarget(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_SetDropTarget,(self,) + _args, _kwargs) + _args[0].thisown = 0 + return val + def GetDropTarget(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_GetDropTarget,(self,) + _args, _kwargs) + if val: val = wxDropTargetPtr(val) + return val def GetBestSize(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_GetBestSize,(self,) + _args, _kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 diff --git a/wxPython/src/mac/windows2.cpp b/wxPython/src/mac/windows2.cpp index 1c074ff967..2d5bd8b25c 100644 --- a/wxPython/src/mac/windows2.cpp +++ b/wxPython/src/mac/windows2.cpp @@ -1177,6 +1177,14 @@ static PyObject *_wrap_wxNotebook_ResizeChildren(PyObject *self, PyObject *args, return _resultobj; } +static void *SwigwxSplitterEventTowxNotifyEvent(void *ptr) { + wxSplitterEvent *src; + wxNotifyEvent *dest; + src = (wxSplitterEvent *) ptr; + dest = (wxNotifyEvent *) src; + return (void *) dest; +} + static void *SwigwxSplitterEventTowxCommandEvent(void *ptr) { wxSplitterEvent *src; wxCommandEvent *dest; @@ -2318,6 +2326,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, + { "_wxNotifyEvent","_wxSplitterEvent",SwigwxSplitterEventTowxNotifyEvent}, { "_wxNotifyEvent","_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, diff --git a/wxPython/src/mac/windows2.py b/wxPython/src/mac/windows2.py index 66c94cadc6..539b0ab995 100644 --- a/wxPython/src/mac/windows2.py +++ b/wxPython/src/mac/windows2.py @@ -129,7 +129,7 @@ def wxPreNotebook(*_args,**_kwargs): return val -class wxSplitterEventPtr(wxCommandEventPtr): +class wxSplitterEventPtr(wxNotifyEventPtr): def __init__(self,this): self.this = this self.thisown = 0 diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i index 23986b87fe..02691bed55 100644 --- a/wxPython/src/windows.i +++ b/wxPython/src/windows.i @@ -399,11 +399,9 @@ public: wxValidator* GetValidator(); void SetValidator(const wxValidator& validator); -#ifndef __WXMAC__ void SetDropTarget(wxDropTarget* target); wxDropTarget* GetDropTarget(); %pragma(python) addtomethod = "SetDropTarget:_args[0].thisown = 0" -#endif wxSize GetBestSize(); wxSize GetMaxSize();