Make the picker headers accessible to all

[wxWidgets.git] / wxPython / src / _core_api.i

diff --git a/wxPython/src/_core_api.i b/wxPython/src/_core_api.i
index b508c8a518251b8c3d9ea4d64dcea4722bbf37ba..0669d1fcbb95e99f4c545a21f447b684058ede40 100644 (file)
--- a/wxPython/src/_core_api.i
+++ b/wxPython/src/_core_api.i
@@ -19,52 +19,7 @@
 // Helper functions for dealing with SWIG objects and such.  These are
 // located here so they know about the SWIG types and functions declared
 // in the wrapper code.
-%}
-
-
-#if SWIG_VERSION < 0x010328
-%{
-// Make a SWIGified pointer object suitable for a .this attribute
-PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) {
-    
-    PyObject* robj = NULL;
-
-    swig_type_info* swigType = wxPyFindSwigType(className);
-    wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyMakeSwigPtr"));
 
-#ifdef SWIG_COBJECT_TYPES
-    robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)swigType->name);
-#else
-    {
-        char result[1024];
-        robj = SWIG_PackVoidPtr(result, ptr, swigType->name, sizeof(result)) ?
-            PyString_FromString(result) : 0;
-    }
-#endif
-    return robj;
-}
-%}
-
-#else // SWIG_VERSION >= 1.3.28
-%{
-// Make a SWIGified pointer object suitable for a .this attribute
-PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) {
-    
-    PyObject* robj = NULL;
-
-    swig_type_info* swigType = wxPyFindSwigType(className);
-    wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyMakeSwigPtr"));
-
-    robj = PySwigObject_New(ptr, swigType, 0);
-    return robj;
-}
-%}
-#endif
-
-
-
-
-%{    
 #include <wx/hashmap.h>
 WX_DECLARE_STRING_HASH_MAP( swig_type_info*, wxPyTypeInfoHashMap );
 
@@ -144,9 +99,51 @@ bool wxPyConvertSwigPtr(PyObject* obj, void **ptr,
     return SWIG_Python_ConvertPtr(obj, ptr, swigType, SWIG_POINTER_EXCEPTION) != -1;
 }
 
+%}
+
+
+#if SWIG_VERSION < 0x010328
+%{
+// Make a SWIGified pointer object suitable for a .this attribute
+PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) {
+    
+    PyObject* robj = NULL;
+
+    swig_type_info* swigType = wxPyFindSwigType(className);
+    wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyMakeSwigPtr"));
+
+#ifdef SWIG_COBJECT_TYPES
+    robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)swigType->name);
+#else
+    {
+        char result[1024];
+        robj = SWIG_PackVoidPtr(result, ptr, swigType->name, sizeof(result)) ?
+            PyString_FromString(result) : 0;
+    }
+#endif
+    return robj;
+}
+%}
+
+#else // SWIG_VERSION >= 1.3.28
+%{
+// Make a SWIGified pointer object suitable for a .this attribute
+PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) {
+    
+    PyObject* robj = NULL;
+
+    swig_type_info* swigType = wxPyFindSwigType(className);
+    wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyMakeSwigPtr"));
+
+    robj = PySwigObject_New(ptr, swigType, 0);
+    return robj;
+}
+%}
+#endif
 
 
 
+%{    
 // Python's PyInstance_Check does not return True for instances of new-style
 // classes.  This should get close enough for both new and old classes but I
 // should re-evaluate the need for doing instance checks...
@@ -155,7 +152,6 @@ bool wxPyInstance_Check(PyObject* obj) {
 }
 
 
-
 // This one checks if the object is an instance of a SWIG proxy class (it has
 // a .this attribute, and the .this attribute is a PySwigObject.)
 bool wxPySwigInstance_Check(PyObject* obj) {
@@ -173,7 +169,6 @@ bool wxPySwigInstance_Check(PyObject* obj) {
     PyErr_Clear();
     return false;
 }
- 
 
 
 // Export a C API in a struct.  Other modules will be able to load this from