simpler fix for rendering bug fixed in previous revision

[wxWidgets.git] / wxPython / src / grid.i
diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i

index 957de4beb52607f2a35677a5666d788205ce9789..ed7a4e4e8a26f07367f93e210e5d8dba6346ccd2 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -15,8 +15,9 @@
  #ifndef OLD_GRID
  
  %{
  #ifndef OLD_GRID
  
  %{
-#include "helpers.h"
+#include "wxPython.h"
  #include <wx/grid.h>
  #include <wx/grid.h>
+#include <wx/generic/gridctrl.h>
  %}
  
  //----------------------------------------------------------------------
  %}
  
  //----------------------------------------------------------------------
@@ -34,7 +35,60 @@
  
  %pragma(python) code = "import wx"
  
  
  %pragma(python) code = "import wx"
  
+//----------------------------------------------------------------------
+
+%{
+    // Put some wx default wxChar* values into wxStrings.
+    DECLARE_DEF_STRING(PanelNameStr);
+    DECLARE_DEF_STRING2(DateTimeFormatStr, wxT("%c"));
+    static const wxString wxPyEmptyString(wxT(""));
+%}
+
  //---------------------------------------------------------------------------
  //---------------------------------------------------------------------------
+// OOR related typemaps and helper functions
+
+%typemap(python, out) wxGridCellRenderer*     { $target = wxPyMake_wxGridCellRenderer($source); }
+%typemap(python, out) wxGridCellEditor*       { $target = wxPyMake_wxGridCellEditor($source); }
+%typemap(python, out) wxGridCellAttr*         { $target = wxPyMake_wxGridCellAttr($source); }
+%typemap(python, out) wxGridCellAttrProvider* { $target = wxPyMake_wxGridCellAttrProvider($source); }
+%typemap(python, out) wxGridTableBase*        { $target = wxPyMake_wxGridTableBase($source); }
+
+
+%{
+
+#define wxPyMake_TEMPLATE(TYPE) \
+PyObject* wxPyMake_##TYPE(TYPE* source) { \
+    PyObject* target = NULL; \
+    if (source) { \
+        /* Check if there is already a pointer to a Python object in the \
+           OOR data that we can use. */ \
+        wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \
+        if (data) { \
+            target = data->m_obj; \
+            Py_INCREF(target); \
+        } \
+        /* Otherwise make a new wrapper for it the old fashioned way and \
+           give it the OOR treatment */ \
+        if (! target) { \
+            target = wxPyConstructObject(source, #TYPE, FALSE); \
+            if (target) \
+                source->SetClientObject(new wxPyOORClientData(target)); \
+        } \
+    } else {  /* source was NULL so return None. */ \
+        Py_INCREF(Py_None); target = Py_None; \
+    } \
+    return target; \
+} \
+
+
+wxPyMake_TEMPLATE(wxGridCellRenderer)
+wxPyMake_TEMPLATE(wxGridCellEditor)
+wxPyMake_TEMPLATE(wxGridCellAttr)
+wxPyMake_TEMPLATE(wxGridCellAttrProvider)
+wxPyMake_TEMPLATE(wxGridTableBase)
+
+%}
+
  //---------------------------------------------------------------------------
  // Macros, similar to what's in helpers.h, to aid in the creation of
  // virtual methods that are able to make callbacks to Python.  Many of these
  //---------------------------------------------------------------------------
  // Macros, similar to what's in helpers.h, to aid in the creation of
  // virtual methods that are able to make callbacks to Python.  Many of these
@@ -43,377 +97,403 @@
  
  
  %{
  
  
  %{
-#define PYCALLBACK_GCA_INTINT(PCLASS, CBNAME)                           \
-    wxGridCellAttr* CBNAME(int a, int b) {                              \
-        wxGridCellAttr* rval = NULL;                                    \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* ro;                                               \
-            wxGridCellAttr* ptr;                                        \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)", a, b)); \
-            if (ro) {                                                   \
+#define PYCALLBACK_GCA_INTINTKIND(PCLASS, CBNAME)                               \
+    wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) {        \
+        wxGridCellAttr* rval = NULL;                                            \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            wxGridCellAttr* ptr;                                                \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \
+            if (ro) {                                                           \
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellAttr_p"))    \
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellAttr_p"))    \
-                    rval = ptr;                                         \
-                Py_DECREF(ro);                                          \
-            }                                                           \
-        }                                                               \
-        else                                                            \
-            rval = PCLASS::CBNAME(a, b);                                \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    wxGridCellAttr *base_##CBNAME(int a, int b) {                       \
-        return PCLASS::CBNAME(a, b);                                    \
+                    rval = ptr;                                                 \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a, b, c);                                     \
+        return rval;                                                            \
+    }                                                                           \
+    wxGridCellAttr *base_##CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \
+        return PCLASS::CBNAME(a, b, c);                                         \
      }
  
  
  
      }
  
  
  
-#define PYCALLBACK__GCAINTINT(PCLASS, CBNAME)                           \
-    void CBNAME(wxGridCellAttr *attr, int a, int b) {                   \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(                                      \
-                Py_BuildValue("(Oii)",                                  \
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr"),    \
-                              a, b));                                   \
-        else                                                            \
-            PCLASS::CBNAME(attr, a, b);                                 \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(wxGridCellAttr *attr, int a, int b) {            \
-        PCLASS::CBNAME(attr, a, b);                                     \
+#define PYCALLBACK__GCAINTINT(PCLASS, CBNAME)                                   \
+    void CBNAME(wxGridCellAttr *attr, int a, int b) {                           \
+        wxPyBeginBlockThreads();                                                \
+        bool found;                                                             \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* obj = wxPyMake_wxGridCellAttr(attr);                      \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b));  \
+            Py_DECREF(obj);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(attr, a, b);                                         \
+    }                                                                           \
+    void base_##CBNAME(wxGridCellAttr *attr, int a, int b) {                    \
+        PCLASS::CBNAME(attr, a, b);                                             \
      }
  
  
  
      }
  
  
  
-#define PYCALLBACK__GCAINT(PCLASS, CBNAME)                              \
-    void CBNAME(wxGridCellAttr *attr, int val) {                        \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(                                      \
-                Py_BuildValue("(Oi)",                                   \
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr"),    \
-                              val));                                    \
-        else                                                            \
-            PCLASS::CBNAME(attr, val);                                  \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(wxGridCellAttr *attr, int val) {                 \
-        PCLASS::CBNAME(attr, val);                                      \
+#define PYCALLBACK__GCAINT(PCLASS, CBNAME)                                      \
+    void CBNAME(wxGridCellAttr *attr, int val) {                                \
+        wxPyBeginBlockThreads();                                                \
+        bool found;                                                             \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* obj = wxPyMake_wxGridCellAttr(attr);                      \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val));    \
+            Py_DECREF(obj);                                                     \
+        }                                                                       \
+        wxPyEndBlockThreads();                                             \
+        if (! found)                                                            \
+            PCLASS::CBNAME(attr, val);                                          \
+    }                                                                           \
+    void base_##CBNAME(wxGridCellAttr *attr, int val) {                         \
+        PCLASS::CBNAME(attr, val);                                              \
      }
  
  
  
      }
  
  
  
-#define PYCALLBACK_INT__pure(CBNAME)                                    \
-    int  CBNAME() {                                                     \
-        bool doSave = wxPyRestoreThread();                              \
-        int rval = 0;                                                   \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("()"));          \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
+#define PYCALLBACK_INT__pure(CBNAME)                                            \
+    int  CBNAME() {                                                             \
+        wxPyBeginBlockThreads();                            \
+        int rval = 0;                                                           \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
+        wxPyEndBlockThreads();                                             \
+        return rval;                                                            \
      }
  
  
  
      }
  
  
  
-#define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                             \
-    bool CBNAME(int a, int b) {                                         \
-        bool doSave = wxPyRestoreThread();                              \
-        bool rval = 0;                                                  \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(ii)",a,b));    \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
+#define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                                     \
+    bool CBNAME(int a, int b) {                                                 \
+        wxPyBeginBlockThreads();                            \
+        bool rval = 0;                                                          \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));   \
+        wxPyEndBlockThreads();                                             \
+        return rval;                                                            \
      }
  
  
      }
  
  
-
-#define PYCALLBACK_STRING_INTINT_pure(CBNAME)                           \
-    wxString CBNAME(int a, int b) {                                     \
-        bool doSave = wxPyRestoreThread();                              \
-        wxString rval;                                                  \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)",a,b));   \
-            if (ro) {                                                   \
-                rval = PyString_AsString(PyObject_Str(ro));             \
-                Py_DECREF(ro);                                          \
-            }                                                           \
-        }                                                               \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
+#define PYCALLBACK_STRING_INTINT_pure(CBNAME)                                   \
+    wxString CBNAME(int a, int b) {                                             \
+        wxPyBeginBlockThreads();                                                \
+        wxString rval;                                                          \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b));  \
+            if (ro) {                                                           \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        return rval;                                                            \
      }
  
  
      }
  
  
-
-#define PYCALLBACK__INTINTSTRING_pure(CBNAME)                           \
-    void CBNAME(int a, int b, const wxString& c) {                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(iis)",a,b,c.c_str()));    \
-        wxPySaveThread(doSave);                                         \
+#define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
+    void CBNAME(int a, int b, const wxString& c) {                              \
+        wxPyBeginBlockThreads();                                                \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
+            PyObject* s = wx2PyString(c);                                       \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
+            Py_DECREF(s);                                                       \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
      }
  
  
      }
  
  
-#define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME)                        \
-    wxString CBNAME(int a, int b) {                                     \
-        bool doSave = wxPyRestoreThread();                              \
-        wxString rval;                                                  \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)",a,b));   \
-            if (ro) {                                                   \
-                rval = PyString_AsString(PyObject_Str(ro));             \
-                Py_DECREF(ro);                                          \
-            }                                                           \
-        } else                                                          \
-            rval = PCLASS::CBNAME(a, b);                                \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    wxString base_##CBNAME(int a, int b) {                              \
-        return PCLASS::CBNAME(a, b);                                    \
+#define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME)                                \
+    wxString CBNAME(int a, int b) {                                             \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        wxString rval;                                                          \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b));  \
+            if (ro) {                                                           \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a, b);                                        \
+        return rval;                                                            \
+    }                                                                           \
+    wxString base_##CBNAME(int a, int b) {                                      \
+        return PCLASS::CBNAME(a, b);                                            \
      }
  
  
      }
  
  
-
-#define PYCALLBACK_BOOL_INTINTSTRING(PCLASS, CBNAME)                    \
-    bool CBNAME(int a, int b, const wxString& c)  {                     \
-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(iis)", a,b,c.c_str()));   \
-        else                                                            \
-            rval = PCLASS::CBNAME(a,b,c);                               \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool base_##CBNAME(int a, int b, const wxString& c) {               \
-        return PCLASS::CBNAME(a,b,c);                                   \
+#define PYCALLBACK_BOOL_INTINTSTRING(PCLASS, CBNAME)                            \
+    bool CBNAME(int a, int b, const wxString& c)  {                             \
+        bool rval = 0;                                                          \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* s = wx2PyString(c);                                       \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
+            Py_DECREF(s);                                                       \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a,b,c);                                       \
+        return rval;                                                            \
+    }                                                                           \
+    bool base_##CBNAME(int a, int b, const wxString& c) {                       \
+        return PCLASS::CBNAME(a,b,c);                                           \
      }
  
  
  
  
      }
  
  
  
  
-#define PYCALLBACK_LONG_INTINT(PCLASS, CBNAME)                          \
-    long CBNAME(int a, int b)  {                                        \
-        long rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(ii)", a,b));   \
-        else                                                            \
-            rval = PCLASS::CBNAME(a,b);                                 \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    long base_##CBNAME(int a, int b) {                                  \
-        return PCLASS::CBNAME(a,b);                                     \
+#define PYCALLBACK_LONG_INTINT(PCLASS, CBNAME)                                  \
+    long CBNAME(int a, int b)  {                                                \
+        long rval;                                                              \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
+        wxPyEndBlockThreads();                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a,b);                                         \
+        return rval;                                                            \
+    }                                                                           \
+    long base_##CBNAME(int a, int b) {                                          \
+        return PCLASS::CBNAME(a,b);                                             \
      }
  
  
  
      }
  
  
  
-#define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME)                          \
-    bool CBNAME(int a, int b)  {                                        \
-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(ii)", a,b));   \
-        else                                                            \
-            rval = PCLASS::CBNAME(a,b);                                 \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool base_##CBNAME(int a, int b) {                                  \
-        return PCLASS::CBNAME(a,b);                                     \
+#define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME)                                  \
+    bool CBNAME(int a, int b)  {                                                \
+        bool rval = 0;                                                          \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
+        wxPyEndBlockThreads();                                             \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a,b);                                         \
+        return rval;                                                            \
+    }                                                                           \
+    bool base_##CBNAME(int a, int b) {                                          \
+        return PCLASS::CBNAME(a,b);                                             \
      }
  
  
  
      }
  
  
  
-#define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME)                        \
-    double CBNAME(int a, int b) {                                       \
-        bool doSave = wxPyRestoreThread();                              \
-        double rval;                                                    \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)",a,b));   \
-            if (ro) {                                                   \
-                rval = PyFloat_AsDouble(PyObject_Str(ro));              \
-                Py_DECREF(ro);                                          \
-            }                                                           \
-        } else                                                          \
-            rval = PCLASS::CBNAME(a, b);                                \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    double base_##CBNAME(int a, int b) {                                \
-        return PCLASS::CBNAME(a, b);                                    \
+#define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME)                                \
+    double CBNAME(int a, int b) {                                               \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                            \
+        double rval;                                                            \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b));  \
+            if (ro) {                                                           \
+                PyObject* str = PyObject_Str(ro);                               \
+                rval = PyFloat_AsDouble(str);                                   \
+                Py_DECREF(ro);   Py_DECREF(str);                                \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a, b);                                        \
+        return rval;                                                            \
+    }                                                                           \
+    double base_##CBNAME(int a, int b) {                                        \
+        return PCLASS::CBNAME(a, b);                                            \
      }
  
  
  
      }
  
  
  
-#define PYCALLBACK__(PCLASS, CBNAME)                                    \
-    void CBNAME()  {                                                    \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("()"));                 \
-        else                                                            \
-            PCLASS::CBNAME();                                           \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME() {                                              \
-        PCLASS::CBNAME();                                               \
+#define PYCALLBACK__(PCLASS, CBNAME)                                            \
+    void CBNAME()  {                                                            \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME();                                                   \
+    }                                                                           \
+    void base_##CBNAME() {                                                      \
+        PCLASS::CBNAME();                                                       \
      }
  
  
  
  
      }
  
  
  
  
-#define PYCALLBACK_BOOL_SIZETSIZET(PCLASS, CBNAME)                      \
-    bool CBNAME(size_t a, size_t b)  {                                  \
-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(ii)", a,b));   \
-        else                                                            \
-            rval = PCLASS::CBNAME(a,b);                                 \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool base_##CBNAME(size_t a, size_t b) {                            \
-        return PCLASS::CBNAME(a,b);                                     \
+#define PYCALLBACK_BOOL_SIZETSIZET(PCLASS, CBNAME)                              \
+    bool CBNAME(size_t a, size_t b)  {                                          \
+        bool rval = 0;                                                          \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a,b);                                         \
+        return rval;                                                            \
+    }                                                                           \
+    bool base_##CBNAME(size_t a, size_t b) {                                    \
+        return PCLASS::CBNAME(a,b);                                             \
      }
  
  
  
      }
  
  
  
-#define PYCALLBACK_BOOL_SIZET(PCLASS, CBNAME)                           \
-    bool CBNAME(size_t a)  {                                            \
-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("(i)", a));      \
-        else                                                            \
-            rval = PCLASS::CBNAME(a);                                   \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool base_##CBNAME(size_t a) {                                      \
-        return PCLASS::CBNAME(a);                                       \
+#define PYCALLBACK_BOOL_SIZET(PCLASS, CBNAME)                                   \
+    bool CBNAME(size_t a)  {                                                    \
+        bool rval = 0;                                                          \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));     \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a);                                           \
+        return rval;                                                            \
+    }                                                                           \
+    bool base_##CBNAME(size_t a) {                                              \
+        return PCLASS::CBNAME(a);                                               \
      }
  
  
      }
  
  
-
-#define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                           \
-    wxString CBNAME(int a) {                                            \
-        bool doSave = wxPyRestoreThread();                              \
-        wxString rval;                                                  \
-        if (m_myInst.findCallback(#CBNAME)) {                           \
-            PyObject* ro;                                               \
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(i)",a));      \
-            if (ro) {                                                   \
-                rval = PyString_AsString(PyObject_Str(ro));             \
-                Py_DECREF(ro);                                          \
-            }                                                           \
-        } else                                                          \
-            rval = PCLASS::CBNAME(a);                                   \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    wxString base_##CBNAME(int a) {                                     \
-        return PCLASS::CBNAME(a);                                       \
+#define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                                   \
+    wxString CBNAME(int a) {                                                    \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        wxString rval;                                                          \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* ro;                                                       \
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)",a));     \
+            if (ro) {                                                           \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \
+            }                                                                   \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME(a);                                           \
+        return rval;                                                            \
+    }                                                                           \
+    wxString base_##CBNAME(int a) {                                             \
+        return PCLASS::CBNAME(a);                                               \
      }
  
  
      }
  
  
-
-#define PYCALLBACK__INTSTRING(PCLASS, CBNAME)                           \
-    void CBNAME(int a, const wxString& c)  {                            \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(is)", a,c.c_str()));  \
-        else                                                            \
-            PCLASS::CBNAME(a,c);                                        \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(int a, const wxString& c) {                      \
-        PCLASS::CBNAME(a,c);                                            \
+#define PYCALLBACK__INTSTRING(PCLASS, CBNAME)                                   \
+    void CBNAME(int a, const wxString& c)  {                                    \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
+            PyObject* s = wx2PyString(c);                                       \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s));          \
+            Py_DECREF(s);                                                       \
+        }                                                                       \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a,c);                                                \
+    }                                                                           \
+    void base_##CBNAME(int a, const wxString& c) {                              \
+        PCLASS::CBNAME(a,c);                                                    \
      }
  
  
  
  
      }
  
  
  
  
-#define PYCALLBACK_BOOL_(PCLASS, CBNAME)                                \
-    bool CBNAME()  {                                                    \
-        bool rval;                                                      \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            rval = m_myInst.callCallback(Py_BuildValue("()"));          \
-        else                                                            \
-            rval = PCLASS::CBNAME();                                    \
-        wxPySaveThread(doSave);                                         \
-        return rval;                                                    \
-    }                                                                   \
-    bool base_##CBNAME() {                                              \
-        return PCLASS::CBNAME();                                        \
+#define PYCALLBACK_BOOL_(PCLASS, CBNAME)                                        \
+    bool CBNAME()  {                                                            \
+        bool rval = 0;                                                          \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            rval = PCLASS::CBNAME();                                            \
+        return rval;                                                            \
+    }                                                                           \
+    bool base_##CBNAME() {                                                      \
+        return PCLASS::CBNAME();                                                \
      }
  
  
  
      }
  
  
  
-#define PYCALLBACK__SIZETINT(PCLASS, CBNAME)                            \
-    void CBNAME(size_t a, int b)  {                                     \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(ii)", a,b));          \
-        else                                                            \
-            PCLASS::CBNAME(a,b);                                        \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(size_t a, int b) {                               \
-        PCLASS::CBNAME(a,b);                                            \
+#define PYCALLBACK__SIZETINT(PCLASS, CBNAME)                                    \
+    void CBNAME(size_t a, int b)  {                                             \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));         \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a,b);                                                \
+    }                                                                           \
+    void base_##CBNAME(size_t a, int b) {                                       \
+        PCLASS::CBNAME(a,b);                                                    \
      }
  
  
  
  
      }
  
  
  
  
-#define PYCALLBACK__INTINTLONG(PCLASS, CBNAME)                          \
-    void CBNAME(int a, int b, long c)  {                                \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));       \
-        else                                                            \
-            PCLASS::CBNAME(a,b,c);                                      \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(int a, int b, long c) {                          \
-        PCLASS::CBNAME(a,b,c);                                          \
+#define PYCALLBACK__INTINTLONG(PCLASS, CBNAME)                                  \
+    void CBNAME(int a, int b, long c)  {                                        \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a,b,c);                                              \
+    }                                                                           \
+    void base_##CBNAME(int a, int b, long c) {                                  \
+        PCLASS::CBNAME(a,b,c);                                                  \
      }
  
  
  
  
      }
  
  
  
  
-#define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME)                        \
-    void CBNAME(int a, int b, double c)  {                              \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(iif)", a,b,c));       \
-        else                                                            \
-            PCLASS::CBNAME(a,b,c);                                      \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(int a, int b, double c) {                        \
-        PCLASS::CBNAME(a,b,c);                                          \
+#define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME)                                \
+    void CBNAME(int a, int b, double c)  {                                      \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c));      \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a,b,c);                                              \
+    }                                                                           \
+    void base_##CBNAME(int a, int b, double c) {                                \
+        PCLASS::CBNAME(a,b,c);                                                  \
      }
  
  
  
      }
  
  
  
-#define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME)                          \
-    void CBNAME(int a, int b, bool c)  {                                \
-        bool doSave = wxPyRestoreThread();                              \
-        if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));       \
-        else                                                            \
-            PCLASS::CBNAME(a,b,c);                                      \
-        wxPySaveThread(doSave);                                         \
-    }                                                                   \
-    void base_##CBNAME(int a, int b, bool c) {                          \
-        PCLASS::CBNAME(a,b,c);                                          \
+#define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME)                                  \
+    void CBNAME(int a, int b, bool c)  {                                        \
+        bool found;                                                             \
+        wxPyBeginBlockThreads();                                                \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
+        wxPyEndBlockThreads();                                                  \
+        if (! found)                                                            \
+            PCLASS::CBNAME(a,b,c);                                              \
+    }                                                                           \
+    void base_##CBNAME(int a, int b, bool c) {                                  \
+        PCLASS::CBNAME(a,b,c);                                                  \
      }
  
  
      }
  
  
@@ -426,8 +506,6 @@
  class wxGridCellCoords;
  class wxGridCellAttr;
  
  class wxGridCellCoords;
  class wxGridCellAttr;
  
-
-
  #define wxGRID_VALUE_STRING     "string"
  #define wxGRID_VALUE_BOOL       "bool"
  #define wxGRID_VALUE_NUMBER     "long"
  #define wxGRID_VALUE_STRING     "string"
  #define wxGRID_VALUE_BOOL       "bool"
  #define wxGRID_VALUE_NUMBER     "long"
@@ -435,6 +513,9 @@ class wxGridCellAttr;
  #define wxGRID_VALUE_CHOICE     "choice"
  #define wxGRID_VALUE_TEXT       "string"
  #define wxGRID_VALUE_LONG       "long"
  #define wxGRID_VALUE_CHOICE     "choice"
  #define wxGRID_VALUE_TEXT       "string"
  #define wxGRID_VALUE_LONG       "long"
+#define wxGRID_VALUE_CHOICEINT  "choiceint"
+#define wxGRID_VALUE_DATETIME   "datetime"
+
  
  %readonly
  wxGridCellCoords wxGridNoCellCoords;
  
  %readonly
  wxGridCellCoords wxGridNoCellCoords;
@@ -450,6 +531,12 @@ wxRect           wxGridNoCellRect;
  class wxGridCellRenderer
  {
  public:
  class wxGridCellRenderer
  {
  public:
+    %addmethods {
+        void _setOORInfo(PyObject* _self) {
+            self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }
+
      void SetParameters(const wxString& params);
      void IncRef();
      void DecRef();
      void SetParameters(const wxString& params);
      void IncRef();
      void DecRef();
@@ -479,57 +566,81 @@ public:
      void Draw(wxGrid& grid, wxGridCellAttr& attr,
                wxDC& dc, const wxRect& rect,
                int row, int col, bool isSelected) {
      void Draw(wxGrid& grid, wxGridCellAttr& attr,
                wxDC& dc, const wxRect& rect,
                int row, int col, bool isSelected) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Draw")) {
-            m_myInst.callCallback(
-                Py_BuildValue("(OOOOiii)",
-                              wxPyConstructObject((void*)&grid, "wxGrid"),
-                              wxPyConstructObject((void*)&attr, "wxGridCellAttr"),
-                              wxPyConstructObject((void*)&dc,   "wxDC"),
-                              wxPyConstructObject((void*)&rect, "wxRect"),
-                              row, col, isSelected));
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "Draw")) {
+            PyObject* go = wxPyMake_wxObject(&grid);
+            PyObject* dco = wxPyMake_wxObject(&dc);
+            PyObject* ao = wxPyMake_wxGridCellAttr(&attr);
+            PyObject* ro = wxPyConstructObject((void*)&rect, "wxRect", 0);
+
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOiii)", go, ao, dco, ro,
+                                                         row, col, isSelected));
+            Py_DECREF(go);
+            Py_DECREF(ao);
+            Py_DECREF(dco);
+            Py_DECREF(ro);
          }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
      }
  
      wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
                         int row, int col) {
          wxSize rval;
      }
  
      wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
                         int row, int col) {
          wxSize rval;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("GetBestSize")) {
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
              PyObject* ro;
              wxSize*   ptr;
              PyObject* ro;
              wxSize*   ptr;
-            ro = m_myInst.callCallbackObj(
-                Py_BuildValue("(OOOii)",
-                              wxPyConstructObject((void*)&grid, "wxGrid"),
-                              wxPyConstructObject((void*)&attr, "wxGridCellAttr"),
-                              wxPyConstructObject((void*)&dc,   "wxDC"),
-                              row, col));
+            PyObject* go = wxPyMake_wxObject(&grid);
+            PyObject* dco = wxPyMake_wxObject(&dc);
+            PyObject* ao = wxPyMake_wxGridCellAttr(&attr);
+
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOOii)",
+                                                                 go, ao, dco,
+                                                                 row, col));
+            Py_DECREF(go);
+            Py_DECREF(ao);
+            Py_DECREF(dco);
+
              if (ro) {
              if (ro) {
-                if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p"))
+                const char* errmsg = "GetBestSize should return a 2-tuple of integers or a wxSize object.";
+                if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p")) {
                      rval = *ptr;
                      rval = *ptr;
+                }
+                else if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
+                    PyObject* o1 = PySequence_GetItem(ro, 0);
+                    PyObject* o2 = PySequence_GetItem(ro, 1);
+                    if (PyNumber_Check(o1) && PyNumber_Check(o2))
+                        rval = wxSize(PyInt_AsLong(o1), PyInt_AsLong(o2));
+                    else
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    Py_DECREF(o1);
+                    Py_DECREF(o2);
+                }
+                else {
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                }
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
          return rval;
      }
  
  
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
          return rval;
      }
  
  
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Clone")) {
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellRenderer* ptr;
              PyObject* ro;
              wxGridCellRenderer* ptr;
-            ro = m_myInst.callCallbackObj(Py_BuildValue("()"));
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellRenderer_p"))
                      rval = ptr;
                  Py_DECREF(ro);
              }
          }
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellRenderer_p"))
                      rval = ptr;
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
          return rval;
      }
  
          return rval;
      }
  
@@ -547,8 +658,9 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters)
  class wxPyGridCellRenderer : public wxGridCellRenderer {
  public:
      wxPyGridCellRenderer();
  class wxPyGridCellRenderer : public wxGridCellRenderer {
  public:
      wxPyGridCellRenderer();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridCellRenderer)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellRenderer)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  
      void base_SetParameters(const wxString& params);
  };
  
      void base_SetParameters(const wxString& params);
  };
@@ -560,6 +672,7 @@ class wxGridCellStringRenderer : public wxGridCellRenderer
  {
  public:
      wxGridCellStringRenderer();
  {
  public:
      wxGridCellStringRenderer();
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  };
  
  
  };
  
  
@@ -567,6 +680,7 @@ class  wxGridCellNumberRenderer : public wxGridCellStringRenderer
  {
  public:
      wxGridCellNumberRenderer();
  {
  public:
      wxGridCellNumberRenderer();
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  };
  
  
  };
  
  
@@ -574,6 +688,7 @@ class  wxGridCellFloatRenderer : public wxGridCellStringRenderer
  {
  public:
      wxGridCellFloatRenderer(int width = -1, int precision = -1);
  {
  public:
      wxGridCellFloatRenderer(int width = -1, int precision = -1);
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  
      int GetWidth() const;
      void SetWidth(int width);
  
      int GetWidth() const;
      void SetWidth(int width);
@@ -586,9 +701,34 @@ class  wxGridCellBoolRenderer : public wxGridCellRenderer
  {
  public:
      wxGridCellBoolRenderer();
  {
  public:
      wxGridCellBoolRenderer();
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+};
+
+
+class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
+{
+public:
+    wxGridCellDateTimeRenderer(wxString outformat = wxPyDateTimeFormatStr,
+                               wxString informat =  wxPyDateTimeFormatStr);
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  };
  
  
  };
  
  
+class wxGridCellEnumRenderer : public wxGridCellStringRenderer
+{
+public:
+    wxGridCellEnumRenderer( const wxString& choices = wxPyEmptyString );
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+};
+
+
+class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
+{
+public:
+    wxGridCellAutoWrapStringRenderer();
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+};
+
  
  //---------------------------------------------------------------------------
  // wxGridCellEditor is an ABC, and several derived classes are available.
  
  //---------------------------------------------------------------------------
  // wxGridCellEditor is an ABC, and several derived classes are available.
@@ -597,6 +737,12 @@ public:
  class  wxGridCellEditor
  {
  public:
  class  wxGridCellEditor
  {
  public:
+    %addmethods {
+        void _setOORInfo(PyObject* _self) {
+            self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }
+
      bool IsCreated();
      wxControl* GetControl();
      void SetControl(wxControl* control);
      bool IsCreated();
      wxControl* GetControl();
      void SetControl(wxControl* control);
@@ -633,69 +779,72 @@ public:
      wxPyGridCellEditor() : wxGridCellEditor() {}
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
      wxPyGridCellEditor() : wxGridCellEditor() {}
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Create")) {
-            m_myInst.callCallback(
-                Py_BuildValue("(OiO)",
-                              wxPyConstructObject((void*)parent, "wxWindow"),
-                              id,
-                              wxPyConstructObject((void*)evtHandler, "wxEvtHandler")));
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "Create")) {
+            PyObject* po = wxPyMake_wxObject(parent);
+            PyObject* eo = wxPyMake_wxObject(evtHandler);
+
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiO)", po, id, eo));
+            Py_DECREF(po);
+            Py_DECREF(eo);
          }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
      }
  
  
      void BeginEdit(int row, int col, wxGrid* grid) {
      }
  
  
      void BeginEdit(int row, int col, wxGrid* grid) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("BeginEdit")) {
-            m_myInst.callCallback(
-                Py_BuildValue("(iiO)", row, col,
-                              wxPyConstructObject((void*)grid, "wxGrid")));
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
+            PyObject* go = wxPyMake_wxObject(grid);
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
+            Py_DECREF(go);
          }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
      }
  
  
      bool EndEdit(int row, int col, wxGrid* grid) {
          bool rv = FALSE;
      }
  
  
      bool EndEdit(int row, int col, wxGrid* grid) {
          bool rv = FALSE;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("EndEdit")) {
-            rv = m_myInst.callCallback(
-                Py_BuildValue("(iiO)", row, col,
-                              wxPyConstructObject((void*)grid, "wxGrid")));
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
+            PyObject* go = wxPyMake_wxObject(grid);
+            rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
+            Py_DECREF(go);
          }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
          return rv;
      }
  
  
          return rv;
      }
  
  
-    wxGridCellEditor *Clone() const {
+    wxGridCellEditor*Clone() const {
          wxGridCellEditor* rval = NULL;
          wxGridCellEditor* rval = NULL;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Clone")) {
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellEditor* ptr;
              PyObject* ro;
              wxGridCellEditor* ptr;
-            ro = m_myInst.callCallbackObj(Py_BuildValue("()"));
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellEditor_p"))
                      rval = ptr;
                  Py_DECREF(ro);
              }
          }
              if (ro) {
                  if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellEditor_p"))
                      rval = ptr;
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
          return rval;
      }
  
  
      void Show(bool show, wxGridCellAttr *attr) {
          return rval;
      }
  
  
      void Show(bool show, wxGridCellAttr *attr) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("Show"))
-            m_myInst.callCallback(
-                Py_BuildValue("(iO)", show,
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr")));
-        else
+        bool found;
+        wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) {
+            PyObject* ao = wxPyMake_wxGridCellAttr(attr);
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao));
+            Py_DECREF(ao);
+        }
+        wxPyEndBlockThreads();
+        if (! found)
              wxGridCellEditor::Show(show, attr);
              wxGridCellEditor::Show(show, attr);
-        wxPySaveThread(doSave);
      }
      void base_Show(bool show, wxGridCellAttr *attr) {
          wxGridCellEditor::Show(show, attr);
      }
      void base_Show(bool show, wxGridCellAttr *attr) {
          wxGridCellEditor::Show(show, attr);
@@ -703,15 +852,20 @@ public:
  
  
      void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
  
  
      void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("PaintBackground"))
-            m_myInst.callCallback(
-                Py_BuildValue("(OO)",
-                              wxPyConstructObject((void*)&rectCell, "wxRect"),
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr")));
-        else
+        bool found;
+        wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
+            PyObject* ao = wxPyMake_wxGridCellAttr(attr);
+            PyObject* ro = wxPyConstructObject((void*)&rectCell, "wxRect", 0);
+
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", ro, ao));
+
+            Py_DECREF(ro);
+            Py_DECREF(ao);
+        }
+        wxPyEndBlockThreads();
+        if (! found)
              wxGridCellEditor::PaintBackground(rectCell, attr);
              wxGridCellEditor::PaintBackground(rectCell, attr);
-        wxPySaveThread(doSave);
      }
      void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
          wxGridCellEditor::PaintBackground(rectCell, attr);
      }
      void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
          wxGridCellEditor::PaintBackground(rectCell, attr);
@@ -747,12 +901,14 @@ IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, Destroy);
  class wxPyGridCellEditor : public wxGridCellEditor {
  public:
      wxPyGridCellEditor();
  class wxPyGridCellEditor : public wxGridCellEditor {
  public:
      wxPyGridCellEditor();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridCellEditor)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellEditor)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  
      void base_SetSize(const wxRect& rect);
      void base_Show(bool show, wxGridCellAttr *attr = NULL);
      void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
  
      void base_SetSize(const wxRect& rect);
      void base_Show(bool show, wxGridCellAttr *attr = NULL);
      void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
+    void base_IsAcceptedKey(wxKeyEvent& event);
      void base_StartingKey(wxKeyEvent& event);
      void base_StartingClick();
      void base_HandleReturn(wxKeyEvent& event);
      void base_StartingKey(wxKeyEvent& event);
      void base_StartingClick();
      void base_HandleReturn(wxKeyEvent& event);
@@ -767,6 +923,7 @@ class wxGridCellTextEditor : public wxGridCellEditor
  {
  public:
      wxGridCellTextEditor();
  {
  public:
      wxGridCellTextEditor();
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  };
  
  
  };
  
  
@@ -774,6 +931,7 @@ class wxGridCellNumberEditor : public wxGridCellTextEditor
  {
  public:
      wxGridCellNumberEditor(int min = -1, int max = -1);
  {
  public:
      wxGridCellNumberEditor(int min = -1, int max = -1);
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  };
  
  
  };
  
  
@@ -781,6 +939,7 @@ class wxGridCellFloatEditor : public wxGridCellTextEditor
  {
  public:
      wxGridCellFloatEditor();
  {
  public:
      wxGridCellFloatEditor();
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  };
  
  
  };
  
  
@@ -788,6 +947,7 @@ class wxGridCellBoolEditor : public wxGridCellEditor
  {
  public:
      wxGridCellBoolEditor();
  {
  public:
      wxGridCellBoolEditor();
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  };
  
  class wxGridCellChoiceEditor : public wxGridCellEditor
  };
  
  class wxGridCellChoiceEditor : public wxGridCellEditor
@@ -796,44 +956,67 @@ public:
      wxGridCellChoiceEditor(int LCOUNT = 0,
                             const wxString* choices = NULL,
                             bool allowOthers = FALSE);
      wxGridCellChoiceEditor(int LCOUNT = 0,
                             const wxString* choices = NULL,
                             bool allowOthers = FALSE);
-#ifdef PRE2115
-    %addmethods {
-        wxGridCellChoiceEditor(PyObject* choices,
-                                bool allowOthers = FALSE) {
-
-            const char** temp = string_LIST_helper(choices);
-            if (temp) {
-                int count = PyList_Size(choices);
-                wxGridCellChoiceEditor* ret;
-                ret = new wxGridCellChoiceEditor(count, temp, allowOthers);
-                delete [] temp;
-                return ret;
-            }
-            return NULL;
-        }
-    }
-#endif
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+};
+
+
+class wxGridCellEnumEditor : public wxGridCellChoiceEditor
+{
+public:
+    wxGridCellEnumEditor( const wxString& choices = wxPyEmptyString );
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+};
+
+
+class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
+{
+public:
+    wxGridCellAutoWrapStringEditor();
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  };
  
  };
  
+
+
  //---------------------------------------------------------------------------
  
  
  class wxGridCellAttr
  {
  public:
  //---------------------------------------------------------------------------
  
  
  class wxGridCellAttr
  {
  public:
-    wxGridCellAttr();
+    enum wxAttrKind
+    {
+        Any,
+        Default,
+        Cell,
+        Row,
+        Col,
+        Merged
+    };
+
+    %addmethods {
+        void _setOORInfo(PyObject* _self) {
+            self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }
+
+    wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  
      wxGridCellAttr *Clone() const;
  
      wxGridCellAttr *Clone() const;
+    void MergeWith(wxGridCellAttr *mergefrom);
      void IncRef();
      void DecRef();
      void SetTextColour(const wxColour& colText);
      void SetBackgroundColour(const wxColour& colBack);
      void SetFont(const wxFont& font);
      void SetAlignment(int hAlign, int vAlign);
      void IncRef();
      void DecRef();
      void SetTextColour(const wxColour& colText);
      void SetBackgroundColour(const wxColour& colBack);
      void SetFont(const wxFont& font);
      void SetAlignment(int hAlign, int vAlign);
+    void SetSize(int num_rows, int num_cols);
+    void SetOverflow( bool allow );
      void SetReadOnly(bool isReadOnly = TRUE);
  
      void SetRenderer(wxGridCellRenderer *renderer);
      void SetEditor(wxGridCellEditor* editor);
      void SetReadOnly(bool isReadOnly = TRUE);
  
      void SetRenderer(wxGridCellRenderer *renderer);
      void SetEditor(wxGridCellEditor* editor);
+    void SetKind(wxAttrKind kind);
  
      bool HasTextColour() const;
      bool HasBackgroundColour() const;
  
      bool HasTextColour() const;
      bool HasBackgroundColour() const;
@@ -841,11 +1024,14 @@ public:
      bool HasAlignment() const;
      bool HasRenderer() const;
      bool HasEditor() const;
      bool HasAlignment() const;
      bool HasRenderer() const;
      bool HasEditor() const;
+    bool HasReadWriteMode() const;
  
  
-    const wxColour& GetTextColour() const;
-    const wxColour& GetBackgroundColour() const;
-    const wxFont& GetFont() const;
+    wxColour GetTextColour() const;
+    wxColour GetBackgroundColour() const;
+    wxFont GetFont() const;
      void GetAlignment(int *OUTPUT, int *OUTPUT) const;
      void GetAlignment(int *OUTPUT, int *OUTPUT) const;
+    void GetSize(int *num_rows, int *num_cols) const;
+    bool GetOverflow() const;
      wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
      wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
  
      wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
      wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
  
@@ -860,8 +1046,16 @@ class wxGridCellAttrProvider
  public:
      wxGridCellAttrProvider();
      // ???? virtual ~wxGridCellAttrProvider();
  public:
      wxGridCellAttrProvider();
      // ???? virtual ~wxGridCellAttrProvider();
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+
+    %addmethods {
+        void _setOORInfo(PyObject* _self) {
+            self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }
  
  
-    wxGridCellAttr *GetAttr(int row, int col) const;
+    wxGridCellAttr *GetAttr(int row, int col,
+                            wxGridCellAttr::wxAttrKind  kind) const;
      void SetAttr(wxGridCellAttr *attr, int row, int col);
      void SetRowAttr(wxGridCellAttr *attr, int row);
      void SetColAttr(wxGridCellAttr *attr, int col);
      void SetAttr(wxGridCellAttr *attr, int row, int col);
      void SetRowAttr(wxGridCellAttr *attr, int row);
      void SetColAttr(wxGridCellAttr *attr, int col);
@@ -879,7 +1073,7 @@ class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
  public:
      wxPyGridCellAttrProvider() : wxGridCellAttrProvider() {};
  
  public:
      wxPyGridCellAttrProvider() : wxGridCellAttrProvider() {};
  
-    PYCALLBACK_GCA_INTINT(wxGridCellAttrProvider, GetAttr);
+    PYCALLBACK_GCA_INTINTKIND(wxGridCellAttrProvider, GetAttr);
      PYCALLBACK__GCAINTINT(wxGridCellAttrProvider, SetAttr);
      PYCALLBACK__GCAINT(wxGridCellAttrProvider, SetRowAttr);
      PYCALLBACK__GCAINT(wxGridCellAttrProvider, SetColAttr);
      PYCALLBACK__GCAINTINT(wxGridCellAttrProvider, SetAttr);
      PYCALLBACK__GCAINT(wxGridCellAttrProvider, SetRowAttr);
      PYCALLBACK__GCAINT(wxGridCellAttrProvider, SetColAttr);
@@ -894,10 +1088,11 @@ class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
  {
  public:
      wxPyGridCellAttrProvider();
  {
  public:
      wxPyGridCellAttrProvider();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridCellAttrProvider)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellAttrProvider)"
  
  
-    wxGridCellAttr *base_GetAttr(int row, int col);
+    wxGridCellAttr *base_GetAttr(int row, int col,
+                                 wxGridCellAttr::wxAttrKind kind);
      void base_SetAttr(wxGridCellAttr *attr, int row, int col);
      void base_SetRowAttr(wxGridCellAttr *attr, int row);
      void base_SetColAttr(wxGridCellAttr *attr, int col);
      void base_SetAttr(wxGridCellAttr *attr, int row, int col);
      void base_SetRowAttr(wxGridCellAttr *attr, int row);
      void base_SetColAttr(wxGridCellAttr *attr, int col);
@@ -908,13 +1103,18 @@ public:
  // Grid Table Base class and Python aware version
  
  
  // Grid Table Base class and Python aware version
  
  
-
-class wxGridTableBase
+class wxGridTableBase : public wxObject
  {
  public:
      // wxGridTableBase();   This is an ABC
      //~wxGridTableBase();
  
  {
  public:
      // wxGridTableBase();   This is an ABC
      //~wxGridTableBase();
  
+    %addmethods {
+        void _setOORInfo(PyObject* _self) {
+            self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }
+
      void SetAttrProvider(wxGridCellAttrProvider *attrProvider);
      wxGridCellAttrProvider *GetAttrProvider() const;
      void SetView( wxGrid *grid );
      void SetAttrProvider(wxGridCellAttrProvider *attrProvider);
      wxGridCellAttrProvider *GetAttrProvider() const;
      void SetView( wxGrid *grid );
@@ -958,7 +1158,8 @@ public:
  
      virtual bool CanHaveAttributes();
  
  
      virtual bool CanHaveAttributes();
  
-    virtual wxGridCellAttr *GetAttr( int row, int col );
+    virtual wxGridCellAttr *GetAttr( int row, int col,
+                                     wxGridCellAttr::wxAttrKind  kind);
      virtual void SetAttr(wxGridCellAttr* attr, int row, int col);
      virtual void SetRowAttr(wxGridCellAttr *attr, int row);
      virtual void SetColAttr(wxGridCellAttr *attr, int col);
      virtual void SetAttr(wxGridCellAttr* attr, int row, int col);
      virtual void SetRowAttr(wxGridCellAttr *attr, int row);
      virtual void SetColAttr(wxGridCellAttr *attr, int col);
@@ -992,33 +1193,35 @@ public:
      PYCALLBACK__INTSTRING(wxGridTableBase, SetRowLabelValue);
      PYCALLBACK__INTSTRING(wxGridTableBase, SetColLabelValue);
      PYCALLBACK_BOOL_(wxGridTableBase, CanHaveAttributes);
      PYCALLBACK__INTSTRING(wxGridTableBase, SetRowLabelValue);
      PYCALLBACK__INTSTRING(wxGridTableBase, SetColLabelValue);
      PYCALLBACK_BOOL_(wxGridTableBase, CanHaveAttributes);
-    PYCALLBACK_GCA_INTINT(wxGridTableBase, GetAttr);
+    PYCALLBACK_GCA_INTINTKIND(wxGridTableBase, GetAttr);
      PYCALLBACK__GCAINTINT(wxGridTableBase, SetAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetRowAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetColAttr);
  
  
      PYCALLBACK__GCAINTINT(wxGridTableBase, SetAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetRowAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetColAttr);
  
  
-
      wxString GetValue(int row, int col) {
      wxString GetValue(int row, int col) {
-        bool doSave = wxPyRestoreThread();
+        wxPyBeginBlockThreads();
          wxString rval;
          wxString rval;
-        if (m_myInst.findCallback("GetValue")) {
+        if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* ro;
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)",row,col));
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",row,col));
              if (ro) {
              if (ro) {
-                rval = PyString_AsString(PyObject_Str(ro));
+                rval = Py2wxString(ro);
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
          return rval;
      }
  
      void SetValue(int row, int col, const wxString& val) {
          return rval;
      }
  
      void SetValue(int row, int col, const wxString& val) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("SetValue"))
-            m_myInst.callCallback(Py_BuildValue("(iis)",row,col,val.c_str()));
-        wxPySaveThread(doSave);
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
+            PyObject* s = wx2PyString(val);
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,s));
+            Py_DECREF(s);
+       }
+        wxPyEndBlockThreads();
      }
  
  
      }
  
  
@@ -1026,11 +1229,11 @@ public:
      // the GetValue and SetValue python methods.
      long GetValueAsLong( int row, int col ) {
          long rval = 0;
      // the GetValue and SetValue python methods.
      long GetValueAsLong( int row, int col ) {
          long rval = 0;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("GetValue")) {
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
              PyObject* ro;
              PyObject* num;
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)", row, col));
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)", row, col));
              if (ro && PyNumber_Check(ro)) {
                  num = PyNumber_Int(ro);
                  if (num) {
              if (ro && PyNumber_Check(ro)) {
                  num = PyNumber_Int(ro);
                  if (num) {
@@ -1040,17 +1243,17 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
          return rval;
      }
  
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
          return rval;
      }
  
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("GetValue")) {
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
              PyObject* ro;
              PyObject* num;
-            ro = m_myInst.callCallbackObj(Py_BuildValue("(ii)", row, col));
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)", row, col));
              if (ro && PyNumber_Check(ro)) {
                  num = PyNumber_Float(ro);
                  if (num) {
              if (ro && PyNumber_Check(ro)) {
                  num = PyNumber_Float(ro);
                  if (num) {
@@ -1060,7 +1263,7 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
          return rval;
      }
  
          return rval;
      }
  
@@ -1069,19 +1272,19 @@ public:
      }
  
      void SetValueAsLong( int row, int col, long value ) {
      }
  
      void SetValueAsLong( int row, int col, long value ) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("SetValue")) {
-            m_myInst.callCallback(Py_BuildValue("(iii)", row, col, value));
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
          }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
      }
  
      void SetValueAsDouble( int row, int col, double value ) {
      }
  
      void SetValueAsDouble( int row, int col, double value ) {
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("SetValue")) {
-            m_myInst.callCallback(Py_BuildValue("(iid)", row, col, value));
+        wxPyBeginBlockThreads();
+        if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
          }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
      }
  
      void SetValueAsBool( int row, int col, bool value ) {
      }
  
      void SetValueAsBool( int row, int col, bool value ) {
@@ -1099,8 +1302,9 @@ class wxPyGridTableBase : public wxGridTableBase
  {
  public:
      wxPyGridTableBase();
  {
  public:
      wxPyGridTableBase();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridTableBase)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridTableBase)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  
      %addmethods { void Destroy() { delete self; } }
  
  
      %addmethods { void Destroy() { delete self; } }
  
@@ -1119,7 +1323,8 @@ public:
      void base_SetRowLabelValue( int row, const wxString& value );
      void base_SetColLabelValue( int col, const wxString& value );
      bool base_CanHaveAttributes();
      void base_SetRowLabelValue( int row, const wxString& value );
      void base_SetColLabelValue( int col, const wxString& value );
      bool base_CanHaveAttributes();
-    wxGridCellAttr *base_GetAttr( int row, int col );
+    wxGridCellAttr *base_GetAttr( int row, int col,
+                                  wxGridCellAttr::wxAttrKind kind );
      void base_SetAttr(wxGridCellAttr* attr, int row, int col);
      void base_SetRowAttr(wxGridCellAttr *attr, int row);
      void base_SetColAttr(wxGridCellAttr *attr, int col);
      void base_SetAttr(wxGridCellAttr* attr, int row, int col);
      void base_SetRowAttr(wxGridCellAttr *attr, int row);
      void base_SetColAttr(wxGridCellAttr *attr, int col);
@@ -1133,6 +1338,7 @@ class  wxGridStringTable : public wxGridTableBase
  {
  public:
      wxGridStringTable( int numRows=0, int numCols=0 );
  {
  public:
      wxGridStringTable( int numRows=0, int numCols=0 );
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  };
  
  //---------------------------------------------------------------------------
  };
  
  //---------------------------------------------------------------------------
@@ -1257,9 +1463,9 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxWANTS_CHARS,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxWANTS_CHARS,
-            const char* name = wxPanelNameStr );
+            const wxString& name = wxPyPanelNameStr);
  
  
-    //~wxGrid();
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
  
      enum wxGridSelectionModes {wxGridSelectCells,
                                 wxGridSelectRows,
  
      enum wxGridSelectionModes {wxGridSelectCells,
                                 wxGridSelectRows,
@@ -1268,6 +1474,7 @@ public:
      bool CreateGrid( int numRows, int numCols,
                       WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells );
      void SetSelectionMode(WXGRIDSELECTIONMODES selmode);
      bool CreateGrid( int numRows, int numCols,
                       WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells );
      void SetSelectionMode(WXGRIDSELECTIONMODES selmode);
+    WXGRIDSELECTIONMODES GetSelectionMode();
  
  
      // ------ grid dimensions
  
  
      // ------ grid dimensions
@@ -1276,24 +1483,6 @@ public:
      int      GetNumberCols();
  
  
      int      GetNumberCols();
  
  
-
-#ifdef NOTNEEDED // ????
-    // ------ display update functions
-    //
-    void CalcRowLabelsExposed( wxRegion& reg );
-    void CalcColLabelsExposed( wxRegion& reg );
-    void CalcCellsExposed( wxRegion& reg );
-
-    // ------ event handlers
-    //
-    void ProcessRowLabelMouseEvent( wxMouseEvent& event );
-    void ProcessColLabelMouseEvent( wxMouseEvent& event );
-    void ProcessCornerLabelMouseEvent( wxMouseEvent& event );
-    void ProcessGridCellMouseEvent( wxMouseEvent& event );
-    void DoEndDragResizeRow();
-    void DoEndDragResizeCol();
-#endif
-
      bool ProcessTableMessage( wxGridTableMessage& );
  
  
      bool ProcessTableMessage( wxGridTableMessage& );
  
  
@@ -1310,26 +1499,11 @@ public:
      bool AppendCols( int numCols = 1, bool updateLabels=TRUE );
      bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE );
  
      bool AppendCols( int numCols = 1, bool updateLabels=TRUE );
      bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE );
  
-#ifdef NOTNEEDED // ????
-    void DrawGridCellArea( wxDC& dc );
-    void DrawGridSpace( wxDC& dc );
-    void DrawCellBorder( wxDC& dc, const wxGridCellCoords& );
-    void DrawAllGridLines( wxDC& dc, const wxRegion & reg );
-    void DrawCell( wxDC& dc, const wxGridCellCoords& );
-    void DrawHighlight(wxDC& dc);
-#endif
  
      // this function is called when the current cell highlight must be redrawn
      // and may be overridden by the user
      virtual void DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr );
  
  
      // this function is called when the current cell highlight must be redrawn
      // and may be overridden by the user
      virtual void DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr );
  
-#ifdef NOTNEEDED // ????
-    void DrawRowLabels( wxDC& dc );
-    void DrawRowLabel( wxDC& dc, int row );
-
-    void DrawColLabels( wxDC& dc );
-    void DrawColLabel( wxDC& dc, int col );
-#endif
  
      // ------ Cell text drawing functions
      //
  
      // ------ Cell text drawing functions
      //
@@ -1337,10 +1511,10 @@ public:
                              int horizontalAlignment = wxLEFT,
                              int verticalAlignment = wxTOP );
  
                              int horizontalAlignment = wxLEFT,
                              int verticalAlignment = wxTOP );
  
-    // Split a string containing newline chararcters into an array of
-    // strings and return the number of lines
-    //
-    void StringToLines( const wxString& value, wxArrayString& lines );
+//      // Split a string containing newline chararcters into an array of
+//      // strings and return the number of lines
+//      //
+//      void StringToLines( const wxString& value, wxArrayString& lines );
  
      void GetTextBoxSize( wxDC& dc,
                           wxArrayString& lines,
  
      void GetTextBoxSize( wxDC& dc,
                           wxArrayString& lines,
@@ -1355,11 +1529,13 @@ public:
      void     BeginBatch();
      void     EndBatch();
      int      GetBatchCount();
      void     BeginBatch();
      void     EndBatch();
      int      GetBatchCount();
+    void     ForceRefresh();
+    void     Refresh(bool eraseb=TRUE, const wxRect* rect= NULL);
  
  
      // ------ edit control functions
      //
  
  
      // ------ edit control functions
      //
-    bool IsEditable() { return m_editable; }
+    bool IsEditable();
      void EnableEditing( bool edit );
  
      void EnableCellEditControl( bool enable = TRUE );
      void EnableEditing( bool edit );
  
      void EnableCellEditControl( bool enable = TRUE );
@@ -1442,6 +1618,8 @@ public:
      wxString GetColLabelValue( int col );
      wxColour GetGridLineColour();
      wxColour GetCellHighlightColour();
      wxString GetColLabelValue( int col );
      wxColour GetGridLineColour();
      wxColour GetCellHighlightColour();
+    int      GetCellHighlightPenWidth();
+    int      GetCellHighlightROPenWidth();
  
      void     SetRowLabelSize( int width );
      void     SetColLabelSize( int height );
  
      void     SetRowLabelSize( int width );
      void     SetColLabelSize( int height );
@@ -1454,6 +1632,8 @@ public:
      void     SetColLabelValue( int col, const wxString& );
      void     SetGridLineColour( const wxColour& );
      void     SetCellHighlightColour( const wxColour& );
      void     SetColLabelValue( int col, const wxString& );
      void     SetGridLineColour( const wxColour& );
      void     SetCellHighlightColour( const wxColour& );
+    void     SetCellHighlightPenWidth(int width);
+    void     SetCellHighlightROPenWidth(int width);
  
      void     EnableDragRowSize( bool enable = TRUE );
      void     DisableDragRowSize();
  
      void     EnableDragRowSize( bool enable = TRUE );
      void     DisableDragRowSize();
@@ -1466,6 +1646,7 @@ public:
      bool     CanDragGridSize();
  
      // this sets the specified attribute for all cells in this row/col
      bool     CanDragGridSize();
  
      // this sets the specified attribute for all cells in this row/col
+    void     SetAttr(int row, int col, wxGridCellAttr *attr);
      void     SetRowAttr(int row, wxGridCellAttr *attr);
      void     SetColAttr(int col, wxGridCellAttr *attr);
  
      void     SetRowAttr(int row, wxGridCellAttr *attr);
      void     SetColAttr(int col, wxGridCellAttr *attr);
  
@@ -1494,6 +1675,9 @@ public:
      wxFont   GetCellFont( int row, int col );
      void     GetDefaultCellAlignment( int *horiz, int *vert );
      void     GetCellAlignment( int row, int col, int *horiz, int *vert );
      wxFont   GetCellFont( int row, int col );
      void     GetDefaultCellAlignment( int *horiz, int *vert );
      void     GetCellAlignment( int row, int col, int *horiz, int *vert );
+    bool     GetDefaultCellOverflow();
+    bool     GetCellOverflow( int row, int col );
+    void     GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT );
  
      void     SetDefaultRowSize( int height, bool resizeExistingRows = FALSE );
      void     SetRowSize( int row, int height );
  
      void     SetDefaultRowSize( int height, bool resizeExistingRows = FALSE );
      void     SetRowSize( int row, int height );
@@ -1531,6 +1715,9 @@ public:
      void     SetCellFont( int row, int col, const wxFont& );
      void     SetDefaultCellAlignment( int horiz, int vert );
      void     SetCellAlignment( int row, int col, int horiz, int vert );
      void     SetCellFont( int row, int col, const wxFont& );
      void     SetDefaultCellAlignment( int horiz, int vert );
      void     SetCellAlignment( int row, int col, int horiz, int vert );
+    void     SetDefaultCellOverflow( bool allow );
+    void     SetCellOverflow( int row, int col, bool allow );
+    void     SetCellSize( int row, int col, int num_rows, int num_cols );
  
      // takes ownership of the pointer
      void SetDefaultRenderer(wxGridCellRenderer *renderer);
  
      // takes ownership of the pointer
      void SetDefaultRenderer(wxGridCellRenderer *renderer);
@@ -1565,7 +1752,8 @@ public:
      void SelectRow( int row, bool addToSelected = FALSE );
      void SelectCol( int col, bool addToSelected = FALSE );
  
      void SelectRow( int row, bool addToSelected = FALSE );
      void SelectCol( int col, bool addToSelected = FALSE );
  
-    void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol );
+    void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
+                      bool addToSelected = FALSE );
      // TODO: ??? void SelectBlock( const wxGridCellCoords& topLeft,
      // TODO: ???                   const wxGridCellCoords& bottomRight )
  
      // TODO: ??? void SelectBlock( const wxGridCellCoords& topLeft,
      // TODO: ???                   const wxGridCellCoords& bottomRight )
  
@@ -1575,6 +1763,13 @@ public:
      bool IsInSelection( int row, int col );
      // TODO: ??? bool IsInSelection( const wxGridCellCoords& coords )
  
      bool IsInSelection( int row, int col );
      // TODO: ??? bool IsInSelection( const wxGridCellCoords& coords )
  
+// TODO:  These need typemaps
+//     wxGridCellCoordsArray GetSelectedCells() const;
+//     wxGridCellCoordsArray GetSelectionBlockTopLeft() const;
+//     wxGridCellCoordsArray GetSelectionBlockBottomRight() const;
+//     wxArrayInt GetSelectedRows() const;
+//     wxArrayInt GetSelectedCols() const;
+
  
      // This function returns the rectangle that encloses the block of cells
      // limited by TopLeft and BottomRight cell in device coords and clipped
  
      // This function returns the rectangle that encloses the block of cells
      // limited by TopLeft and BottomRight cell in device coords and clipped
@@ -1605,6 +1800,15 @@ public:
      // grid may occupy more space than needed for its rows/columns, this
      // function allows to set how big this extra space is
      void SetMargins(int extraWidth, int extraHeight);
      // grid may occupy more space than needed for its rows/columns, this
      // function allows to set how big this extra space is
      void SetMargins(int extraWidth, int extraHeight);
+
+
+    // Accessors for component windows
+    wxWindow* GetGridWindow();
+    wxWindow* GetGridRowLabelWindow();
+    wxWindow* GetGridColLabelWindow();
+    wxWindow* GetGridCornerLabelWindow();
+
+
  };
  
  
  };
  
  
@@ -1673,6 +1877,22 @@ public:
      bool        AltDown();
  };
  
      bool        AltDown();
  };
  
+
+class wxGridEditorCreatedEvent : public wxCommandEvent {
+public:
+    wxGridEditorCreatedEvent(int id, wxEventType type, wxObject* obj,
+                             int row, int col, wxControl* ctrl);
+
+    int GetRow();
+    int GetCol();
+    wxControl* GetControl();
+    void SetRow(int row);
+    void SetCol(int col);
+    void SetControl(wxControl* ctrl);
+};
+
+
+
  enum {
      wxEVT_GRID_CELL_LEFT_CLICK,
      wxEVT_GRID_CELL_RIGHT_CLICK,
  enum {
      wxEVT_GRID_CELL_LEFT_CLICK,
      wxEVT_GRID_CELL_RIGHT_CLICK,
@@ -1689,6 +1909,7 @@ enum {
      wxEVT_GRID_SELECT_CELL,
      wxEVT_GRID_EDITOR_SHOWN,
      wxEVT_GRID_EDITOR_HIDDEN,
      wxEVT_GRID_SELECT_CELL,
      wxEVT_GRID_EDITOR_SHOWN,
      wxEVT_GRID_EDITOR_HIDDEN,
+    wxEVT_GRID_EDITOR_CREATED,
  };
  
  
  };
  
  
@@ -1739,10 +1960,20 @@ def EVT_GRID_EDITOR_SHOWN(win, fn):
  def EVT_GRID_EDITOR_HIDDEN(win, fn):
      win.Connect(-1, -1, wxEVT_GRID_EDITOR_HIDDEN, fn)
  
  def EVT_GRID_EDITOR_HIDDEN(win, fn):
      win.Connect(-1, -1, wxEVT_GRID_EDITOR_HIDDEN, fn)
  
+def EVT_GRID_EDITOR_CREATED(win, fn):
+    win.Connect(-1, -1, wxEVT_GRID_EDITOR_CREATED, fn)
+
  "
  
  //---------------------------------------------------------------------------
  
  "
  
  //---------------------------------------------------------------------------
  
+%init %{
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+%}
+
+//---------------------------------------------------------------------------
+
  %pragma(python) include="_gridextras.py";
  
  //---------------------------------------------------------------------------
  %pragma(python) include="_gridextras.py";
  
  //---------------------------------------------------------------------------