use the API Ptr accessor for the inline functions too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-06-09 17:50:45 +00:00
parent b05032577a
commit 3a8ed07180

View File

@ -439,6 +439,7 @@ struct wxPyCoreAPI {
// Notice that this is static, not extern. This is by design, each module // Notice that this is static, not extern. This is by design, each module
// needs one, but doesn't have to use it. // needs one, but doesn't have to use it.
static wxPyCoreAPI* wxPyCoreAPIPtr = NULL; static wxPyCoreAPI* wxPyCoreAPIPtr = NULL;
inline wxPyCoreAPI* wxPyGetCoreAPIPtr();
#endif // wxPyUSE_EXPORTED_API #endif // wxPyUSE_EXPORTED_API
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -453,7 +454,7 @@ public:
~wxPyUserData() { ~wxPyUserData() {
#ifdef wxPyUSE_EXPORTED_API #ifdef wxPyUSE_EXPORTED_API
wxPyCoreAPIPtr->p_wxPyUserData_dtor(this); wxPyGetCoreAPIPtr()->p_wxPyUserData_dtor(this);
#else #else
wxPyUserData_dtor(this); wxPyUserData_dtor(this);
#endif #endif
@ -472,7 +473,7 @@ public:
~wxPyClientData() { ~wxPyClientData() {
#ifdef wxPyUSE_EXPORTED_API #ifdef wxPyUSE_EXPORTED_API
wxPyCoreAPIPtr->p_wxPyClientData_dtor(this); wxPyGetCoreAPIPtr()->p_wxPyClientData_dtor(this);
#else #else
wxPyClientData_dtor(this); wxPyClientData_dtor(this);
#endif #endif
@ -490,7 +491,7 @@ public:
~wxPyOORClientData() { ~wxPyOORClientData() {
#ifdef wxPyUSE_EXPORTED_API #ifdef wxPyUSE_EXPORTED_API
wxPyCoreAPIPtr->p_wxPyOORClientData_dtor(this); wxPyGetCoreAPIPtr()->p_wxPyOORClientData_dtor(this);
#else #else
wxPyOORClientData_dtor(this); wxPyOORClientData_dtor(this);
#endif #endif
@ -519,7 +520,7 @@ public:
~wxPyCallbackHelper() { ~wxPyCallbackHelper() {
#ifdef wxPyUSE_EXPORTED_API #ifdef wxPyUSE_EXPORTED_API
wxPyCoreAPIPtr->p_wxPyCBH_delete(this); wxPyGetCoreAPIPtr()->p_wxPyCBH_delete(this);
#else #else
wxPyCBH_delete(this); wxPyCBH_delete(this);
#endif #endif