little tweaks

[wxWidgets.git] / wxPython / contrib / ogl / ogl.i

diff --git a/wxPython/contrib/ogl/ogl.i b/wxPython/contrib/ogl/ogl.i
index 41f78d72fc2c309e08f70f29560370d6cf172d5d..66c1277797d2de67399f95feee62db0f8a20ec46 100644 (file)
--- a/wxPython/contrib/ogl/ogl.i
+++ b/wxPython/contrib/ogl/ogl.i
@@ -14,30 +14,47 @@
 %module ogl
 
 %{
 %module ogl
 
 %{

-#include "export.h"
+#include "wx/wxPython/wxPython.h"
+#include "wx/wxPython/pyclasses.h"

 #include "oglhelpers.h"
 #include "oglhelpers.h"

+

 %}
 
 //---------------------------------------------------------------------------
 
 %}
 
 //---------------------------------------------------------------------------
 

-%include typemaps.i
-%include my_typemaps.i
-
-%extern wx.i

 %import windows.i
 %import windows.i

-%extern _defs.i
-%extern misc.i
-%extern gdi.i
+%pythoncode { wx = core }

 
 

-%include _ogldefs.i

 
 

-%import oglbasic.i
-%import oglshapes.i
-%import oglshapes2.i
-%import oglcanvas.i
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);

 
 

+%include _ogl_rename.i
+
+%include _ogldefs.i
+%include _oglbasic.i
+%include _oglshapes.i
+%include _oglshapes2.i
+%include _oglcanvas.i
+
+%pythoncode {
+%# Aliases    
+ShapeCanvas =       PyShapeCanvas
+ShapeEvtHandler =   PyShapeEvtHandler
+Shape =             PyShape
+RectangleShape =    PyRectangleShape
+BitmapShape =       PyBitmapShape
+DrawnShape =        PyDrawnShape
+CompositeShape =    PyCompositeShape
+DividedShape =      PyDividedShape
+DivisionShape =     PyDivisionShape
+EllipseShape =      PyEllipseShape
+CircleShape =       PyCircleShape
+LineShape =         PyLineShape
+PolygonShape =      PyPolygonShape
+TextShape =         PyTextShape
+ControlPoint =      PyControlPoint
+}    

 
 

-%pragma(python) code = "import wx"

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -135,54 +152,55 @@ void wxOGLCleanUp();
 
 %{
 //---------------------------------------------------------------------------
 
 %{
 //---------------------------------------------------------------------------

-// This one will work for any class for the VERY generic cases, but beyond that
-// the helper needs to know more about the type.

 
 

-wxList* wxPy_wxListHelper(PyObject* pyList, char* className) {
-    wxPyTState* state = wxPyBeginBlockThreads();
+// Convert from a Python list to a list of className objects.  This one will
+// work for any class for the VERY generic cases, but beyond that the helper
+// needs to know more about the type.
+wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
+    wxPyBeginBlockThreads();

     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

         return NULL;
     }
     for (int x=0; x<count; x++) {
         PyObject* pyo = PyList_GetItem(pyList, x);
         wxObject* wxo = NULL;
 
         return NULL;
     }
     for (int x=0; x<count; x++) {
         PyObject* pyo = PyList_GetItem(pyList, x);
         wxObject* wxo = NULL;
 

-        if (SWIG_GetPtrObj(pyo, (void **)&wxo, className)) {
-            char errmsg[1024];
-            sprintf(errmsg, "Type error, expected list of %s objects", className);
-            PyErr_SetString(PyExc_TypeError, errmsg);
-             wxPyEndBlockThreads(state);
+        if ( !wxPyConvertSwigPtr(pyo, (void **)&wxo, className) ) {
+            wxString errmsg;
+            errmsg.Printf(wxT("Type error, expected list of %s objects"), className);
+            PyErr_SetString(PyExc_TypeError, errmsg.mb_str());
+            wxPyEndBlockThreads();

             return NULL;
         }
         list->Append(wxo);
     }
             return NULL;
         }
         list->Append(wxo);
     }

-    wxPyEndBlockThreads(state);
+    wxPyEndBlockThreads();

     return list;
 }
 
 //---------------------------------------------------------------------------
 
 wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
     return list;
 }
 
 //---------------------------------------------------------------------------
 
 wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {

-    wxPyTState* state = wxPyBeginBlockThreads();
+    wxPyBeginBlockThreads();

     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

         return NULL;
     }
     for (int x=0; x<count; x++) {
         return NULL;
     }
     for (int x=0; x<count; x++) {


@@ -199,18 +217,63 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
 
         } else {
             wxRealPoint* wxo = NULL;
 
         } else {
             wxRealPoint* wxo = NULL;

-            if (SWIG_GetPtrObj(pyo, (void **)&wxo, "_wxRealPoint_p")) {
+            if (wxPyConvertSwigPtr(pyo, (void **)&wxo, wxT("wxRealPoint"))) {

                 PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");
                 PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");

-                wxPyEndBlockThreads(state);
+                wxPyEndBlockThreads();

                 return NULL;
             }
             list->Append((wxObject*) new wxRealPoint(*wxo));
         }
     }
                 return NULL;
             }
             list->Append((wxObject*) new wxRealPoint(*wxo));
         }
     }

-    wxPyEndBlockThreads(state);
+    wxPyEndBlockThreads();

     return list;
 }
 
     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;
+        wxPyOORClientData* data = (wxPyOORClientData*)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 wxPyOORClientData(target));
+    }
+    return target;
+}
+
+//---------------------------------------------------------------------------
+
+PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
+    wxList*     list = (wxList*)listbase;
+    PyObject*   pyList;
+    PyObject*   pyObj;
+    wxObject*   wxObj;
+    wxNode*     node = list->GetFirst();
+
+    wxPyBeginBlockThreads();
+    pyList = PyList_New(0);
+    while (node) {
+        wxObj = node->GetData();
+        pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj);
+        PyList_Append(pyList, pyObj);
+        node = node->GetNext();
+    }
+    wxPyEndBlockThreads();
+    return pyList;
+}
+

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -232,23 +295,20 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyTextShape, wxTextShape);
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-extern "C" SWIGEXPORT(void) initoglbasicc();
-extern "C" SWIGEXPORT(void) initoglshapesc();
-extern "C" SWIGEXPORT(void) initoglshapes2c();
-extern "C" SWIGEXPORT(void) initoglcanvasc();
+// extern "C" SWIGEXPORT(void) initoglbasicc();
+// extern "C" SWIGEXPORT(void) initoglshapesc();
+// extern "C" SWIGEXPORT(void) initoglshapes2c();
+// extern "C" SWIGEXPORT(void) initoglcanvasc();

 %}
 
 
 %init %{
 
 %}
 
 
 %init %{
 

-    initoglbasicc();
-    initoglshapesc();
-    initoglshapes2c();
-    initoglcanvasc();
-
+//     initoglbasicc();
+//     initoglshapesc();
+//     initoglshapes2c();
+//     initoglcanvasc();

 
 

-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();

 
     wxPyPtrTypeMap_Add("wxControlPoint", "wxPyControlPoint");
     wxPyPtrTypeMap_Add("wxShapeCanvas", "wxPyShapeCanvas");
 
     wxPyPtrTypeMap_Add("wxControlPoint", "wxPyControlPoint");
     wxPyPtrTypeMap_Add("wxShapeCanvas", "wxPyShapeCanvas");


@@ -267,11 +327,5 @@ extern "C" SWIGEXPORT(void) initoglcanvasc();
 
 %}
 
 
 %}
 

-//----------------------------------------------------------------------
-// And this gets appended to the shadow class file.
-//----------------------------------------------------------------------
-
-%pragma(python) include="_oglextras.py";
-

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------