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

Changes needed to solve wxPython's OOR problem for the wxOGL shapes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-11-27 02:56:59 +00:00
parent 220f2d5c4d
commit 2f4e928794
33 changed files with 504 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wxPython/contrib/ogl/_ogldefs.i
View File

@@ -58,12 +58,13 @@ class wxPyControlPoint;
// OOR Support
%typemap(python, out) wxPyShape* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxPyShapeEvtHandler* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxPyShape* { $target = wxPyMake_wxShapeEvtHandler($source); }
%typemap(python, out) wxPyShapeEvtHandler* { $target = wxPyMake_wxShapeEvtHandler($source); }
%typemap(python, out) wxPyDivisionShape* { $target = wxPyMake_wxShapeEvtHandler($source); }
%typemap(python, out) wxPyShapeCanvas* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxDiagram* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxOGLConstraint* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxPyDivisionShape* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxPseudoMetaFile* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxArrowHead* { $target = wxPyMake_wxObject($source); }

27
wxPython/contrib/ogl/ogl.cpp
View File

@@ -117,7 +117,7 @@ wxList* wxPy_wxListHelper(PyObject* pyList, char* className) {
char errmsg[1024];
sprintf(errmsg, "Type error, expected list of %s objects", className);
PyErr_SetString(PyExc_TypeError, errmsg);
wxPyEndBlockThreads(state);
wxPyEndBlockThreads(state);
return NULL;
}
list->Append(wxo);
@@ -168,6 +168,31 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
return list;
}
//---------------------------------------------------------------------------
PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) {
PyObject* target = NULL;
if (source && wxIsKindOf(source, wxShapeEvtHandler)) {
// If it's derived from wxShapeEvtHandler then there may
// already be a pointer to a Python object that we can use
// in the OOR data.
wxShapeEvtHandler* seh = (wxShapeEvtHandler*)source;
wxPyClientData* data = (wxPyClientData*)seh->GetClientObject();
if (data) {
target = data->m_obj;
Py_INCREF(target);
}
}
if (! target) {
target = wxPyMake_wxObject2(source, FALSE);
if (target != Py_None)
((wxShapeEvtHandler*)source)->SetClientObject(new wxPyClientData(target));
}
return target;
}
//---------------------------------------------------------------------------

27
wxPython/contrib/ogl/ogl.i
View File

@@ -160,7 +160,7 @@ wxList* wxPy_wxListHelper(PyObject* pyList, char* className) {
char errmsg[1024];
sprintf(errmsg, "Type error, expected list of %s objects", className);
PyErr_SetString(PyExc_TypeError, errmsg);
wxPyEndBlockThreads(state);
wxPyEndBlockThreads(state);
return NULL;
}
list->Append(wxo);
@@ -211,6 +211,31 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
return list;
}
//---------------------------------------------------------------------------
PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) {
PyObject* target = NULL;
if (source && wxIsKindOf(source, wxShapeEvtHandler)) {
// If it's derived from wxShapeEvtHandler then there may
// already be a pointer to a Python object that we can use
// in the OOR data.
wxShapeEvtHandler* seh = (wxShapeEvtHandler*)source;
wxPyClientData* data = (wxPyClientData*)seh->GetClientObject();
if (data) {
target = data->m_obj;
Py_INCREF(target);
}
}
if (! target) {
target = wxPyMake_wxObject2(source, FALSE);
if (target != Py_None)
((wxShapeEvtHandler*)source)->SetClientObject(new wxPyClientData(target));
}
return target;
}
//---------------------------------------------------------------------------

139
wxPython/contrib/ogl/oglbasic.cpp
View File

@@ -1258,6 +1258,40 @@ static PyObject *_wrap_wxPyShapeEvtHandler_Destroy(PyObject *self, PyObject *arg
return _resultobj;
}
static void wxPyShapeEvtHandler__setOORInfo(wxPyShapeEvtHandler *self,PyObject * _self) {
self->SetClientObject(new wxPyClientData(_self));
}
static PyObject *_wrap_wxPyShapeEvtHandler__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPyShapeEvtHandler * _arg0;
PyObject * _arg1;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","_self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyShapeEvtHandler__setOORInfo",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyShapeEvtHandler_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyShapeEvtHandler__setOORInfo. Expected _wxPyShapeEvtHandler_p.");
return NULL;
}
}
{
_arg1 = _obj1;
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPyShapeEvtHandler__setOORInfo(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxPyShapeEvtHandler_SetShape(_swigobj,_swigarg0) (_swigobj->SetShape(_swigarg0))
static PyObject *_wrap_wxPyShapeEvtHandler_SetShape(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1317,7 +1351,7 @@ static PyObject *_wrap_wxPyShapeEvtHandler_GetShape(PyObject *self, PyObject *ar
_result = (wxPyShape *)wxPyShapeEvtHandler_GetShape(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -1380,7 +1414,7 @@ static PyObject *_wrap_wxPyShapeEvtHandler_GetPreviousHandler(PyObject *self, Py
_result = (wxPyShapeEvtHandler *)wxPyShapeEvtHandler_GetPreviousHandler(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -1407,7 +1441,7 @@ static PyObject *_wrap_wxPyShapeEvtHandler_CreateNewCopy(PyObject *self, PyObjec
_result = (wxPyShapeEvtHandler *)wxPyShapeEvtHandler_CreateNewCopy(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -2478,33 +2512,6 @@ static PyObject *_wrap_wxPyShape__setCallbackInfo(PyObject *self, PyObject *args
return _resultobj;
}
static void wxPyShape_Destroy(wxPyShape *self) { delete self; }
static PyObject *_wrap_wxPyShape_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPyShape * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyShape_Destroy",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyShape_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyShape_Destroy. Expected _wxPyShape_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPyShape_Destroy(_arg0);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxPyShape_GetBoundingBoxMax(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetBoundingBoxMax(_swigarg0,_swigarg1))
static PyObject *_wrap_wxPyShape_GetBoundingBoxMax(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2963,7 +2970,7 @@ static PyObject *_wrap_wxPyShape_GetParent(PyObject *self, PyObject *args, PyObj
_result = (wxPyShape *)wxPyShape_GetParent(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -3026,7 +3033,7 @@ static PyObject *_wrap_wxPyShape_GetTopAncestor(PyObject *self, PyObject *args,
_result = (wxPyShape *)wxPyShape_GetTopAncestor(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -3259,7 +3266,7 @@ static PyObject *_wrap_wxPyShape_GetEventHandler(PyObject *self, PyObject *args,
_result = (wxPyShapeEvtHandler *)wxPyShape_GetEventHandler(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -5783,7 +5790,7 @@ static PyObject *_wrap_wxPyShape_FindRegion(PyObject *self, PyObject *args, PyOb
_result = (wxPyShape *)wxPyShape_FindRegion(_arg0,*_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg2));
@@ -6863,7 +6870,7 @@ static PyObject *_wrap_wxPyShape_CreateNewCopy(PyObject *self, PyObject *args, P
_result = (wxPyShape *)wxPyShape_CreateNewCopy(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -7095,6 +7102,64 @@ static PyObject *_wrap_wxPyShape_ClearPointList(PyObject *self, PyObject *args,
return _resultobj;
}
#define wxPyShape_GetBackgroundPen(_swigobj) (_swigobj->GetBackgroundPen())
static PyObject *_wrap_wxPyShape_GetBackgroundPen(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPen * _result;
wxPyShape * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyShape_GetBackgroundPen",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyShape_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyShape_GetBackgroundPen. Expected _wxPyShape_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxPen (wxPyShape_GetBackgroundPen(_arg0));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxPen_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxPyShape_GetBackgroundBrush(_swigobj) (_swigobj->GetBackgroundBrush())
static PyObject *_wrap_wxPyShape_GetBackgroundBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxBrush * _result;
wxPyShape * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyShape_GetBackgroundBrush",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyShape_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyShape_GetBackgroundBrush. Expected _wxPyShape_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxBrush (wxPyShape_GetBackgroundBrush(_arg0));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxBrush_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxPyShape_base_OnDelete(_swigobj) (_swigobj->base_OnDelete())
static PyObject *_wrap_wxPyShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -8139,6 +8204,8 @@ static PyMethodDef oglbasiccMethods[] = {
{ "wxPyShape_base_OnDrawContents", (PyCFunction) _wrap_wxPyShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShape_base_OnDraw", (PyCFunction) _wrap_wxPyShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShape_base_OnDelete", (PyCFunction) _wrap_wxPyShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShape_GetBackgroundBrush", (PyCFunction) _wrap_wxPyShape_GetBackgroundBrush, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShape_GetBackgroundPen", (PyCFunction) _wrap_wxPyShape_GetBackgroundPen, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShape_ClearPointList", (PyCFunction) _wrap_wxPyShape_ClearPointList, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShape_Recentre", (PyCFunction) _wrap_wxPyShape_Recentre, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShape_ClearAttachments", (PyCFunction) _wrap_wxPyShape_ClearAttachments, METH_VARARGS | METH_KEYWORDS },
@@ -8273,7 +8340,6 @@ static PyMethodDef oglbasiccMethods[] = {
{ "wxPyShape_GetPerimeterPoint", (PyCFunction) _wrap_wxPyShape_GetPerimeterPoint, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShape_GetBoundingBoxMin", (PyCFunction) _wrap_wxPyShape_GetBoundingBoxMin, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShape_GetBoundingBoxMax", (PyCFunction) _wrap_wxPyShape_GetBoundingBoxMax, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShape_Destroy", (PyCFunction) _wrap_wxPyShape_Destroy, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShape__setCallbackInfo", (PyCFunction) _wrap_wxPyShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShapeEvtHandler_base_OnEndSize", (PyCFunction) _wrap_wxPyShapeEvtHandler_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShapeEvtHandler_base_OnBeginSize", (PyCFunction) _wrap_wxPyShapeEvtHandler_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
@@ -8309,6 +8375,7 @@ static PyMethodDef oglbasiccMethods[] = {
{ "wxPyShapeEvtHandler_SetPreviousHandler", (PyCFunction) _wrap_wxPyShapeEvtHandler_SetPreviousHandler, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShapeEvtHandler_GetShape", (PyCFunction) _wrap_wxPyShapeEvtHandler_GetShape, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShapeEvtHandler_SetShape", (PyCFunction) _wrap_wxPyShapeEvtHandler_SetShape, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShapeEvtHandler__setOORInfo", (PyCFunction) _wrap_wxPyShapeEvtHandler__setOORInfo, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShapeEvtHandler_Destroy", (PyCFunction) _wrap_wxPyShapeEvtHandler_Destroy, METH_VARARGS | METH_KEYWORDS },
{ "wxPyShapeEvtHandler__setCallbackInfo", (PyCFunction) _wrap_wxPyShapeEvtHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPyShapeEvtHandler", (PyCFunction) _wrap_new_wxPyShapeEvtHandler, METH_VARARGS | METH_KEYWORDS },

14
wxPython/contrib/ogl/oglbasic.i
View File

@@ -94,8 +94,15 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyShapeEvtHandler)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
%addmethods { void Destroy() { delete self; } }
%addmethods {
void _setOORInfo(PyObject* _self) {
self->SetClientObject(new wxPyClientData(_self));
}
}
void SetShape(wxPyShape *sh);
wxPyShape *GetShape();
@@ -147,10 +154,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyShape)"
%addmethods {
void Destroy() { delete self; }
}
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void GetBoundingBoxMax(double *OUTPUT, double *OUTPUT);
void GetBoundingBoxMin(double *OUTPUT, double *OUTPUT);
@@ -364,6 +368,8 @@ public:
void ClearAttachments();
void Recentre(wxDC& dc);
void ClearPointList(wxList& list);
wxPen GetBackgroundPen();
wxBrush GetBackgroundBrush();
void base_OnDelete();
void base_OnDraw(wxDC& dc);

15
wxPython/contrib/ogl/oglbasic.py
View File

@@ -153,6 +153,9 @@ class wxPyShapeEvtHandlerPtr(wxObjectPtr):
def Destroy(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_Destroy,(self,) + _args, _kwargs)
return val
def _setOORInfo(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler__setOORInfo,(self,) + _args, _kwargs)
return val
def SetShape(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_SetShape,(self,) + _args, _kwargs)
return val
@@ -262,6 +265,7 @@ class wxPyShapeEvtHandler(wxPyShapeEvtHandlerPtr):
self.this = apply(oglbasicc.new_wxPyShapeEvtHandler,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyShapeEvtHandler)
self._setOORInfo(self)
@@ -273,9 +277,6 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
def _setCallbackInfo(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape__setCallbackInfo,(self,) + _args, _kwargs)
return val
def Destroy(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Destroy,(self,) + _args, _kwargs)
return val
def GetBoundingBoxMax(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBoundingBoxMax,(self,) + _args, _kwargs)
return val
@@ -683,6 +684,14 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
def ClearPointList(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_ClearPointList,(self,) + _args, _kwargs)
return val
def GetBackgroundPen(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBackgroundPen,(self,) + _args, _kwargs)
if val: val = wxPenPtr(val) ; val.thisown = 1
return val
def GetBackgroundBrush(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBackgroundBrush,(self,) + _args, _kwargs)
if val: val = wxBrushPtr(val) ; val.thisown = 1
return val
def base_OnDelete(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnDelete,(self,) + _args, _kwargs)
return val

6
wxPython/contrib/ogl/oglcanvas.cpp
View File

@@ -307,7 +307,7 @@ static PyObject *_wrap_wxDiagram_FindShape(PyObject *self, PyObject *args, PyObj
_result = (wxPyShape *)wxDiagram_FindShape(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -1343,7 +1343,7 @@ static PyObject *_wrap_wxPyShapeCanvas_FindShape(PyObject *self, PyObject *args,
_result = (wxPyShape *)wxPyShapeCanvas_FindShape(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg3));
@@ -1383,7 +1383,7 @@ static PyObject *_wrap_wxPyShapeCanvas_FindFirstSensitiveShape(PyObject *self, P
_result = (wxPyShape *)wxPyShapeCanvas_FindFirstSensitiveShape(_arg0,_arg1,_arg2,_arg3,_arg4);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg3));

3
wxPython/contrib/ogl/oglhelpers.h
View File

@@ -96,10 +96,11 @@
//---------------------------------------------------------------------------
// These are prototypes of some helper functions found in oglhelpers.cpp
// These are prototypes of some helper functions found in ogl.i
wxList* wxPy_wxListHelper(PyObject* pyList, char* className);
wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList);
PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source);

10
wxPython/contrib/ogl/oglshapes.cpp
View File

@@ -7933,7 +7933,7 @@ static PyObject *_wrap_wxPyCompositeShape_FindContainerImage(PyObject *self, PyO
_result = (wxPyShape *)wxPyCompositeShape_FindContainerImage(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -10574,7 +10574,7 @@ static PyObject *_wrap_wxPyDivisionShape_GetBottomSide(PyObject *self, PyObject
_result = (wxPyDivisionShape *)wxPyDivisionShape_GetBottomSide(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -10628,7 +10628,7 @@ static PyObject *_wrap_wxPyDivisionShape_GetLeftSide(PyObject *self, PyObject *a
_result = (wxPyDivisionShape *)wxPyDivisionShape_GetLeftSide(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -10721,7 +10721,7 @@ static PyObject *_wrap_wxPyDivisionShape_GetRightSide(PyObject *self, PyObject *
_result = (wxPyDivisionShape *)wxPyDivisionShape_GetRightSide(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -10748,7 +10748,7 @@ static PyObject *_wrap_wxPyDivisionShape_GetTopSide(PyObject *self, PyObject *ar
_result = (wxPyDivisionShape *)wxPyDivisionShape_GetTopSide(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}

7
wxPython/contrib/ogl/oglshapes.i
View File

@@ -110,6 +110,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyRectangleShape)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void SetCornerRadius(double radius);
@@ -160,6 +161,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyControlPoint)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void SetCornerRadius(double radius);
@@ -207,6 +209,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyBitmapShape)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
wxBitmap& GetBitmap();
wxString GetFilename();
@@ -256,6 +259,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyDrawnShape)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void CalculateSize();
void DestroyClippingRect();
@@ -360,6 +364,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyCompositeShape)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void AddChild(wxPyShape *child, wxPyShape *addAfter = NULL);
@@ -458,6 +463,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyDividedShape)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void EditRegions();
void SetRegionSizes();
@@ -507,6 +513,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyDivisionShape)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void AdjustBottom(double bottom, bool test);
void AdjustLeft(double left, bool test);

7
wxPython/contrib/ogl/oglshapes.py
View File

@@ -289,6 +289,7 @@ class wxPyRectangleShape(wxPyRectangleShapePtr):
self.this = apply(oglshapesc.new_wxPyRectangleShape,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyRectangleShape)
self._setOORInfo(self)
@@ -397,6 +398,7 @@ class wxPyControlPoint(wxPyControlPointPtr):
self.this = apply(oglshapesc.new_wxPyControlPoint,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyControlPoint)
self._setOORInfo(self)
@@ -515,6 +517,7 @@ class wxPyBitmapShape(wxPyBitmapShapePtr):
self.this = apply(oglshapesc.new_wxPyBitmapShape,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyBitmapShape)
self._setOORInfo(self)
@@ -704,6 +707,7 @@ class wxPyDrawnShape(wxPyDrawnShapePtr):
self.this = apply(oglshapesc.new_wxPyDrawnShape,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyDrawnShape)
self._setOORInfo(self)
@@ -874,6 +878,7 @@ class wxPyCompositeShape(wxPyCompositeShapePtr):
self.this = apply(oglshapesc.new_wxPyCompositeShape,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyCompositeShape)
self._setOORInfo(self)
@@ -985,6 +990,7 @@ class wxPyDividedShape(wxPyDividedShapePtr):
self.this = apply(oglshapesc.new_wxPyDividedShape,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyDividedShape)
self._setOORInfo(self)
@@ -1167,6 +1173,7 @@ class wxPyDivisionShape(wxPyDivisionShapePtr):
self.this = apply(oglshapesc.new_wxPyDivisionShape,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyDivisionShape)
self._setOORInfo(self)

4
wxPython/contrib/ogl/oglshapes2.cpp
View File

@@ -3722,7 +3722,7 @@ static PyObject *_wrap_wxPyLineShape_GetFrom(PyObject *self, PyObject *args, PyO
_result = (wxPyShape *)wxPyLineShape_GetFrom(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -3840,7 +3840,7 @@ static PyObject *_wrap_wxPyLineShape_GetTo(PyObject *self, PyObject *args, PyObj
_result = (wxPyShape *)wxPyLineShape_GetTo(_arg0);
wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); }
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}

5
wxPython/contrib/ogl/oglshapes2.i
View File

@@ -49,6 +49,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyEllipseShape)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
@@ -92,6 +93,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyCircleShape)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
@@ -164,6 +166,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyLineShape)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void AddArrow(int type, int end = ARROW_POSITION_END,
double arrowSize = 10.0, double xOffset = 0.0,
@@ -269,6 +272,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyPolygonShape)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
// void Create(wxList* points);
@@ -340,6 +344,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyTextShape)"
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void base_OnDelete();

5
wxPython/contrib/ogl/oglshapes2.py
View File

@@ -143,6 +143,7 @@ class wxPyEllipseShape(wxPyEllipseShapePtr):
self.this = apply(oglshapes2c.new_wxPyEllipseShape,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyEllipseShape)
self._setOORInfo(self)
@@ -245,6 +246,7 @@ class wxPyCircleShape(wxPyCircleShapePtr):
self.this = apply(oglshapes2c.new_wxPyCircleShape,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyCircleShape)
self._setOORInfo(self)
@@ -533,6 +535,7 @@ class wxPyLineShape(wxPyLineShapePtr):
self.this = apply(oglshapes2c.new_wxPyLineShape,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyLineShape)
self._setOORInfo(self)
@@ -653,6 +656,7 @@ class wxPyPolygonShape(wxPyPolygonShapePtr):
self.this = apply(oglshapes2c.new_wxPyPolygonShape,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyPolygonShape)
self._setOORInfo(self)
@@ -758,6 +762,7 @@ class wxPyTextShape(wxPyTextShapePtr):
self.this = apply(oglshapes2c.new_wxPyTextShape,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxPyTextShape)
self._setOORInfo(self)