Demo cleanup

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

diff --git a/wxPython/src/export.h b/wxPython/src/export.h
index f7c2fd349d0622160a7c2303ac625e824e0ac3ed..f1219c075f8deabd8100ed1c234b8a25be84742f 100644 (file)
--- a/wxPython/src/export.h
+++ b/wxPython/src/export.h
@@ -33,8 +33,9 @@ static void wxPyCoreAPI_IMPORT() {
 #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 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 wxPyRestoreThread()             (wxPyCoreAPIPtr->p_wxPyRestoreThread())
-#define wxPySaveThread(a)               (wxPyCoreAPIPtr->p_wxPySaveThread(a))
+#define wxPyBeginBlockThreads()         (wxPyCoreAPIPtr->p_wxPyBeginBlockThreads())
+#define wxPyEndBlockThreads(a)          (wxPyCoreAPIPtr->p_wxPyEndBlockThreads(a))
+

 #define wxPyConstructObject(a,b,c)      (wxPyCoreAPIPtr->p_wxPyConstructObject(a,b,c))
 #define wxPy_ConvertList(a,b)           (wxPyCoreAPIPtr->p_wxPy_ConvertList(a,b))
 #define byte_LIST_helper(a)             (wxPyCoreAPIPtr->p_byte_LIST_helper(a))
 #define wxPyConstructObject(a,b,c)      (wxPyCoreAPIPtr->p_wxPyConstructObject(a,b,c))
 #define wxPy_ConvertList(a,b)           (wxPyCoreAPIPtr->p_wxPy_ConvertList(a,b))
 #define byte_LIST_helper(a)             (wxPyCoreAPIPtr->p_byte_LIST_helper(a))


@@ -52,12 +53,16 @@ static void wxPyCoreAPI_IMPORT() {
 #define wxRect_helper(a,b)              (wxPyCoreAPIPtr->p_wxRect_helper(a,b))
 #define wxColour_helper(a,b)            (wxPyCoreAPIPtr->p_wxColour_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_setSelf(a, b, c, d)     (wxPyCoreAPIPtr->p_wxPyCBH_setSelf(a,b,c,d))
+#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 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))
+#define wxPyPtrTypeMap_Add(a, b)        (wxPyCoreAPIPtr->p_wxPyPtrTypeMap_Add(a, b))
+

 
 // This one is special.  It's the first function called in SWIG generated
 // modules, so we'll use it to also import the API.
 
 // This one is special.  It's the first function called in SWIG generated
 // modules, so we'll use it to also import the API.