corrections to dynamic loading for Darwin

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

diff --git a/wxPython/src/export.h b/wxPython/src/export.h
index 29f38b70262b08bdf5a353ba13283e4178673f0a..eb944800c9ce0821f809236f3f6c2390a744e321 100644 (file)
--- a/wxPython/src/export.h
+++ b/wxPython/src/export.h
@@ -33,8 +33,11 @@ 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 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 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,15 +55,19 @@ 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 wxPyClassExists(a)              (wxPyCoreAPIPtr->p_wxPyClassExists(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 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 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))

 
 
 // This one is special.  It's the first function called in SWIG generated
 
 
 // This one is special.  It's the first function called in SWIG generated