X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eec92d76f8798c69f117315a7b41d08b769e31e0..b51b78a9c7b50053cdcf4a22d2222500a20eb8ee:/utils/wxPython/modules/ogl/oglshapes.cpp

diff --git a/utils/wxPython/modules/ogl/oglshapes.cpp b/utils/wxPython/modules/ogl/oglshapes.cpp
index c44a3d7f6c..ce49440d3d 100644
--- a/utils/wxPython/modules/ogl/oglshapes.cpp
+++ b/utils/wxPython/modules/ogl/oglshapes.cpp
@@ -7251,7 +7251,7 @@ static PyObject *_wrap_wxPyDrawnShape_base_OnEndSize(PyObject *self, PyObject *a
 }
 
 static wxOGLConstraint *new_wxOGLConstraint(int type,wxPyShape *constraining,PyObject *constrained) {
-            wxList* list = wxPy_wxListHelper(constrained, "wxPyShape");
+            wxList* list = wxPy_wxListHelper(constrained, "_wxPyShape_p");
             wxOGLConstraint* rv = new wxOGLConstraint(type, constraining, *list);
             delete list;
             return rv;
@@ -7577,6 +7577,60 @@ static PyObject *_wrap_wxPyCompositeShape_AddConstraint(PyObject *self, PyObject
     return _resultobj;
 }
 
+static wxOGLConstraint * wxPyCompositeShape_AddConstrainedShapes(wxPyCompositeShape *self,int  type,wxPyShape * constraining,PyObject * constrained) {
+            wxList* list = wxPy_wxListHelper(constrained, "_wxPyShape_p");
+            wxOGLConstraint* rv = self->AddConstraint(type, constraining, *list);
+            delete list;
+            return rv;
+        }
+static PyObject *_wrap_wxPyCompositeShape_AddConstrainedShapes(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxOGLConstraint * _result;
+    wxPyCompositeShape * _arg0;
+    int  _arg1;
+    wxPyShape * _arg2;
+    PyObject * _arg3;
+    PyObject * _argo0 = 0;
+    PyObject * _argo2 = 0;
+    PyObject * _obj3 = 0;
+    char *_kwnames[] = { "self","type","constraining","constrained", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO:wxPyCompositeShape_AddConstrainedShapes",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyCompositeShape_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyCompositeShape_AddConstrainedShapes. Expected _wxPyCompositeShape_p.");
+        return NULL;
+        }
+    }
+    if (_argo2) {
+        if (_argo2 == Py_None) { _arg2 = NULL; }
+        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPyShape_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPyCompositeShape_AddConstrainedShapes. Expected _wxPyShape_p.");
+        return NULL;
+        }
+    }
+{
+  _arg3 = _obj3;
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxOGLConstraint *)wxPyCompositeShape_AddConstrainedShapes(_arg0,_arg1,_arg2,_arg3);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxOGLConstraint_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
 #define wxPyCompositeShape_AddSimpleConstraint(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->AddConstraint(_swigarg0,_swigarg1,_swigarg2))
 static PyObject *_wrap_wxPyCompositeShape_AddSimpleConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -12179,6 +12233,7 @@ static PyMethodDef oglshapescMethods[] = {
 	 { "wxPyCompositeShape_ContainsDivision", (PyCFunction) _wrap_wxPyCompositeShape_ContainsDivision, METH_VARARGS | METH_KEYWORDS },
 	 { "wxPyCompositeShape_CalculateSize", (PyCFunction) _wrap_wxPyCompositeShape_CalculateSize, METH_VARARGS | METH_KEYWORDS },
 	 { "wxPyCompositeShape_AddSimpleConstraint", (PyCFunction) _wrap_wxPyCompositeShape_AddSimpleConstraint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyCompositeShape_AddConstrainedShapes", (PyCFunction) _wrap_wxPyCompositeShape_AddConstrainedShapes, METH_VARARGS | METH_KEYWORDS },
 	 { "wxPyCompositeShape_AddConstraint", (PyCFunction) _wrap_wxPyCompositeShape_AddConstraint, METH_VARARGS | METH_KEYWORDS },
 	 { "wxPyCompositeShape_AddChild", (PyCFunction) _wrap_wxPyCompositeShape_AddChild, METH_VARARGS | METH_KEYWORDS },
 	 { "wxPyCompositeShape__setSelf", (PyCFunction) _wrap_wxPyCompositeShape__setSelf, METH_VARARGS | METH_KEYWORDS },
@@ -12452,7 +12507,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxTreeCtrl","_wxTreeCtrl",0},
     { "_wxMask","_class_wxMask",0},
     { "_wxToolTip","_class_wxToolTip",0},
-    { "_wxGrid","_class_wxGrid",0},
     { "_wxPNGHandler","_class_wxPNGHandler",0},
     { "_class_wxOGLConstraint","_wxOGLConstraint",0},
     { "_class_wxColourData","_wxColourData",0},
@@ -12541,7 +12595,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxTextDataObject","_class_wxTextDataObject",0},
     { "_class_wxKeyEvent","_wxKeyEvent",0},
     { "_class_wxToolTip","_wxToolTip",0},
-    { "_class_wxGrid","_wxGrid",0},
     { "_class_wxPNGHandler","_wxPNGHandler",0},
     { "_wxColour","_class_wxColour",0},
     { "_class_wxDialog","_wxDialog",0},
@@ -12575,7 +12628,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxEvent","_wxEvent",0},
     { "_wxCheckListBox","_class_wxCheckListBox",0},
     { "_wxSplitterEvent","_class_wxSplitterEvent",0},
-    { "_wxGridEvent","_class_wxGridEvent",0},
     { "_wxRect","_class_wxRect",0},
     { "_wxCommandEvent","_class_wxCommandEvent",0},
     { "_wxSizeEvent","_class_wxSizeEvent",0},
@@ -12701,7 +12753,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPoint","_wxPoint",0},
     { "_wxRealPoint","_class_wxRealPoint",0},
     { "_class_wxRadioBox","_wxRadioBox",0},
-    { "_wxGridCell","_class_wxGridCell",0},
     { "_class_wxBoxSizer","_wxBoxSizer",0},
     { "_signed_short","_WXTYPE",0},
     { "_signed_short","_short",0},
@@ -12866,14 +12917,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxGauge","_class_wxGauge",0},
     { "_class_wxCheckListBox","_wxCheckListBox",0},
     { "_class_wxBusyInfo","_wxBusyInfo",0},
-    { "_class_wxGridEvent","_wxGridEvent",0},
     { "_class_wxCommandEvent","_wxCommandEvent",0},
     { "_class_wxClientDC","_wxClientDC",0},
     { "_class_wxSizeEvent","_wxSizeEvent",0},
     { "_class_wxListCtrl","_wxListCtrl",0},
     { "_class_wxPyDividedShape","_wxPyDividedShape",0},
     { "_wxCustomDataObject","_class_wxCustomDataObject",0},
-    { "_class_wxGridCell","_wxGridCell",0},
     { "_class_wxSize","_wxSize",0},
     { "_class_wxBitmap","_wxBitmap",0},
     { "_class_wxMemoryDC","_wxMemoryDC",0},