fixed (?) problems with assignment operator in wxTreeItemId

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

diff --git a/wxPython/src/export.h b/wxPython/src/export.h
index e674a8a6fc40bc3c111b689348aa40e2842e75c9..79412e942e444c9bf766c1b42d1f60100f662311 100644 (file)
--- a/wxPython/src/export.h
+++ b/wxPython/src/export.h
@@ -21,9 +21,11 @@
 #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))