changed wxUSE_MS_HTML_HELP to 1 by default

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

diff --git a/wxPython/contrib/ogl/ogl.cpp b/wxPython/contrib/ogl/ogl.cpp
index 4e550c6ef4dc5002ca2bc5fba29eb69d2b406b62..abd1f2f04e1caf52a4dc1bb251fdab9541e1c5d4 100644 (file)
--- a/wxPython/contrib/ogl/ogl.cpp
+++ b/wxPython/contrib/ogl/ogl.cpp
@@ -85,28 +85,22 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     return target;
 }
 
     return target;
 }
 

-#if PYTHON_API_VERSION >= 1009
-    static char* wxStringErrorMsg = "String or Unicode type required";
-#else
-    static char* wxStringErrorMsg = "string type is required for parameter";
-#endif
-

 //---------------------------------------------------------------------------
 // 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) {
 //---------------------------------------------------------------------------
 // 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) {

-    bool doSave = wxPyRestoreThread();
+    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.");

-        wxPySaveThread(doSave);
+        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");

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();

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


@@ -117,29 +111,29 @@ 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);
             char errmsg[1024];
             sprintf(errmsg, "Type error, expected list of %s objects", className);
             PyErr_SetString(PyExc_TypeError, errmsg);

-            wxPySaveThread(doSave);
+            wxPyEndBlockThreads();

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

-    wxPySaveThread(doSave);
+    wxPyEndBlockThreads();

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

-    bool doSave = wxPyRestoreThread();
+    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.");

-        wxPySaveThread(doSave);
+        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");

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();

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


@@ -158,16 +152,60 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
             wxRealPoint* wxo = NULL;
             if (SWIG_GetPtrObj(pyo, (void **)&wxo, "_wxRealPoint_p")) {
                 PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");
             wxRealPoint* wxo = NULL;
             if (SWIG_GetPtrObj(pyo, (void **)&wxo, "_wxRealPoint_p")) {
                 PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");

-                wxPySaveThread(doSave);
+                wxPyEndBlockThreads();

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

-    wxPySaveThread(doSave);
+    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* list, const char* className) {
+    PyObject*   pyList;
+    PyObject*   pyObj;
+    wxObject*   wxObj;
+    wxNode*     node = list->First();
+
+    wxPyBeginBlockThreads();
+    pyList = PyList_New(0);
+    while (node) {
+        wxObj = node->Data();
+        pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj);
+        PyList_Append(pyList, pyObj);
+        node = node->Next();
+    }
+    wxPyEndBlockThreads();
+    return pyList;
+}
+

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


@@ -204,10 +242,11 @@ static PyObject *_wrap_wxOGLInitialize(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames)) 
         return NULL;
 {
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames)) 
         return NULL;
 {

-    wxPy_BEGIN_ALLOW_THREADS;
-        wxOGLInitialize();
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxOGLInitialize();

 
 

-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -221,10 +260,11 @@ static PyObject *_wrap_wxOGLCleanUp(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLCleanUp",_kwnames)) 
         return NULL;
 {
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLCleanUp",_kwnames)) 
         return NULL;
 {

-    wxPy_BEGIN_ALLOW_THREADS;
-        wxOGLCleanUp();
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxOGLCleanUp();

 
 

-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -271,12 +311,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_uint","_wxWindowID",0},
     { "_wxChar","_char",0},
     { "_char","_wxChar",0},
     { "_uint","_wxWindowID",0},
     { "_wxChar","_char",0},
     { "_char","_wxChar",0},

+    { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},

     { "_EBool","_wxCoord",0},
     { "_EBool","_wxPrintQuality",0},
     { "_EBool","_signed_int",0},
     { "_EBool","_int",0},
     { "_EBool","_wxWindowID",0},
     { "_unsigned_long","_long",0},
     { "_EBool","_wxCoord",0},
     { "_EBool","_wxPrintQuality",0},
     { "_EBool","_signed_int",0},
     { "_EBool","_int",0},
     { "_EBool","_wxWindowID",0},
     { "_unsigned_long","_long",0},

+    { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},

     { "_signed_int","_wxCoord",0},
     { "_signed_int","_wxPrintQuality",0},
     { "_signed_int","_EBool",0},
     { "_signed_int","_wxCoord",0},
     { "_signed_int","_wxPrintQuality",0},
     { "_signed_int","_EBool",0},