]> git.saurik.com Git - wxWidgets.git/commitdiff
Changed the name of export.h to wxPython.h so it wouldn't be so
authorRobin Dunn <robin@alldunn.com>
Thu, 2 May 2002 02:46:14 +0000 (02:46 +0000)
committerRobin Dunn <robin@alldunn.com>
Thu, 2 May 2002 02:46:14 +0000 (02:46 +0000)
generic.  This is the header that should be included by 3rd party
stuff that is embedding wxPython or making a new wxPython extension
module.

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

33 files changed:
wxPython/contrib/dllwidget/dllwidget_.cpp
wxPython/contrib/dllwidget/dllwidget_.i
wxPython/contrib/gizmos/gizmos.cpp
wxPython/contrib/gizmos/gizmos.i
wxPython/contrib/glcanvas/glcanvas.i
wxPython/contrib/glcanvas/msw/glcanvas.cpp
wxPython/contrib/ogl/ogl.cpp
wxPython/contrib/ogl/ogl.i
wxPython/contrib/ogl/oglbasic.cpp
wxPython/contrib/ogl/oglbasic.i
wxPython/contrib/ogl/oglcanvas.cpp
wxPython/contrib/ogl/oglcanvas.i
wxPython/contrib/ogl/oglshapes.cpp
wxPython/contrib/ogl/oglshapes.i
wxPython/contrib/ogl/oglshapes2.cpp
wxPython/contrib/ogl/oglshapes2.i
wxPython/contrib/stc/msw/stc_.cpp
wxPython/contrib/stc/stc_.i
wxPython/contrib/xrc/xrc.cpp
wxPython/contrib/xrc/xrc.i
wxPython/src/calendar.i
wxPython/src/export.h [deleted file]
wxPython/src/grid.i
wxPython/src/help.i
wxPython/src/html.i
wxPython/src/htmlhelp.i
wxPython/src/msw/calendar.cpp
wxPython/src/msw/grid.cpp
wxPython/src/msw/help.cpp
wxPython/src/msw/html.cpp
wxPython/src/msw/htmlhelp.cpp
wxPython/src/msw/wx.cpp
wxPython/src/wxPython.h [new file with mode: 0644]

index a9da25d14bba8b8875e47bd2208fa6310f972f62..9137b4dab866601187867f18f228ea273dae40c0 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "dllwidget_c"
 
-#include "export.h"
+#include "wxPython.h"
 #include "dllwidget.h"
 
 
index e2e486942c00fabbe95d94708bac9f54ce03c68c..28b39290ad349613cbe803f04cfe219cf8c08945 100644 (file)
@@ -14,7 +14,7 @@
 
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include "dllwidget.h"
 %}
 
index ed145eed3b874e449da6bbc55f73d0bc8fff2a32..75b392e57819a22a6ba80612fb9ca110156a6778 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "gizmosc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/gizmos/dynamicsash.h>
 #include <wx/gizmos/editlbox.h>
 #include <wx/gizmos/splittree.h>
index 239a195b0302f9ec5e8fbf845db7ee7ee9b504f1..b5348751cc2519463b2629ed2adc4595ee1ed12d 100644 (file)
@@ -14,7 +14,7 @@
 
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include <wx/gizmos/dynamicsash.h>
 #include <wx/gizmos/editlbox.h>
 #include <wx/gizmos/splittree.h>
index b51b3fb5f1164709fa08268af2a810dc159e7e4c..3b15de59f96d5dcf1dbf1c298fccc66673ce77d3 100644 (file)
@@ -14,7 +14,7 @@
 %module glcanvas
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #ifdef __WXMSW__
 #include "myglcanvas.h"
 #else
index c103574fffb46303bef7665a2cf7fe41255a897b..5d7ac821aa636841b3fe82eafbaa3b5d2179ff33 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "glcanvasc"
 
-#include "export.h"
+#include "wxPython.h"
 #ifdef __WXMSW__
 #include "myglcanvas.h"
 #else
index abd1f2f04e1caf52a4dc1bb251fdab9541e1c5d4..da700b564fce66287702c094d73bb31f25bc5780 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "oglc"
 
-#include "export.h"
+#include "wxPython.h"
 #include "oglhelpers.h"
 
 
index 0d66d6528229743e2c7931b81aad69206d9422b5..b23154b67940a2af40937d7fdc515112d4595ddc 100644 (file)
@@ -14,7 +14,7 @@
 %module ogl
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include "oglhelpers.h"
 %}
 
index 7bc2a3787c58d818e935fc1c2d15fedad5e83526..ab32951076fdb9eda210713703f3e5309c5708be 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "oglbasicc"
 
-#include "export.h"
+#include "wxPython.h"
 #include "oglhelpers.h"
 
 
index 8fd19b783b224ae11a59aba97b20c53429b57532..806c6b32ec24c8c8995bb2129b59ca0b6eab981a 100644 (file)
@@ -14,7 +14,7 @@
 %module oglbasic
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include "oglhelpers.h"
 %}
 
index a3feab52c1c05a9270b42557e41bd1440041937c..b5af2a3820ff5c1accdf964e38f32e1abc6a2558 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "oglcanvasc"
 
-#include "export.h"
+#include "wxPython.h"
 #include "oglhelpers.h"
 
 
index a2dd8f59b8d08ce87fe51c7f7e846075d6cc6f8d..c2005ce1bc7ed22fc94ddde1d12c2ec0224dd610 100644 (file)
@@ -14,7 +14,7 @@
 %module oglcanvas
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include "oglhelpers.h"
 %}
 
index 7291643aceff33c66c6794b07cb8de967fa9997c..7e4c39f2d598a37fbf6fadd18c4b7c30fa763d39 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "oglshapesc"
 
-#include "export.h"
+#include "wxPython.h"
 #include "oglhelpers.h"
 
 
index 84e23767872a9a5703c544989e67869156caacc0..38fd4dab8a760c6e1ed90db74f304b801372386b 100644 (file)
@@ -14,7 +14,7 @@
 %module oglshapes
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include "oglhelpers.h"
 %}
 
index 641bff8b01f08591815a4c4e61648d64b2601b43..d23ae73f62bafa6338e5ac7df123921f74d0b3d1 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "oglshapes2c"
 
-#include "export.h"
+#include "wxPython.h"
 #include "oglhelpers.h"
 
 
index 22145b2f78d80fdeaa63a69c803e0845b5aea5a2..2cb69e5a437f821150343f8d72e897b532e92558 100644 (file)
@@ -14,7 +14,7 @@
 %module oglshapes2
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include "oglhelpers.h"
 %}
 
index ed6e85e081347be6397e54933c12baef821c6848..97b37af3cabd2334a3cd5c09e7693fb223ae37d5 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "stc_c"
 
-#include "export.h"
+#include "wxPython.h"
 #include "wx/stc/stc.h"
 
 
index c92d6ebce1045390dee7404297b75f5f076d5d05..32f05e9e72fbd0284de6c77845ca32feebcb1326 100644 (file)
@@ -14,7 +14,7 @@
 
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include "wx/stc/stc.h"
 %}
 
index 175c7a154dc1958b3671dc66c946b098dd93ad31..cb13ed9d33c16c88f2bbfb77c7726a7c59bc5dbd 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "xrcc"
 
-#include "export.h"
+#include "wxPython.h"
 #include "wx/xrc/xmlres.h"
 
 
index 3e6869004f190013e3e1a8163d177995bfb34fb5..692f7775458e19eea9f94aef8ebe4eff37ac6e1d 100644 (file)
@@ -14,7 +14,7 @@
 
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include "wx/xrc/xmlres.h"
 %}
 
index 6c5b1a4be62fbd91c5975861198ceaa6e0400766..96add9859bfe0f143f62c8925d60cb38f10b77a9 100644 (file)
@@ -14,7 +14,7 @@
 
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include <wx/calctrl.h>
 %}
 
diff --git a/wxPython/src/export.h b/wxPython/src/export.h
deleted file mode 100644 (file)
index a38a1c7..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        export.h
-// Purpose:     To be used from modules that are not part of the core
-//              wxPython extension in order to get access to some helper
-//              functions that live in wxc.
-//
-// Author:      Robin Dunn
-//
-// Created:     14-Dec-2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __wxp_export__
-#define __wxp_export__
-
-//----------------------------------------------------------------------
-
-#define wxPyUSE_EXPORT
-#include "helpers.h"
-
-
-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_GetPtrObj(a, b, c)             (wxPyCoreAPIPtr->p_SWIG_GetPtrObj(a, b, c))
-#define SWIG_RegisterMapping(a, b, c)       (wxPyCoreAPIPtr->p_SWIG_RegisterMapping(a, b, c))
-#define SWIG_addvarlink(a, b, c, d)         (wxPyCoreAPIPtr->p_SWIG_addvarlink(a, b, c, d))
-
-#define wxPyBeginAllowThreads()             (wxPyCoreAPIPtr->p_wxPyBeginAllowThreads())
-#define wxPyEndAllowThreads(a)              (wxPyCoreAPIPtr->p_wxPyEndAllowThreads(a))
-#define wxPyBeginBlockThreads()             (wxPyCoreAPIPtr->p_wxPyBeginBlockThreads())
-#define wxPyEndBlockThreads()               (wxPyCoreAPIPtr->p_wxPyEndBlockThreads())
-
-#define wxPyConstructObject(a,b,c)          (wxPyCoreAPIPtr->p_wxPyConstructObject(a,b,c))
-#define wxPy_ConvertList(a,b)               (wxPyCoreAPIPtr->p_wxPy_ConvertList(a,b))
-
-#define wxString_in_helper(a)               (wxPyCoreAPIPtr->p_wxString_in_helper(a))
-#define Py2wxString(a)                      (wxPyCoreAPIPtr->p_Py2wxString(a))
-#define wx2PyString(a)                      (wxPyCoreAPIPtr->p_wx2PyString(a))
-
-#define byte_LIST_helper(a)                 (wxPyCoreAPIPtr->p_byte_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,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 wxSize_helper(a,b)                  (wxPyCoreAPIPtr->p_wxSize_helper(a,b))
-#define wxPoint_helper(a,b)                 (wxPyCoreAPIPtr->p_wxPoint_helper(a,b))
-#define wxRealPoint_helper(a,b)             (wxPyCoreAPIPtr->p_wxRealPoint_helper(a,b))
-#define wxRect_helper(a,b)                  (wxPyCoreAPIPtr->p_wxRect_helper(a,b))
-#define wxColour_helper(a,b)                (wxPyCoreAPIPtr->p_wxColour_helper(a,b))
-
-#define wxPyCBH_setCallbackInfo(a, b, c, d) (wxPyCoreAPIPtr->p_wxPyCBH_setCallbackInfo(a,b,c,d))
-#define wxPyCBH_findCallback(a, b)          (wxPyCoreAPIPtr->p_wxPyCBH_findCallback(a, b))
-#define wxPyCBH_callCallback(a, b)          (wxPyCoreAPIPtr->p_wxPyCBH_callCallback(a, b))
-#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,TRUE))
-#define wxPyMake_wxObject2(a,b)             (wxPyCoreAPIPtr->p_wxPyMake_wxObject(a,b))
-#define wxPyMake_wxSizer(a)                 (wxPyCoreAPIPtr->p_wxPyMake_wxSizer(a))
-#define wxPyPtrTypeMap_Add(a, b)            (wxPyCoreAPIPtr->p_wxPyPtrTypeMap_Add(a, b))
-#define wxArrayString2PyList_helper(a)      (wxPyCoreAPIPtr->p_wxArrayString2PyList_helper(a))
-#define wxArrayInt2PyList_helper(a)         (wxPyCoreAPIPtr->p_wxArrayInt2PyList_helper(a))
-
-#define wxPyClientData_dtor(a)              (wxPyCoreAPIPtr->p_wxPyClientData_dtor(a))
-#define wxPyUserData_dtor(a)                (wxPyCoreAPIPtr->p_wxPyUserData_dtor(a))
-#define wxPyOORClientData_dtor(a)           (wxPyCoreAPIPtr->p_wxPyOORClientData_dtor(a))
-
-// This one is special.  It's the first function called in SWIG generated
-// modules, so we'll use it to also import the API.
-#define SWIG_newvarlink()     (wxPyCoreAPI_IMPORT(), wxPyCoreAPIPtr->p_SWIG_newvarlink())
-
-
-//----------------------------------------------------------------------
-#endif
index f09c7d064238e2f97ee904b6f42890c21a0da19d..09db772abf3a14b2c89110593a4246974f0a94cc 100644 (file)
@@ -15,7 +15,7 @@
 #ifndef OLD_GRID
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include <wx/grid.h>
 #include <wx/generic/gridctrl.h>
 %}
index f7f6c5a7be307e548d5bb7da0bfabd27e4f9643f..ea1bb8ad543e7ad262907fe415a6172d1485f373 100644 (file)
@@ -13,7 +13,7 @@
 %module help
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include <wx/cshelp.h>
 %}
 
index 9fc0835024d2b13c3da6083854fc7e366ba7f556..bb978a43d9f60bdbc9191297229f27459d84472d 100644 (file)
@@ -14,7 +14,7 @@
 %module html
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include <wx/html/htmlwin.h>
 #include <wx/html/htmprint.h>
 #include <wx/image.h>
index 7e8612b8ddbd0b395a82203eee9f12dad3b769d8..b74d65fb9fd77622f6c1209964d0855daaaf39e4 100644 (file)
@@ -14,7 +14,7 @@
 %module htmlhelp
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include <wx/html/htmlwin.h>
 #include <wx/html/helpctrl.h>
 #include <wx/image.h>
index 9da116f7216fe014390ca7d8e0313936b3a6b883..046a05237092ecd0fed703dcfc470f9b4dca4325 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "calendarc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/calctrl.h>
 
 
index 1b307e707e25c2d72c4146d35ec6f1f3252e678a..4b890d14cf2877f78aaabc766484b1473a5a3d88 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "gridc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/grid.h>
 #include <wx/generic/gridctrl.h>
 
index 5115a5c68009645467e6b837daf0a63e8a49b8e5..c07bd622338e4084f7229e137d7abf9fcf0b524b 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "helpc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/cshelp.h>
 
 
index e56500ea412302507a16a9a6cb386b2f08be16c3..82788159f1bcb219ba20031c169187a1a9c235db 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "htmlc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/html/htmlwin.h>
 #include <wx/html/htmprint.h>
 #include <wx/image.h>
index c61bf787258b808413d76181f1f691c3c42947de..8f2b5a589a2bd83f6924df587c915167d94b168a 100644 (file)
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "htmlhelpc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/html/htmlwin.h>
 #include <wx/html/helpctrl.h>
 #include <wx/image.h>
index 186031e5f98cb9efb2ec88a4c83ce7c9f16c0b58..cc298bcb4fff4996ce15291d3cd2a63d96454991 100644 (file)
@@ -596,7 +596,7 @@ PyObject *ptrfree(PyObject *_PTRVALUE) {
 
     wxPyApp* wxGetApp() {
         //return wxPythonApp;
-        return (wxPyApp*)wxGetApp();
+        return (wxPyApp*)wxTheApp;
     }
 
     void wxApp_CleanUp() {
diff --git a/wxPython/src/wxPython.h b/wxPython/src/wxPython.h
new file mode 100644 (file)
index 0000000..934894b
--- /dev/null
@@ -0,0 +1,99 @@
+////////////////////////////////////////////////////////////////////////////
+// Name:        wxPython.h
+// Purpose:     To be used from modules that are not part of the core
+//              wxPython extension--or from 3rd party apps and modules--in
+//              order to get access to some helper functions that live in wxc.
+//
+// Author:      Robin Dunn
+//
+// Created:     14-Dec-2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __wxp_export__
+#define __wxp_export__
+
+//----------------------------------------------------------------------
+
+// TODO:  Make it so this and helpers.h are installed to
+//        the wx include path...
+
+#define wxPyUSE_EXPORT
+#include "helpers.h"
+
+//----------------------------------------------------------------------
+
+// This needs to be called in modules that need to 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 wxc.
+static void wxPyCoreAPI_IMPORT() {
+    wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wxPython.wxc", "wxPyCoreAPI");
+    if (! wxPyCoreAPIPtr)
+        wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wxc", "wxPyCoreAPI");
+}
+
+
+
+// The following macros actually call functions of the same name located
+// in the wxc extension module via the API pointer retieved above.
+
+#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_GetPtrObj(a, b, c)             (wxPyCoreAPIPtr->p_SWIG_GetPtrObj(a, b, c))
+#define SWIG_RegisterMapping(a, b, c)       (wxPyCoreAPIPtr->p_SWIG_RegisterMapping(a, b, c))
+#define SWIG_addvarlink(a, b, c, d)         (wxPyCoreAPIPtr->p_SWIG_addvarlink(a, b, c, d))
+
+#define wxPyBeginAllowThreads()             (wxPyCoreAPIPtr->p_wxPyBeginAllowThreads())
+#define wxPyEndAllowThreads(a)              (wxPyCoreAPIPtr->p_wxPyEndAllowThreads(a))
+#define wxPyBeginBlockThreads()             (wxPyCoreAPIPtr->p_wxPyBeginBlockThreads())
+#define wxPyEndBlockThreads()               (wxPyCoreAPIPtr->p_wxPyEndBlockThreads())
+
+#define wxPyConstructObject(a,b,c)          (wxPyCoreAPIPtr->p_wxPyConstructObject(a,b,c))
+#define wxPy_ConvertList(a,b)               (wxPyCoreAPIPtr->p_wxPy_ConvertList(a,b))
+
+#define wxString_in_helper(a)               (wxPyCoreAPIPtr->p_wxString_in_helper(a))
+#define Py2wxString(a)                      (wxPyCoreAPIPtr->p_Py2wxString(a))
+#define wx2PyString(a)                      (wxPyCoreAPIPtr->p_wx2PyString(a))
+
+#define byte_LIST_helper(a)                 (wxPyCoreAPIPtr->p_byte_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,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 wxSize_helper(a,b)                  (wxPyCoreAPIPtr->p_wxSize_helper(a,b))
+#define wxPoint_helper(a,b)                 (wxPyCoreAPIPtr->p_wxPoint_helper(a,b))
+#define wxRealPoint_helper(a,b)             (wxPyCoreAPIPtr->p_wxRealPoint_helper(a,b))
+#define wxRect_helper(a,b)                  (wxPyCoreAPIPtr->p_wxRect_helper(a,b))
+#define wxColour_helper(a,b)                (wxPyCoreAPIPtr->p_wxColour_helper(a,b))
+
+#define wxPyCBH_setCallbackInfo(a, b, c, d) (wxPyCoreAPIPtr->p_wxPyCBH_setCallbackInfo(a,b,c,d))
+#define wxPyCBH_findCallback(a, b)          (wxPyCoreAPIPtr->p_wxPyCBH_findCallback(a, b))
+#define wxPyCBH_callCallback(a, b)          (wxPyCoreAPIPtr->p_wxPyCBH_callCallback(a, b))
+#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,TRUE))
+#define wxPyMake_wxObject2(a,b)             (wxPyCoreAPIPtr->p_wxPyMake_wxObject(a,b))
+#define wxPyMake_wxSizer(a)                 (wxPyCoreAPIPtr->p_wxPyMake_wxSizer(a))
+#define wxPyPtrTypeMap_Add(a, b)            (wxPyCoreAPIPtr->p_wxPyPtrTypeMap_Add(a, b))
+#define wxArrayString2PyList_helper(a)      (wxPyCoreAPIPtr->p_wxArrayString2PyList_helper(a))
+#define wxArrayInt2PyList_helper(a)         (wxPyCoreAPIPtr->p_wxArrayInt2PyList_helper(a))
+
+#define wxPyClientData_dtor(a)              (wxPyCoreAPIPtr->p_wxPyClientData_dtor(a))
+#define wxPyUserData_dtor(a)                (wxPyCoreAPIPtr->p_wxPyUserData_dtor(a))
+#define wxPyOORClientData_dtor(a)           (wxPyCoreAPIPtr->p_wxPyOORClientData_dtor(a))
+
+// This one is special.  It's the first function called in SWIG generated
+// modules, so we'll use it to also import the API.
+#define SWIG_newvarlink()     (wxPyCoreAPI_IMPORT(), wxPyCoreAPIPtr->p_SWIG_newvarlink())
+
+
+//----------------------------------------------------------------------
+#endif