Replaced /'s with \'s as BCC requires \'s for path names

[wxWidgets.git] / wxPython / src / export.h

diff --git a/wxPython/src/export.h b/wxPython/src/export.h
index e674a8a6fc40bc3c111b689348aa40e2842e75c9..29f38b70262b08bdf5a353ba13283e4178673f0a 100644 (file)
--- a/wxPython/src/export.h
+++ b/wxPython/src/export.h
@@ -21,9 +21,11 @@
 #include "helpers.h"
 
 
 #include "helpers.h"
 
 

-#define wxPyCoreAPI_IMPORT()     \
-    wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wxPython.wxc", "wxPyCoreAPI")
-
+static void wxPyCoreAPI_IMPORT() {
+    wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wxPython.wxc", "wxPyCoreAPI");
+    if (! wxPyCoreAPIPtr)
+        wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wxc", "wxPyCoreAPI");
+}

 
 #define SWIG_MakePtr(a, b, c)           (wxPyCoreAPIPtr->p_SWIG_MakePtr(a, b, c))
 #define SWIG_GetPtr(a, b, c)            (wxPyCoreAPIPtr->p_SWIG_GetPtr(a, b, c))
 
 #define SWIG_MakePtr(a, b, c)           (wxPyCoreAPIPtr->p_SWIG_MakePtr(a, b, c))
 #define SWIG_GetPtr(a, b, c)            (wxPyCoreAPIPtr->p_SWIG_GetPtr(a, b, c))


@@ -39,7 +41,7 @@
 #define int_LIST_helper(a)              (wxPyCoreAPIPtr->p_int_LIST_helper(a))
 #define long_LIST_helper(a)             (wxPyCoreAPIPtr->p_long_LIST_helper(a))
 #define string_LIST_helper(a)           (wxPyCoreAPIPtr->p_string_LIST_helper(a))
 #define int_LIST_helper(a)              (wxPyCoreAPIPtr->p_int_LIST_helper(a))
 #define long_LIST_helper(a)             (wxPyCoreAPIPtr->p_long_LIST_helper(a))
 #define string_LIST_helper(a)           (wxPyCoreAPIPtr->p_string_LIST_helper(a))

-#define wxPoint_LIST_helper(a)          (wxPyCoreAPIPtr->p_wxPoint_LIST_helper(a))
+#define wxPoint_LIST_helper(a,b)        (wxPyCoreAPIPtr->p_wxPoint_LIST_helper(a, b))

 #define wxBitmap_LIST_helper(a)         (wxPyCoreAPIPtr->p_wxBitmap_LIST_helper(a))
 #define wxString_LIST_helper(a)         (wxPyCoreAPIPtr->p_wxString_LIST_helper(a))
 #define wxAcceleratorEntry_LIST_helper(a) (wxPyCoreAPIPtr->p_wxAcceleratorEntry_LIST_helper(a))
 #define wxBitmap_LIST_helper(a)         (wxPyCoreAPIPtr->p_wxBitmap_LIST_helper(a))
 #define wxString_LIST_helper(a)         (wxPyCoreAPIPtr->p_wxString_LIST_helper(a))
 #define wxAcceleratorEntry_LIST_helper(a) (wxPyCoreAPIPtr->p_wxAcceleratorEntry_LIST_helper(a))


@@ -56,6 +58,10 @@
 #define wxPyCBH_callCallbackObj(a, b)   (wxPyCoreAPIPtr->p_wxPyCBH_callCallbackObj(a, b))
 #define wxPyCBH_delete(a)               (wxPyCoreAPIPtr->p_wxPyCBH_delete(a))
 
 #define wxPyCBH_callCallbackObj(a, b)   (wxPyCoreAPIPtr->p_wxPyCBH_callCallbackObj(a, b))
 #define wxPyCBH_delete(a)               (wxPyCoreAPIPtr->p_wxPyCBH_delete(a))
 

+#define wxPyClassExists(a)              (wxPyCoreAPIPtr->p_wxPyClassExists(a))
+#define wxPyMake_wxObject(a)            (wxPyCoreAPIPtr->p_wxPyMake_wxObject(a))
+#define wxPyPtrTypeMap_Add(a, b)        (wxPyCoreAPIPtr->p_wxPyPtrTypeMap_Add(a, b))
+

 
 // This one is special.  It's the first function called in SWIG generated
 // modules, so we'll use it to also import the API.
 
 // This one is special.  It's the first function called in SWIG generated
 // modules, so we'll use it to also import the API.