No longer need to fallback to importing "_core_" as py2exe, Installer

and others now handle importing extensions via package names correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/include/wx/wxPython/wxPython.h b/wxPython/include/wx/wxPython/wxPython.h
index c2ca98e30f4d222ba43459b0dd2f4f2b90fa4044..0d1d76da12dbde37a1665b46ea6e774f57fc5e41 100644 (file)
--- a/wxPython/include/wx/wxPython/wxPython.h
+++ b/wxPython/include/wx/wxPython/wxPython.h
@@ -26,15 +26,14 @@
 // This needs to be called in modules that make calls to any of the functions
 // exported by the wxPython API.  It sets a static pointer to a structure of
 // function pointers located in the wx._core extension module.
 // This needs to be called in modules that make calls to any of the functions
 // exported by the wxPython API.  It sets a static pointer to a structure of
 // function pointers located in the wx._core extension module.

-static void wxPyCoreAPI_IMPORT() {
+static bool wxPyCoreAPI_IMPORT() {

     wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wx._core_", "_wxPyCoreAPI");
     wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wx._core_", "_wxPyCoreAPI");

-    if (! wxPyCoreAPIPtr)
-        wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("_core_", "_wxPyCoreAPI");
+    return wxPyCoreAPIPtr != NULL;

 }
 
 
 
 }
 
 
 

-// The following macros call functions located in wx._core of the same name
+// The following macros call functions located in wx._core_ of the same name

 // via the API pointer retrieved above.
 
 
 // via the API pointer retrieved above.