Some updates and fixes

[wxWidgets.git] / utils / wxPython / src / helpers.h

diff --git a/utils/wxPython/src/helpers.h b/utils/wxPython/src/helpers.h
index a8c06a23e024e82bcfb640b4a7702bda736daf1f..ae0d93b672eed1a931325312f3e4507732a23399 100644 (file)
--- a/utils/wxPython/src/helpers.h
+++ b/utils/wxPython/src/helpers.h
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////

 // Name:        helpers.h
 // Purpose:     Helper functions/classes for the wxPython extenaion module
 //
 // Name:        helpers.h
 // Purpose:     Helper functions/classes for the wxPython extenaion module
 //


@@ -31,10 +31,6 @@
 #define wxPy_END_ALLOW_THREADS
 #endif
 
 #define wxPy_END_ALLOW_THREADS
 #endif
 

-#ifdef WXP_WITH_THREAD
-extern PyThreadState*   wxPyEventThreadState;
-extern bool             wxPyInEvent;
-#endif

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -44,6 +40,8 @@ extern bool             wxPyInEvent;
 #       define HELPEREXPORT
 #endif
 
 #       define HELPEREXPORT
 #endif
 

+typedef unsigned char byte;
+

 //----------------------------------------------------------------------
 
 class wxPyApp: public wxApp
 //----------------------------------------------------------------------
 
 class wxPyApp: public wxApp


@@ -68,14 +66,48 @@ PyObject* __wxSetDictionary(PyObject*, PyObject* args);
 
 void wxPyEventThunker(wxObject*, wxEvent& event);
 
 
 void wxPyEventThunker(wxObject*, wxEvent& event);
 

-HELPEREXPORT PyObject* wxPyConstructObject(void* ptr, char* className);
+HELPEREXPORT PyObject* wxPyConstructObject(void* ptr, const char* className);
+HELPEREXPORT bool wxPyRestoreThread();
+HELPEREXPORT void wxPySaveThread(bool doSave);
+HELPEREXPORT PyObject* wxPy_ConvertList(wxListBase* list, const char* className);
+HELPEREXPORT long wxPyGetWinHandle(wxWindow* win);
+
+//----------------------------------------------------------------------
+
+class wxPyUserData : public wxObject {
+public:
+    wxPyUserData(PyObject* obj) { m_obj = obj; Py_INCREF(m_obj); }
+    ~wxPyUserData() {
+        bool doSave = wxPyRestoreThread();
+        Py_DECREF(m_obj);
+        wxPySaveThread(doSave);
+    }
+    PyObject* m_obj;
+};

 
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------

+// These are helpers used by the typemaps
+
+HELPEREXPORT byte* byte_LIST_helper(PyObject* source);
+HELPEREXPORT int* int_LIST_helper(PyObject* source);
+HELPEREXPORT long* long_LIST_helper(PyObject* source);
+HELPEREXPORT char** string_LIST_helper(PyObject* source);
+HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source);
+HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source);
+HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source);
+HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
+
+HELPEREXPORT bool wxSize_helper(PyObject* source, wxSize** obj);
+HELPEREXPORT bool wxPoint_helper(PyObject* source, wxPoint** obj);
+HELPEREXPORT bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj);
+HELPEREXPORT bool wxRect_helper(PyObject* source, wxRect** obj);

 
 

+//----------------------------------------------------------------------

 
 #ifndef SWIGCODE
 extern "C" void SWIG_MakePtr(char *, void *, char *);
 extern "C" char *SWIG_GetPtr(char *, void **, char *);
 
 #ifndef SWIGCODE
 extern "C" void SWIG_MakePtr(char *, void *, char *);
 extern "C" char *SWIG_GetPtr(char *, void **, char *);

+extern "C" char *SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type);

 #endif
 
 
 #endif
 
 


@@ -83,7 +115,6 @@ extern "C" char *SWIG_GetPtr(char *, void **, char *);
 # pragma warning(disable:4800)
 #endif
 
 # pragma warning(disable:4800)
 #endif
 

-typedef unsigned char byte;

 
 
 // Non-const versions to keep SWIG happy.
 
 
 // Non-const versions to keep SWIG happy.


@@ -94,8 +125,10 @@ extern wxString wxPyEmptyStr;
 //----------------------------------------------------------------------
 
 class wxPyCallback : public wxObject {
 //----------------------------------------------------------------------
 
 class wxPyCallback : public wxObject {

+    DECLARE_ABSTRACT_CLASS(wxPyCallback);

 public:
     wxPyCallback(PyObject* func);
 public:
     wxPyCallback(PyObject* func);

+    wxPyCallback(const wxPyCallback& other);

     ~wxPyCallback();
 
     void EventThunker(wxEvent& event);
     ~wxPyCallback();
 
     void EventThunker(wxEvent& event);


@@ -103,19 +136,6 @@ public:
     PyObject*   m_func;
 };
 
     PyObject*   m_func;
 };
 

-//---------------------------------------------------------------------------
-
-//  class wxPyMenu : public wxMenu {
-//  public:
-//      wxPyMenu(const wxString& title = "", PyObject* func=NULL);
-//      ~wxPyMenu();
-
-//  private:
-//      static void MenuCallback(wxMenu& menu, wxCommandEvent& evt);
-//      PyObject*   func;
-//  };
-
-

 //---------------------------------------------------------------------------
 
 class wxPyTimer : public wxTimer {
 //---------------------------------------------------------------------------
 
 class wxPyTimer : public wxTimer {


@@ -131,20 +151,6 @@ private:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-class wxPyEvent : public wxCommandEvent {
-    DECLARE_DYNAMIC_CLASS(wxPyEvent)
-public:
-    wxPyEvent(wxEventType commandType = wxEVT_NULL, PyObject* userData = Py_None);
-    ~wxPyEvent();
-
-    void SetUserData(PyObject* userData);
-    PyObject* GetUserData();
-
-private:
-    PyObject* m_userData;
-};
-
-

 
 
 
 
 
 


@@ -154,14 +160,18 @@ private:
 // method redirections.  For all classes which have virtuals which should be
 // overridable in wxPython, a new subclass is created that contains a
 // wxPyCallbackHelper.
 // method redirections.  For all classes which have virtuals which should be
 // overridable in wxPython, a new subclass is created that contains a
 // wxPyCallbackHelper.

-//---------------------------------------------------------------------------
+//
+// **** This class should be combined with wxPyCallback defined above.
+//

 
 class HELPEREXPORT wxPyCallbackHelper {
 public:
     wxPyCallbackHelper();
     ~wxPyCallbackHelper();
 
 
 class HELPEREXPORT wxPyCallbackHelper {
 public:
     wxPyCallbackHelper();
     ~wxPyCallbackHelper();
 

-    void        setSelf(PyObject* self);
+    wxPyCallbackHelper(const wxPyCallbackHelper& other);
+
+    void        setSelf(PyObject* self, int incref=TRUE);

 
     bool        findCallback(const wxString& name);
     int         callCallback(PyObject* argTuple);
 
     bool        findCallback(const wxString& name);
     int         callCallback(PyObject* argTuple);


@@ -170,276 +180,781 @@ public:
 private:
     PyObject*   m_self;
     PyObject*   m_lastFound;
 private:
     PyObject*   m_self;
     PyObject*   m_lastFound;

+    int         m_incRef;
+};
+
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+// These Event classes can be derived from in Python and passed through the
+// event system without loosing anything.  They do this by keeping a reference
+// to themselves and some special case handling in wxPyCallback::EventThunker.
+
+
+class wxPyEvtSelfRef {
+public:
+    wxPyEvtSelfRef();
+    ~wxPyEvtSelfRef();
+
+    void SetSelf(PyObject* self, bool clone=FALSE);
+    PyObject* GetSelf() const;
+
+protected:
+    PyObject*   m_self;
+    bool        m_cloned;

 };
 
 
 };
 
 

+class wxPyEvent : public wxEvent, public wxPyEvtSelfRef {
+    DECLARE_DYNAMIC_CLASS(wxPyEvent)
+public:
+    wxPyEvent(int id=0);
+    ~wxPyEvent();
+
+    void CopyObject(wxObject& dest) const;
+};
+
+
+class wxPyCommandEvent : public wxCommandEvent, public wxPyEvtSelfRef {
+    DECLARE_DYNAMIC_CLASS(wxPyCommandEvent)
+public:
+    wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0);
+    ~wxPyCommandEvent();
+
+    void CopyObject(wxObject& dest) const;
+};
+

 
 //---------------------------------------------------------------------------
 // These macros are used to implement the virtual methods that should
 // redirect to a Python method if one exists.  The names designate the
 
 //---------------------------------------------------------------------------
 // These macros are used to implement the virtual methods that should
 // redirect to a Python method if one exists.  The names designate the

-// return type, if any as well as any parameter types.
+// return type, if any, as well as any parameter types.

 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__(PCLASS, CBNAME)                                    \
-    void CBNAME() {                                                     \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("()"));                 \
-        else                                                            \
-            PCLASS::CBNAME();                                           \
-    }                                                                   \
-    void base_##CBNAME() {                                              \
-        PCLASS::CBNAME();                                               \
-    }
+#define PYPRIVATE                                       \
+    void _setSelf(PyObject* self, int incref=1) {       \
+        m_myInst.setSelf(self, incref);                 \
+    }                                                   \
+    private: wxPyCallbackHelper m_myInst;

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-#define PYPRIVATE                               \
-    void _setSelf(PyObject* self) {             \
-        m_myInst.setSelf(self);                 \
-    }                                           \
-    private: wxPyCallbackHelper m_myInst;
+#define DEC_PYCALLBACK__(CBNAME)                        \
+    void CBNAME();                                      \
+    void base_##CBNAME();
+
+
+#define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME)         \
+    void CLASS::CBNAME() {                              \
+        bool doSave = wxPyRestoreThread();              \
+        if (m_myInst.findCallback(#CBNAME))             \
+            m_myInst.callCallback(Py_BuildValue("()")); \
+        else                                            \
+            PCLASS::CBNAME();                           \
+        wxPySaveThread(doSave);                         \
+    }                                                   \
+    void CLASS::base_##CBNAME() {                       \
+        PCLASS::CBNAME();                               \
+    }

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME)                          \
-    bool CBNAME(int a, int b) {                                         \
+#define DEC_PYCALLBACK_BOOL_INTINT(CBNAME)                      \
+    bool CBNAME(int a, int b);                                  \
+    bool base_##CBNAME(int a, int b);
+
+
+#define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME)               \
+    bool CLASS::CBNAME(int a, int b) {                                  \
+        bool rval;                                                      \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            return m_myInst.callCallback(Py_BuildValue("(ii)",a,b));    \
+            rval = m_myInst.callCallback(Py_BuildValue("(ii)",a,b));    \

         else                                                            \
         else                                                            \

-            return PCLASS::CBNAME(a,b);                                 \
+            rval = PCLASS::CBNAME(a,b);                                 \
+        wxPySaveThread(doSave);                                         \
+        return rval;                                                    \

     }                                                                   \
     }                                                                   \

-    bool base_##CBNAME(int a, int b) {                                  \
+    bool CLASS::base_##CBNAME(int a, int b) {                           \

         return PCLASS::CBNAME(a,b);                                     \
     }
 
 //---------------------------------------------------------------------------
 
         return PCLASS::CBNAME(a,b);                                     \
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK_BOOL_INT(PCLASS, CBNAME)                             \
-    bool CBNAME(int a) {                                                \
+#define DEC_PYCALLBACK_BOOL_INT(CBNAME)                         \
+    bool CBNAME(int a);                                         \
+    bool base_##CBNAME(int a);
+
+
+#define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME)                  \
+    bool CLASS::CBNAME(int a) {                                         \
+        bool rval;                                                      \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            return m_myInst.callCallback(Py_BuildValue("(i)",a));       \
+            rval = m_myInst.callCallback(Py_BuildValue("(i)",a));       \

         else                                                            \
         else                                                            \

-            return PCLASS::CBNAME(a);                                   \
+            rval = PCLASS::CBNAME(a);                                   \
+        wxPySaveThread(doSave);                                         \
+        return rval;                                                    \

     }                                                                   \
     }                                                                   \

-    bool base_##CBNAME(int a) {                                         \
+    bool CLASS::base_##CBNAME(int a) {                                  \

         return PCLASS::CBNAME(a);                                       \
     }
 
 //---------------------------------------------------------------------------
 
         return PCLASS::CBNAME(a);                                       \
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK_BOOL_INT_pure(PCLASS, CBNAME)                        \
-    bool CBNAME(int a) {                                                \
+#define DEC_PYCALLBACK_BOOL_INT_pure(CBNAME)            \
+    bool CBNAME(int a);
+
+
+#define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME)             \
+    bool CLASS::CBNAME(int a) {                                         \
+        bool rval;                                                      \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            return m_myInst.callCallback(Py_BuildValue("(i)",a));       \
-        else return false;                                              \
+            rval = m_myInst.callCallback(Py_BuildValue("(i)",a));       \
+        else rval = FALSE;                                              \
+        wxPySaveThread(doSave);                                         \
+        return rval;                                                    \

     }
 
 
 //---------------------------------------------------------------------------
 
     }
 
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__DC(PCLASS, CBNAME)                                  \
-    void CBNAME(wxDC& a) {                                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(O)",                  \
-                            wxPyConstructObject(&a, "wxDC")));           \
-        else                                                            \
-            PCLASS::CBNAME(a);                                          \
-    }                                                                   \
-    void base_##CBNAME(wxDC& a) {                                       \
-        PCLASS::CBNAME(a);                                              \
+#define DEC_PYCALLBACK__DC(CBNAME)                      \
+    void CBNAME(wxDC& a);                               \
+    void base_##CBNAME(wxDC& a);
+
+
+#define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME)               \
+    void CLASS::CBNAME(wxDC& a) {                               \
+        bool doSave = wxPyRestoreThread();                      \
+        if (m_myInst.findCallback(#CBNAME))                     \
+            m_myInst.callCallback(Py_BuildValue("(O)",          \
+                            wxPyConstructObject(&a, "wxDC")));  \
+        else                                                    \
+            PCLASS::CBNAME(a);                                  \
+        wxPySaveThread(doSave);                                 \
+    }                                                           \
+    void CLASS::base_##CBNAME(wxDC& a) {                        \
+        PCLASS::CBNAME(a);                                      \

     }
 
 
 
 //---------------------------------------------------------------------------
 
     }
 
 
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__DCBOOL(PCLASS, CBNAME)                              \
-    void CBNAME(wxDC& a, bool b) {                                      \
+#define DEC_PYCALLBACK__DCBOOL(CBNAME)                  \
+    void CBNAME(wxDC& a, bool b);                       \
+    void base_##CBNAME(wxDC& a, bool b);
+
+
+#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
+    void CLASS::CBNAME(wxDC& a, bool b) {                               \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
             m_myInst.callCallback(Py_BuildValue("(Oi)",                 \
         if (m_myInst.findCallback(#CBNAME))                             \
             m_myInst.callCallback(Py_BuildValue("(Oi)",                 \

-                            wxPyConstructObject(&a, "wxDC"), (int)b));   \
+                            wxPyConstructObject(&a, "wxDC"), (int)b));  \

         else                                                            \
             PCLASS::CBNAME(a, b);                                       \
         else                                                            \
             PCLASS::CBNAME(a, b);                                       \

+        wxPySaveThread(doSave);                                         \

     }                                                                   \
     }                                                                   \

-    void base_##CBNAME(wxDC& a, bool b) {                               \
+    void CLASS::base_##CBNAME(wxDC& a, bool b) {                        \

         PCLASS::CBNAME(a, b);                                           \
     }
 
 //---------------------------------------------------------------------------
 
         PCLASS::CBNAME(a, b);                                           \
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__DCBOOL(PCLASS, CBNAME)                              \
-    void CBNAME(wxDC& a, bool b) {                                      \
+#define DEC_PYCALLBACK__DCBOOL(CBNAME)                          \
+    void CBNAME(wxDC& a, bool b);                               \
+    void base_##CBNAME(wxDC& a, bool b);
+
+
+#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
+    void CLASS::CBNAME(wxDC& a, bool b) {                               \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
             m_myInst.callCallback(Py_BuildValue("(Oi)",                 \
         if (m_myInst.findCallback(#CBNAME))                             \
             m_myInst.callCallback(Py_BuildValue("(Oi)",                 \

-                            wxPyConstructObject(&a, "wxDC"), (int)b));   \
+                            wxPyConstructObject(&a, "wxDC"), (int)b));  \

         else                                                            \
             PCLASS::CBNAME(a, b);                                       \
         else                                                            \
             PCLASS::CBNAME(a, b);                                       \

+                wxPySaveThread(doSave);                                 \

     }                                                                   \
     }                                                                   \

-    void base_##CBNAME(wxDC& a, bool b) {                               \
+    void CLASS::base_##CBNAME(wxDC& a, bool b) {                        \

         PCLASS::CBNAME(a, b);                                           \
     }
 
 //---------------------------------------------------------------------------
 
         PCLASS::CBNAME(a, b);                                           \
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__2DBL(PCLASS, CBNAME)                                \
-    void CBNAME(double a, double b) {                                   \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(dd)",a,b));           \
-        else                                                            \
-            PCLASS::CBNAME(a, b);                                       \
-    }                                                                   \
-    void base_##CBNAME(double a, double b) {                            \
-        PCLASS::CBNAME(a, b);                                           \
+#define DEC_PYCALLBACK__2DBL(CBNAME)                    \
+    void CBNAME(double a, double b);                    \
+    void base_##CBNAME(double a, double b);
+
+
+#define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME)             \
+    void CLASS::CBNAME(double a, double b) {                    \
+        bool doSave = wxPyRestoreThread();                      \
+        if (m_myInst.findCallback(#CBNAME))                     \
+            m_myInst.callCallback(Py_BuildValue("(dd)",a,b));   \
+        else                                                    \
+            PCLASS::CBNAME(a, b);                               \
+        wxPySaveThread(doSave);                                 \
+    }                                                           \
+    void CLASS::base_##CBNAME(double a, double b) {             \
+        PCLASS::CBNAME(a, b);                                   \

     }
 
 //---------------------------------------------------------------------------
 
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__2DBL2INT(PCLASS, CBNAME)                            \
-    void CBNAME(double a, double b, int c, int d) {                     \
+#define DEC_PYCALLBACK__2DBL2INT(CBNAME)                        \
+    void CBNAME(double a, double b, int c, int d);              \
+    void base_##CBNAME(double a, double b, int c, int d);
+
+
+#define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME)                 \
+    void CLASS::CBNAME(double a, double b, int c, int d) {              \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
             m_myInst.callCallback(Py_BuildValue("(ddii)",               \
                                                        a,b,c,d));       \
         else                                                            \
             PCLASS::CBNAME(a, b, c, d);                                 \
         if (m_myInst.findCallback(#CBNAME))                             \
             m_myInst.callCallback(Py_BuildValue("(ddii)",               \
                                                        a,b,c,d));       \
         else                                                            \
             PCLASS::CBNAME(a, b, c, d);                                 \

+        wxPySaveThread(doSave);                                         \

     }                                                                   \
     }                                                                   \

-    void base_##CBNAME(double a, double b, int c, int d) {              \
+    void CLASS::base_##CBNAME(double a, double b, int c, int d) {       \

         PCLASS::CBNAME(a, b, c, d);                                     \
     }
 
 //---------------------------------------------------------------------------
 
         PCLASS::CBNAME(a, b, c, d);                                     \
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__DC4DBLBOOL(PCLASS, CBNAME)                          \
-    void CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
+#define DEC_PYCALLBACK__DC4DBLBOOL(CBNAME)                              \
+    void CBNAME(wxDC& a, double b, double c, double d, double e, bool f);       \
+    void base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f);
+
+
+#define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME)                               \
+    void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {       \
+        bool doSave = wxPyRestoreThread();                                              \
+        if (m_myInst.findCallback(#CBNAME))                                             \
+            m_myInst.callCallback(Py_BuildValue("(Oddddi)",                             \
+                                   wxPyConstructObject(&a, "wxDC"),                     \
+                                              b, c, d, e, (int)f));                     \
+        else                                                                            \
+            PCLASS::CBNAME(a, b, c, d, e, f);                                           \
+        wxPySaveThread(doSave);                                                         \
+    }                                                                                   \
+    void CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
+        PCLASS::CBNAME(a, b, c, d, e, f);                                               \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_BOOL_DC4DBLBOOL(CBNAME)                                  \
+    bool CBNAME(wxDC& a, double b, double c, double d, double e, bool f);       \
+    bool base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f);
+
+
+#define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME)                           \
+    bool CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {       \
+        bool doSave = wxPyRestoreThread();                                              \
+        bool rval;                                                                      \
+        if (m_myInst.findCallback(#CBNAME))                                             \
+            rval = m_myInst.callCallback(Py_BuildValue("(Oddddi)",                      \
+                                   wxPyConstructObject(&a, "wxDC"),                     \
+                                              b, c, d, e, (int)f));                     \
+        else                                                                            \
+            rval = PCLASS::CBNAME(a, b, c, d, e, f);                                    \
+        wxPySaveThread(doSave);                                                         \
+        return rval;                                                                    \
+    }                                                                                   \
+    bool CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
+        return PCLASS::CBNAME(a, b, c, d, e, f);                                        \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK__BOOL2DBL2INT(CBNAME)                            \
+    void CBNAME(bool a, double b, double c, int d, int e);              \
+    void base_##CBNAME(bool a, double b, double c, int d, int e);
+
+
+#define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME)                     \
+    void CLASS::CBNAME(bool a, double b, double c, int d, int e) {              \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME))                                     \
+            m_myInst.callCallback(Py_BuildValue("(idii)",                       \
+                                                (int)a,b,c,d,e));               \
+        else                                                                    \
+            PCLASS::CBNAME(a, b, c, d, e);                                      \
+        wxPySaveThread(doSave);                                                 \
+    }                                                                           \
+    void CLASS::base_##CBNAME(bool a, double b, double c, int d, int e) {       \
+        PCLASS::CBNAME(a, b, c, d, e);                                          \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK__DC4DBL(CBNAME)                                      \
+    void CBNAME(wxDC& a, double b, double c, double d, double e);               \
+    void base_##CBNAME(wxDC& a, double b, double c, double d, double e);
+
+
+#define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME)                           \
+    void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e) {       \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME))                                     \
+            m_myInst.callCallback(Py_BuildValue("(Odddd)",                      \
+                                   wxPyConstructObject(&a, "wxDC"),             \
+                                                     b, c, d, e));              \
+        else                                                                    \
+            PCLASS::CBNAME(a, b, c, d, e);                                      \
+        wxPySaveThread(doSave);                                                 \
+    }                                                                           \
+    void CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e) {\
+        PCLASS::CBNAME(a, b, c, d, e);                                          \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK__DCBOOL(CBNAME)                  \
+    void CBNAME(wxDC& a, bool b);                       \
+    void base_##CBNAME(wxDC& a, bool b);
+
+
+#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME)                   \
+    void CLASS::CBNAME(wxDC& a, bool b) {                               \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            m_myInst.callCallback(Py_BuildValue("(Oddddi)",             \
-                                   wxPyConstructObject(&a, "wxDC"),      \
-                                              b, c, d, e, (int)f));     \
+            m_myInst.callCallback(Py_BuildValue("(Oi)",                 \
+                                   wxPyConstructObject(&a, "wxDC"),     \
+                                                     (int)b));          \

         else                                                            \
         else                                                            \

-            PCLASS::CBNAME(a, b, c, d, e, f);                           \
+            PCLASS::CBNAME(a, b);                                       \
+        wxPySaveThread(doSave);                                         \

     }                                                                   \
     }                                                                   \

-    void base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
-        PCLASS::CBNAME(a, b, c, d, e, f);                               \
+    void CLASS::base_##CBNAME(wxDC& a, bool b) {                        \
+        PCLASS::CBNAME(a, b);                                           \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK__WXCPBOOL2DBL2INT(CBNAME)                                \
+    void CBNAME(wxControlPoint* a, bool b, double c, double d, int e, int f);   \
+    void base_##CBNAME(wxControlPoint* a, bool b, double c, double d, int e, int f);
+
+
+#define IMP_PYCALLBACK__WXCPBOOL2DBL2INT(CLASS, PCLASS, CBNAME)                 \
+    void CLASS::CBNAME(wxControlPoint* a, bool b, double c, double d,           \
+                int e, int f) {                                                 \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME))                                     \
+            m_myInst.callCallback(Py_BuildValue("(Oiddii)",                     \
+                                 wxPyConstructObject(a, "wxPyControlPoint"),    \
+                                 (int)b, c, d, e, f));                          \
+        else                                                                    \
+            PCLASS::CBNAME(a, b, c, d, e, f);                                   \
+        wxPySaveThread(doSave);                                                 \
+    }                                                                           \
+    void CLASS::base_##CBNAME(wxControlPoint* a, bool b, double c, double d,    \
+                       int e, int f) {                                          \
+        PCLASS::CBNAME(a, b, c, d, e, f);                                       \

     }
 
 //---------------------------------------------------------------------------
 
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK_BOOL_DC4DBLBOOL(PCLASS, CBNAME)                      \
-    bool CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
+#define DEC_PYCALLBACK__WXCP2DBL2INT(CBNAME)                                    \
+    void CBNAME(wxControlPoint* a, double b, double c, int d, int e);           \
+    void base_##CBNAME(wxControlPoint* a, double b, double c, int d, int e);
+
+
+#define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME)                     \
+    void CLASS::CBNAME(wxControlPoint* a, double b, double c, int d, int e) {   \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME))                                     \
+            m_myInst.callCallback(Py_BuildValue("(Oddii)",                      \
+                                 wxPyConstructObject(a, "wxPyControlPoint"),    \
+                                 b, c, d, e));                                  \
+        else                                                                    \
+            PCLASS::CBNAME(a, b, c, d, e);                                      \
+        wxPySaveThread(doSave);                                                 \
+    }                                                                           \
+    void CLASS::base_##CBNAME(wxControlPoint* a, double b, double c,            \
+                       int d, int e) {                                          \
+        PCLASS::CBNAME(a, b, c, d, e);                                          \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK__2DBLINT(CBNAME)                 \
+    void CBNAME(double a, double b, int c);             \
+    void base_##CBNAME(double a, double b, int c);
+
+
+#define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME)                  \
+    void CLASS::CBNAME(double a, double b, int c) {                     \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            return m_myInst.callCallback(Py_BuildValue("(Oddddi)",      \
-                                   wxPyConstructObject(&a, "wxDC"),      \
-                                              b, c, d, e, (int)f));     \
+            m_myInst.callCallback(Py_BuildValue("(ddi)", a,b,c));       \

         else                                                            \
         else                                                            \

-            return PCLASS::CBNAME(a, b, c, d, e, f);                    \
+            PCLASS::CBNAME(a, b, c);                                    \
+        wxPySaveThread(doSave);                                         \

     }                                                                   \
     }                                                                   \

-    bool base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
-        return PCLASS::CBNAME(a, b, c, d, e, f);                        \
+    void CLASS::base_##CBNAME(double a, double b, int c) {              \
+        PCLASS::CBNAME(a, b, c);                                        \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK__BOOL2DBLINT(CBNAME)                     \
+    void CBNAME(bool a, double b, double c, int d);             \
+    void base_##CBNAME(bool a, double b, double c, int d);
+
+
+#define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME)                      \
+    void CLASS::CBNAME(bool a, double b, double c, int d) {                     \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME))                                     \
+            m_myInst.callCallback(Py_BuildValue("(iddi)", (int)a,b,c,d));       \
+        else                                                                    \
+            PCLASS::CBNAME(a, b, c, d);                                         \
+        wxPySaveThread(doSave);                                                 \
+    }                                                                           \
+    void CLASS::base_##CBNAME(bool a, double b, double c, int d) {              \
+        PCLASS::CBNAME(a, b, c, d);                                             \

     }
 
 //---------------------------------------------------------------------------
     }
 
 //---------------------------------------------------------------------------

+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK__STRING(CBNAME)                  \
+    void CBNAME(const wxString& a);                     \
+    void base_##CBNAME(const wxString& a);

 
 

-#define PYCALLBACK__BOOL2DBL2INT(PCLASS, CBNAME)                        \
-    void CBNAME(bool a, double b, double c, int d, int e) {             \
+
+#define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME)                   \
+    void CLASS::CBNAME(const wxString& a)  {                            \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            m_myInst.callCallback(Py_BuildValue("(idii)",               \
-                                                (int)a,b,c,d,e));       \
+            m_myInst.callCallback(Py_BuildValue("(s)", a.c_str()));     \

         else                                                            \
         else                                                            \

-            PCLASS::CBNAME(a, b, c, d, e);                              \
+            PCLASS::CBNAME(a);                                          \
+        wxPySaveThread(doSave);                                         \

     }                                                                   \
     }                                                                   \

-    void base_##CBNAME(bool a, double b, double c, int d, int e) {      \
-        PCLASS::CBNAME(a, b, c, d, e);                                  \
+    void CLASS::base_##CBNAME(const wxString& a) {                      \
+        PCLASS::CBNAME(a);                                              \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_BOOL_STRING(CBNAME)              \
+    bool CBNAME(const wxString& a);                     \
+    bool base_##CBNAME(const wxString& a);
+
+
+#define IMP_PYCALLBACK_BOOL_STRING(CLASS, PCLASS, CBNAME)                       \
+    bool CLASS::CBNAME(const wxString& a)  {                                    \
+        bool rval;                                                              \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME))                                     \
+            rval = m_myInst.callCallback(Py_BuildValue("(s)", a.c_str()));      \
+        else                                                                    \
+            rval = PCLASS::CBNAME(a);                                           \
+        wxPySaveThread(doSave);                                                 \
+        return rval;                                                            \
+    }                                                                           \
+    bool CLASS::base_##CBNAME(const wxString& a) {                              \
+        return PCLASS::CBNAME(a);                                               \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_BOOL_STRINGSTRING(CBNAME)              \
+    bool CBNAME(const wxString& a, const wxString& b);        \
+    bool base_##CBNAME(const wxString& a, const wxString& b);
+
+
+#define IMP_PYCALLBACK_BOOL_STRINGSTRING(CLASS, PCLASS, CBNAME)                 \
+    bool CLASS::CBNAME(const wxString& a, const wxString& b) {                  \
+        bool rval;                                                              \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME))                                     \
+            rval = m_myInst.callCallback(Py_BuildValue("(ss)",                  \
+                                                       a.c_str(), b.c_str()));  \
+        else                                                                    \
+            rval = PCLASS::CBNAME(a, b);                                        \
+        wxPySaveThread(doSave);                                                 \
+        return rval;                                                            \
+    }                                                                           \
+    bool CLASS::base_##CBNAME(const wxString& a, const wxString& b) {           \
+        return PCLASS::CBNAME(a, b);                                            \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_STRING_(CBNAME)                  \
+    wxString CBNAME();                                  \
+    wxString base_##CBNAME();
+
+
+#define IMP_PYCALLBACK_STRING_(CLASS, PCLASS, CBNAME)                           \
+    wxString CLASS::CBNAME() {                                                  \
+        wxString rval;                                                          \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME)) {                                   \
+            PyObject* ro;                                                       \
+            ro = m_myInst.callCallbackObj(Py_BuildValue("()"));                 \
+            rval = PyString_AsString(PyObject_Str(ro));                         \
+        }                                                                       \
+        else                                                                    \
+            rval = PCLASS::CBNAME();                                            \
+        wxPySaveThread(doSave);                                                 \
+        return rval;                                                            \
+    }                                                                           \
+    wxString CLASS::base_##CBNAME() {                                           \
+        return PCLASS::CBNAME();                                                \

     }
 
 //---------------------------------------------------------------------------
 
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__DC4DBL(PCLASS, CBNAME)                              \
-    void CBNAME(wxDC& a, double b, double c, double d, double e) {     \
+#define DEC_PYCALLBACK_STRING__pure(CBNAME)             \
+    wxString CBNAME();
+
+
+#define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME)                      \
+    wxString CLASS::CBNAME() {                                                  \
+        wxString rval;                                                          \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME)) {                                   \
+            PyObject* ro;                                                       \
+            ro = m_myInst.callCallbackObj(Py_BuildValue("()"));                 \
+            rval = PyString_AsString(PyObject_Str(ro));                         \
+        }                                                                       \
+        wxPySaveThread(doSave);                                                 \
+        return rval;                                                            \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_BOOL_TAG_pure(CBNAME)                  \
+    bool CBNAME(const wxHtmlTag& a);                          \
+
+
+#define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME)                     \
+    bool CLASS::CBNAME(const wxHtmlTag& a)  {                                   \
+        bool rval = FALSE;                                                      \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME))                                     \
+            rval = m_myInst.callCallback(Py_BuildValue("(O)",                   \
+                                         wxPyConstructObject((void*)&a,"wxHtmlTag"))); \
+        wxPySaveThread(doSave);                                                 \
+        return rval;                                                            \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK___pure(CBNAME)                         \
+    void CBNAME();                                            \
+
+
+#define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME)                            \
+    void CLASS::CBNAME() {                                                      \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME))                                     \
+            m_myInst.callCallback(Py_BuildValue("()"));                         \
+        wxPySaveThread(doSave);                                                 \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_wxSize__pure(CBNAME)                         \
+    wxSize CBNAME();                                                \
+
+
+#define IMP_PYCALLBACK_wxSize__pure(CLASS, PCLASS, CBNAME)                      \
+    wxSize CLASS::CBNAME() {                                                    \
+        wxSize rval(0,0);                                                       \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME)) {                                   \
+            PyObject* ro;                                                       \
+            wxSize*   ptr;                                                      \
+            ro = m_myInst.callCallbackObj(Py_BuildValue("()"));                 \
+            if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p"))               \
+                rval = *ptr;                                                    \
+        }                                                                       \
+        wxPySaveThread(doSave);                                                 \
+        return rval;                                                            \
+    }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_BOOL_WXWIN(CBNAME)                      \
+    bool CBNAME(wxWindow* a);                                  \
+    bool base_##CBNAME(wxWindow* a);
+
+
+#define IMP_PYCALLBACK_BOOL_WXWIN(CLASS, PCLASS, CBNAME)                \
+    bool CLASS::CBNAME(wxWindow* a) {                                   \
+        bool rval;                                                      \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            m_myInst.callCallback(Py_BuildValue("(Odddd)",              \
-                                   wxPyConstructObject(&a, "wxDC"),      \
-                                                     b, c, d, e));      \
+            rval = m_myInst.callCallback(Py_BuildValue("(O)",           \
+                            wxPyConstructObject((void*)a,"wxWindow"))); \

         else                                                            \
         else                                                            \

-            PCLASS::CBNAME(a, b, c, d, e);                              \
+            rval = PCLASS::CBNAME(a);                                   \
+        wxPySaveThread(doSave);                                         \
+        return rval;                                                    \

     }                                                                   \
     }                                                                   \

-    void base_##CBNAME(wxDC& a, double b, double c, double d, double e) {\
-        PCLASS::CBNAME(a, b, c, d, e);                                  \
+    bool CLASS::base_##CBNAME(wxWindow* a) {                            \
+        return PCLASS::CBNAME(a);                                       \

     }
 
 //---------------------------------------------------------------------------
 
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__DCBOOL(PCLASS, CBNAME)                              \
-    void CBNAME(wxDC& a, bool b) {                                      \
+#define DEC_PYCALLBACK_BOOL_(CBNAME)                      \
+    bool CBNAME();                                        \
+    bool base_##CBNAME();
+
+
+#define IMP_PYCALLBACK_BOOL_(CLASS, PCLASS, CBNAME)                     \
+    bool CLASS::CBNAME() {                                              \
+        bool rval;                                                      \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            m_myInst.callCallback(Py_BuildValue("(Oi)",                 \
-                                   wxPyConstructObject(&a, "wxDC"),      \
-                                                     (int)b));          \
+            rval = m_myInst.callCallback(Py_BuildValue("()"));          \

         else                                                            \
         else                                                            \

-            PCLASS::CBNAME(a, b);                                       \
+            rval = PCLASS::CBNAME();                                    \
+        wxPySaveThread(doSave);                                         \
+        return rval;                                                    \

     }                                                                   \
     }                                                                   \

-    void base_##CBNAME(wxDC& a, bool b) {                               \
-        PCLASS::CBNAME(a, b);                                           \
+    bool CLASS::base_##CBNAME() {                                       \
+        return PCLASS::CBNAME();                                        \

     }
 
 //---------------------------------------------------------------------------
 
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__WXCPBOOL2DBL2INT(PCLASS, CBNAME)                    \
-    void CBNAME(wxControlPoint* a, bool b, double c, double d,          \
-                int e, int f) {                                         \
+#define DEC_PYCALLBACK_DR_2WXCDR(CBNAME)                 \
+    wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def);    \
+    wxDragResult base_##CBNAME(wxCoord x, wxCoord y, wxDragResult def);
+
+
+#define IMP_PYCALLBACK_DR_2WXCDR(CLASS, PCLASS, CBNAME)                 \
+    wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {  \
+        bool doSave = wxPyRestoreThread();                              \
+        int rval;                                                       \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            m_myInst.callCallback(Py_BuildValue("(Oiddii)",             \
-                                 wxPyConstructObject(a, "wxControlPoint"),\
-                                 (int)b, c, d, e, f));                  \
+            rval = m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));\

         else                                                            \
         else                                                            \

-            PCLASS::CBNAME(a, b, c, d, e, f);                           \
+            rval = PCLASS::CBNAME(a, b, c);                             \
+        wxPySaveThread(doSave);                                         \
+        return (wxDragResult)rval;                                      \

     }                                                                   \
     }                                                                   \

-    void base_##CBNAME(wxControlPoint* a, bool b, double c, double d,   \
-                       int e, int f) {                                  \
-        PCLASS::CBNAME(a, b, c, d, e, f);                               \
+    wxDragResult CLASS::base_##CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \
+        return PCLASS::CBNAME(a, b, c);                                       \

     }
 
 //---------------------------------------------------------------------------
 
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__WXCP2DBL2INT(PCLASS, CBNAME)                        \
-    void CBNAME(wxControlPoint* a, double b, double c, int d, int e) {  \
+#define DEC_PYCALLBACK_BOOL_DR(CBNAME)                  \
+    bool CBNAME(wxDragResult a);                        \
+    bool base_##CBNAME(wxDragResult a);
+
+
+#define IMP_PYCALLBACK_BOOL_DR(CLASS, PCLASS, CBNAME)                   \
+    bool CLASS::CBNAME(wxDragResult a) {                                \
+        bool doSave = wxPyRestoreThread();                              \
+        bool rval;                                                      \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            m_myInst.callCallback(Py_BuildValue("(Oddii)",              \
-                                 wxPyConstructObject(a, "wxControlPoint"),\
-                                 b, c, d, e));                          \
+            rval = m_myInst.callCallback(Py_BuildValue("(i)", a));      \

         else                                                            \
         else                                                            \

-            PCLASS::CBNAME(a, b, c, d, e);                              \
+            rval = PCLASS::CBNAME(a);                                   \
+        wxPySaveThread(doSave);                                         \
+        return rval;                                                    \

     }                                                                   \
     }                                                                   \

-    void base_##CBNAME(wxControlPoint* a, double b, double c,           \
-                       int d, int e) {                                  \
-        PCLASS::CBNAME(a, b, c, d, e);                                  \
+    bool CLASS::base_##CBNAME(wxDragResult a) {                         \
+        return PCLASS::CBNAME(a);                                       \

     }
 
 //---------------------------------------------------------------------------
 
     }
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__2DBLINT(PCLASS, CBNAME)                             \
-    void CBNAME(double a, double b, int c) {                            \
+#define DEC_PYCALLBACK_DR_2WXCDR_pure(CBNAME)   \
+    wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def);
+
+
+#define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME)            \
+    wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) {  \
+        bool doSave = wxPyRestoreThread();                              \
+        int rval;                                                       \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            m_myInst.callCallback(Py_BuildValue("(ddi)", a,b,c));       \
-        else                                                            \
-            PCLASS::CBNAME(a, b, c);                                    \
+            rval = m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));\
+        wxPySaveThread(doSave);                                         \
+        return (wxDragResult)rval;                                      \

     }                                                                   \
     }                                                                   \

-    void base_##CBNAME(double a, double b, int c) {                     \
-        PCLASS::CBNAME(a, b, c);                                        \
-    }

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-#define PYCALLBACK__BOOL2DBLINT(PCLASS, CBNAME)                         \
-    void CBNAME(bool a, double b, double c, int d) {                    \
+#define DEC_PYCALLBACK_BOOL_INTINTSTR_pure(CBNAME)                      \
+    bool CBNAME(int a, int b, const wxString& c);
+
+
+#define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME)       \
+    bool CLASS::CBNAME(int a, int b, const wxString& c) {               \
+        bool rval;                                                      \
+        bool doSave = wxPyRestoreThread();                              \

         if (m_myInst.findCallback(#CBNAME))                             \
         if (m_myInst.findCallback(#CBNAME))                             \

-            m_myInst.callCallback(Py_BuildValue("(iddi)", (int)a,b,c,d));\
-        else                                                            \
-            PCLASS::CBNAME(a, b, c, d);                                 \
+            rval = m_myInst.callCallback(Py_BuildValue("(iis)",a,b,c.c_str()));\
+        wxPySaveThread(doSave);                                         \
+        return rval;                                                    \

     }                                                                   \
     }                                                                   \

-    void base_##CBNAME(bool a, double b, double c, int d) {             \
-        PCLASS::CBNAME(a, b, c, d);                                     \
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_SIZET_(CBNAME)                  \
+    size_t CBNAME();                                   \
+    size_t base_##CBNAME();
+
+
+#define IMP_PYCALLBACK_SIZET_(CLASS, PCLASS, CBNAME)                            \
+    size_t CLASS::CBNAME() {                                                    \
+        size_t rval;                                                            \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME))                                     \
+            rval = m_myInst.callCallback(Py_BuildValue("()"));                  \
+        else                                                                    \
+            rval = PCLASS::CBNAME();                                            \
+        wxPySaveThread(doSave);                                                 \
+        return rval;                                                            \
+    }                                                                           \
+    size_t CLASS::base_##CBNAME() {                                             \
+        return PCLASS::CBNAME();                                                \

     }
 
 //---------------------------------------------------------------------------
     }
 
 //---------------------------------------------------------------------------

+
+#define DEC_PYCALLBACK_DATAFMT_SIZET(CBNAME)                  \
+    wxDataFormat  CBNAME();                                        \
+    wxDataFormat  base_##CBNAME();
+
+
+#define IMP_PYCALLBACK_DATAFMT_SIZET(CLASS, PCLASS, CBNAME)                     \
+    wxDataFormat CLASS::CBNAME(size_t a) {                                      \
+        wxDataFormat rval;                                                      \
+        bool doSave = wxPyRestoreThread();                                      \
+        if (m_myInst.findCallback(#CBNAME)) {                                   \
+            PyObject* ro;                                                       \
+            wxDataFormat* ptr;                                                  \
+            ro = m_myInst.callCallbackObj(Py_BuildValue("(i)", a));             \
+            if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxDataFormat_p"))         \
+                rval = *ptr;                                                    \
+        }                                                                       \
+        else                                                                    \
+            rval = PCLASS::CBNAME(a);                                           \
+        wxPySaveThread(doSave);                                                 \
+        return rval;                                                            \
+    }                                                                           \
+    wxDataFormat  CLASS::base_##CBNAME(size_t a) {                              \
+        return PCLASS::CBNAME(a);                                               \
+    }
+

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------


@@ -448,3 +963,4 @@ private:
 
 
 
 
 
 

+