From 0e174ce8902ce124bf8f392981ecc02bb5df9965 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 28 May 2004 19:06:27 +0000 Subject: [PATCH] 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 --- wxPython/include/wx/wxPython/wxPython.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/wxPython/include/wx/wxPython/wxPython.h b/wxPython/include/wx/wxPython/wxPython.h index c2ca98e30f..0d1d76da12 100644 --- 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. -static void wxPyCoreAPI_IMPORT() { +static bool wxPyCoreAPI_IMPORT() { 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.