Force integer values for positions and sizes

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

index 5e0971123d82239465512a21ee0f8140aa07f9da..0c47eff96cb7ad937245bc8e230acbee190c5ee5 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
  // Name:        grid.i
  // Purpose:     SWIG definitions for the new wxGrid and related classes
  //
  // Name:        grid.i
  // Purpose:     SWIG definitions for the new wxGrid and related classes
  //
@@ -12,29 +12,75 @@
  
  %module grid
  
  
  %module grid
  
-#ifndef OLD_GRID
-
  %{
  %{
-#include "helpers.h"
+#include "wx/wxPython/wxPython.h"
+#include "wx/wxPython/pyclasses.h"
+#include "wx/wxPython/printfw.h"
+
  #include <wx/grid.h>
  #include <wx/grid.h>
+#include <wx/generic/gridctrl.h>
+
  %}
  
  %}
  
-//----------------------------------------------------------------------
  
  
-%include typemaps.i
-%include my_typemaps.i
+//---------------------------------------------------------------------------
  
  
-// Import some definitions of other classes, etc.
-%import _defs.i
-%import misc.i
-%import gdi.i
  %import windows.i
  %import windows.i
-%import controls.i
-%import events.i
+%pythoncode { wx = core }
+
+
+%include _grid_rename.i
+
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
+MAKE_CONST_WXSTRING2(DateTimeFormatStr, wxT("%c"));
  
  
-%pragma(python) code = "import wx"
  
  //---------------------------------------------------------------------------
  
  //---------------------------------------------------------------------------
+// OOR related typemaps and helper functions
+
+%typemap(out) wxGridCellRenderer*     { $result = wxPyMake_wxGridCellRenderer($1); }
+%typemap(out) wxGridCellEditor*       { $result = wxPyMake_wxGridCellEditor($1); }
+%typemap(out) wxGridCellAttr*         { $result = wxPyMake_wxGridCellAttr($1); }
+%typemap(out) wxGridCellAttrProvider* { $result = wxPyMake_wxGridCellAttrProvider($1); }
+%typemap(out) wxGridTableBase*        { $result = wxPyMake_wxGridTableBase($1); }
+
+
+%{
+
+#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, wxT(#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,381 +89,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) {                                                   \
-                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);                                    \
+#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 (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr")))    \
+                    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)) {                           \
-            PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr");\
-            m_myInst.callCallback(Py_BuildValue("(Oii)", obj, a, b));   \
-            Py_DECREF(obj);                                             \
-        }                                                               \
-        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)) {                           \
-            PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr");\
-            m_myInst.callCallback(Py_BuildValue("(Oi)", obj, val));     \
-            Py_DECREF(obj);                                             \
-        }                                                               \
-        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) {                                                   \
-                PyObject* str = PyObject_Str(ro);                       \
-                rval = PyString_AsString(str);                          \
-                Py_DECREF(ro);  Py_DECREF(str);                         \
-            }                                                           \
-        }                                                               \
-        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) {                                                   \
-                PyObject* str = PyObject_Str(ro);                       \
-                rval = PyString_AsString(str);                          \
-                Py_DECREF(ro);  Py_DECREF(str);                         \
-            }                                                           \
-        } 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) {                                                   \
-                PyObject* str = PyObject_Str(ro);                       \
-                rval = PyFloat_AsDouble(str);                           \
-                Py_DECREF(ro);   Py_DECREF(str);                        \
-            }                                                           \
-        } 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) {                                                   \
-                PyObject* str = PyObject_Str(ro);                       \
-                rval = PyString_AsString(str);                          \
-                Py_DECREF(ro);   Py_DECREF(str);                        \
-            }                                                           \
-        } 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);                                                  \
      }
  
  
      }
  
  
@@ -430,8 +498,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"
@@ -439,11 +505,14 @@ 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;
-wxRect           wxGridNoCellRect;
-%readwrite
+%immutable;
+const wxGridCellCoords wxGridNoCellCoords;
+const wxRect           wxGridNoCellRect;
+%mutable;
  
  
  //---------------------------------------------------------------------------
  
  
  //---------------------------------------------------------------------------
@@ -454,6 +523,12 @@ wxRect           wxGridNoCellRect;
  class wxGridCellRenderer
  {
  public:
  class wxGridCellRenderer
  {
  public:
+    %extend {
+        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();
@@ -463,12 +538,12 @@ public:
                        wxDC& dc,
                        const wxRect& rect,
                        int row, int col,
                        wxDC& dc,
                        const wxRect& rect,
                        int row, int col,
-                      bool isSelected) = 0;
+                      bool isSelected);
      virtual wxSize GetBestSize(wxGrid& grid,
                                 wxGridCellAttr& attr,
                                 wxDC& dc,
      virtual wxSize GetBestSize(wxGrid& grid,
                                 wxGridCellAttr& attr,
                                 wxDC& dc,
-                               int row, int col) = 0;
-    virtual wxGridCellRenderer *Clone() const = 0;
+                               int row, int col);
+    virtual wxGridCellRenderer *Clone() const;
  };
  
  
  };
  
  
@@ -483,57 +558,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, wxT("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 (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxSize"))) {
                      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 (ro) {
-                if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellRenderer_p"))
+                if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellRenderer")))
                      rval = ptr;
                  Py_DECREF(ro);
              }
          }
                      rval = ptr;
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
          return rval;
      }
  
          return rval;
      }
  
@@ -550,9 +649,10 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters)
  // Let SWIG know about it so it can create the Python version
  class wxPyGridCellRenderer : public wxGridCellRenderer {
  public:
  // Let SWIG know about it so it can create the Python version
  class wxPyGridCellRenderer : public wxGridCellRenderer {
  public:
+    %addtofunc wxPyGridCellRenderer  "self._setCallbackInfo(self, PyGridCellRenderer);self._setOORInfo(self)"
+
      wxPyGridCellRenderer();
      wxPyGridCellRenderer();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridCellRenderer)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
  
      void base_SetParameters(const wxString& params);
  };
  
      void base_SetParameters(const wxString& params);
  };
@@ -563,6 +663,7 @@ public:
  class wxGridCellStringRenderer : public wxGridCellRenderer
  {
  public:
  class wxGridCellStringRenderer : public wxGridCellRenderer
  {
  public:
+    %addtofunc wxGridCellStringRenderer "self._setOORInfo(self)"
      wxGridCellStringRenderer();
  };
  
      wxGridCellStringRenderer();
  };
  
@@ -570,6 +671,7 @@ public:
  class  wxGridCellNumberRenderer : public wxGridCellStringRenderer
  {
  public:
  class  wxGridCellNumberRenderer : public wxGridCellStringRenderer
  {
  public:
+    %addtofunc wxGridCellNumberRenderer "self._setOORInfo(self)"
      wxGridCellNumberRenderer();
  };
  
      wxGridCellNumberRenderer();
  };
  
@@ -577,6 +679,7 @@ public:
  class  wxGridCellFloatRenderer : public wxGridCellStringRenderer
  {
  public:
  class  wxGridCellFloatRenderer : public wxGridCellStringRenderer
  {
  public:
+    %addtofunc wxGridCellFloatRenderer "self._setOORInfo(self)"
      wxGridCellFloatRenderer(int width = -1, int precision = -1);
  
      int GetWidth() const;
      wxGridCellFloatRenderer(int width = -1, int precision = -1);
  
      int GetWidth() const;
@@ -589,10 +692,35 @@ public:
  class  wxGridCellBoolRenderer : public wxGridCellRenderer
  {
  public:
  class  wxGridCellBoolRenderer : public wxGridCellRenderer
  {
  public:
+    %addtofunc wxGridCellBoolRenderer "self._setOORInfo(self)"
      wxGridCellBoolRenderer();
  };
  
  
      wxGridCellBoolRenderer();
  };
  
  
+class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
+{
+public:
+    %addtofunc wxGridCellDateTimeRenderer "self._setOORInfo(self)"
+    wxGridCellDateTimeRenderer(wxString outformat = wxPyDateTimeFormatStr,
+                               wxString informat =  wxPyDateTimeFormatStr);
+};
+
+
+class wxGridCellEnumRenderer : public wxGridCellStringRenderer
+{
+public:
+    %addtofunc wxGridCellEnumRenderer "self._setOORInfo(self)"
+    wxGridCellEnumRenderer( const wxString& choices = wxPyEmptyString );
+};
+
+
+class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
+{
+public:
+    %addtofunc wxGridCellAutoWrapStringRenderer "self._setOORInfo(self)"
+    wxGridCellAutoWrapStringRenderer();
+};
+
  
  //---------------------------------------------------------------------------
  // wxGridCellEditor is an ABC, and several derived classes are available.
  
  //---------------------------------------------------------------------------
  // wxGridCellEditor is an ABC, and several derived classes are available.
@@ -601,21 +729,30 @@ public:
  class  wxGridCellEditor
  {
  public:
  class  wxGridCellEditor
  {
  public:
+    %extend {
+        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);
  
+    wxGridCellAttr* GetCellAttr();
+    void SetCellAttr(wxGridCellAttr* attr);
+
      void SetParameters(const wxString& params);
      void IncRef();
      void DecRef();
  
      virtual void Create(wxWindow* parent,
                          wxWindowID id,
      void SetParameters(const wxString& params);
      void IncRef();
      void DecRef();
  
      virtual void Create(wxWindow* parent,
                          wxWindowID id,
-                        wxEvtHandler* evtHandler) = 0;
-    virtual void BeginEdit(int row, int col, wxGrid* grid) = 0;
-    virtual bool EndEdit(int row, int col, wxGrid* grid) = 0;
-    virtual void Reset() = 0;
-    virtual wxGridCellEditor *Clone() const = 0;
+                        wxEvtHandler* evtHandler);
+    virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual bool EndEdit(int row, int col, wxGrid* grid);
+    virtual void Reset();
+    virtual wxGridCellEditor *Clone() const;
  
      virtual void SetSize(const wxRect& rect);
      virtual void Show(bool show, wxGridCellAttr *attr = NULL);
  
      virtual void SetSize(const wxRect& rect);
      virtual void Show(bool show, wxGridCellAttr *attr = NULL);
@@ -637,69 +774,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 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")));
+        bool rv = False;
+        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 (ro) {
-                if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellEditor_p"))
+                if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellEditor")))
                      rval = ptr;
                  Py_DECREF(ro);
              }
          }
                      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);
@@ -707,15 +847,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, wxT("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);
@@ -730,6 +875,7 @@ public:
      DEC_PYCALLBACK__(StartingClick);
      DEC_PYCALLBACK__(Destroy);
      DEC_PYCALLBACK__STRING(SetParameters);
      DEC_PYCALLBACK__(StartingClick);
      DEC_PYCALLBACK__(Destroy);
      DEC_PYCALLBACK__STRING(SetParameters);
+    DEC_PYCALLBACK_STRING__constpure(GetValue);
  
      PYPRIVATE;
  };
  
      PYPRIVATE;
  };
@@ -743,6 +889,7 @@ IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, StartingKey, wxKeyEven
  IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, HandleReturn, wxKeyEvent);
  IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, StartingClick);
  IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, Destroy);
  IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, HandleReturn, wxKeyEvent);
  IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, StartingClick);
  IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, Destroy);
+IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue);
  
  %}
  
  
  %}
  
@@ -750,14 +897,15 @@ IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, Destroy);
  // Let SWIG know about it so it can create the Python version
  class wxPyGridCellEditor : public wxGridCellEditor {
  public:
  // Let SWIG know about it so it can create the Python version
  class wxPyGridCellEditor : public wxGridCellEditor {
  public:
+    %addtofunc wxPyGridCellEditor  "self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)"
+    
      wxPyGridCellEditor();
      wxPyGridCellEditor();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridCellEditor)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
  
      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);
+    bool 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);
@@ -771,57 +919,109 @@ public:
  class wxGridCellTextEditor : public wxGridCellEditor
  {
  public:
  class wxGridCellTextEditor : public wxGridCellEditor
  {
  public:
+    %addtofunc wxGridCellTextEditor  "self._setOORInfo(self)"
      wxGridCellTextEditor();
      wxGridCellTextEditor();
+    virtual wxString GetValue();
  };
  
  
  class wxGridCellNumberEditor : public wxGridCellTextEditor
  {
  public:
  };
  
  
  class wxGridCellNumberEditor : public wxGridCellTextEditor
  {
  public:
+    %addtofunc wxGridCellNumberEditor  "self._setOORInfo(self)"
      wxGridCellNumberEditor(int min = -1, int max = -1);
      wxGridCellNumberEditor(int min = -1, int max = -1);
+    virtual wxString GetValue();
  };
  
  
  class wxGridCellFloatEditor : public wxGridCellTextEditor
  {
  public:
  };
  
  
  class wxGridCellFloatEditor : public wxGridCellTextEditor
  {
  public:
+    %addtofunc wxGridCellFloatEditor  "self._setOORInfo(self)"
      wxGridCellFloatEditor();
      wxGridCellFloatEditor();
+    virtual wxString GetValue();
  };
  
  
  class wxGridCellBoolEditor : public wxGridCellEditor
  {
  public:
  };
  
  
  class wxGridCellBoolEditor : public wxGridCellEditor
  {
  public:
+    %addtofunc wxGridCellBoolEditor  "self._setOORInfo(self)"
      wxGridCellBoolEditor();
      wxGridCellBoolEditor();
+    virtual wxString GetValue();
  };
  
  class wxGridCellChoiceEditor : public wxGridCellEditor
  {
  public:
  };
  
  class wxGridCellChoiceEditor : public wxGridCellEditor
  {
  public:
-    wxGridCellChoiceEditor(int LCOUNT = 0,
-                           const wxString* choices = NULL,
-                           bool allowOthers = FALSE);
+    %addtofunc wxGridCellChoiceEditor  "self._setOORInfo(self)"
+    wxGridCellChoiceEditor(int choices = 0,
+                           const wxString* choices_array = NULL,
+                           bool allowOthers = False);
+    virtual wxString GetValue();
  };
  
  };
  
+
+class wxGridCellEnumEditor : public wxGridCellChoiceEditor
+{
+public:
+    %addtofunc wxGridCellEnumEditor  "self._setOORInfo(self)"
+    wxGridCellEnumEditor( const wxString& choices = wxPyEmptyString );
+    virtual wxString GetValue();
+};
+
+
+class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
+{
+public:
+    %addtofunc wxGridCellAutoWrapStringEditor  "self._setOORInfo(self)"
+    wxGridCellAutoWrapStringEditor();
+    virtual wxString GetValue();
+};
+
+
+
  //---------------------------------------------------------------------------
  
  
  class wxGridCellAttr
  {
  public:
  //---------------------------------------------------------------------------
  
  
  class wxGridCellAttr
  {
  public:
-    wxGridCellAttr();
+    enum wxAttrKind
+    {
+        Any,
+        Default,
+        Cell,
+        Row,
+        Col,
+        Merged
+    };
+
+    %extend {
+        void _setOORInfo(PyObject* _self) {
+            self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }
+    
+    %addtofunc wxGridCellAttr  "self._setOORInfo(self)"
+
+    wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
  
      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 SetReadOnly(bool isReadOnly = TRUE);
+    void SetSize(int num_rows, int num_cols);
+    void SetOverflow( bool allow = True );
+    void SetReadOnly(bool isReadOnly = True);
  
      void SetRenderer(wxGridCellRenderer *renderer);
      void SetEditor(wxGridCellEditor* editor);
  
      void SetRenderer(wxGridCellRenderer *renderer);
      void SetEditor(wxGridCellEditor* editor);
+    void SetKind(wxAttrKind kind);
  
      bool HasTextColour() const;
      bool HasBackgroundColour() const;
  
      bool HasTextColour() const;
      bool HasBackgroundColour() const;
@@ -829,11 +1029,22 @@ public:
      bool HasAlignment() const;
      bool HasRenderer() const;
      bool HasEditor() const;
      bool HasAlignment() const;
      bool HasRenderer() const;
      bool HasEditor() const;
-
-    const wxColour& GetTextColour() const;
-    const wxColour& GetBackgroundColour() const;
-    const wxFont& GetFont() const;
-    void GetAlignment(int *OUTPUT, int *OUTPUT) const;
+    bool HasReadWriteMode() const;
+    bool HasOverflowMode() const;
+
+    wxColour GetTextColour() const;
+    wxColour GetBackgroundColour() const;
+    wxFont GetFont() const;
+
+    DocDeclA(
+        void, GetAlignment(int *OUTPUT, int *OUTPUT) const,
+        "GetAlignment() -> (hAlign, vAlign)");
+    
+    DocDeclA(
+        void, GetSize(int *OUTPUT, int *OUTPUT) const,
+        "GetSize() -> (num_rows, num_cols)");
+
+    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;
  
@@ -846,10 +1057,18 @@ public:
  class wxGridCellAttrProvider
  {
  public:
  class wxGridCellAttrProvider
  {
  public:
+    %addtofunc wxGridCellAttrProvider "self._setOORInfo(self)"
      wxGridCellAttrProvider();
      // ???? virtual ~wxGridCellAttrProvider();
  
      wxGridCellAttrProvider();
      // ???? virtual ~wxGridCellAttrProvider();
  
-    wxGridCellAttr *GetAttr(int row, int col) const;
+    %extend {
+        void _setOORInfo(PyObject* _self) {
+            self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }
+
+    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);
@@ -867,7 +1086,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);
@@ -881,11 +1100,12 @@ public:
  class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
  {
  public:
  class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
  {
  public:
+    %addtofunc wxPyGridCellAttrProvider  "self._setCallbackInfo(self, PyGridCellAttrProvider)"
      wxPyGridCellAttrProvider();
      wxPyGridCellAttrProvider();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridCellAttrProvider)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
  
  
-    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);
@@ -896,13 +1116,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();
  
+    %extend {
+        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 );
@@ -910,11 +1135,11 @@ public:
  
  
      // pure virtuals
  
  
      // pure virtuals
-    virtual int GetNumberRows() = 0;
-    virtual int GetNumberCols() = 0;
-    virtual bool IsEmptyCell( int row, int col ) = 0;
-    virtual wxString GetValue( int row, int col ) = 0;
-    virtual void SetValue( int row, int col, const wxString& value ) = 0;
+    virtual int GetNumberRows();
+    virtual int GetNumberCols();
+    virtual bool IsEmptyCell( int row, int col );
+    virtual wxString GetValue( int row, int col );
+    virtual void SetValue( int row, int col, const wxString& value );
  
      // virtuals overridable in wxPyGridTableBase
      virtual wxString GetTypeName( int row, int col );
  
      // virtuals overridable in wxPyGridTableBase
      virtual wxString GetTypeName( int row, int col );
@@ -946,7 +1171,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);
@@ -980,34 +1206,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);
  
  
      wxString GetValue(int row, int col) {
      PYCALLBACK__GCAINTINT(wxGridTableBase, SetAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetRowAttr);
      PYCALLBACK__GCAINT(wxGridTableBase, SetColAttr);
  
  
      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) {
-                PyObject* str = PyObject_Str(ro);
-                rval = PyString_AsString(str);
+                rval = Py2wxString(ro);
                  Py_DECREF(ro);
                  Py_DECREF(ro);
-                Py_DECREF(str);
              }
          }
              }
          }
-        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();
      }
  
  
      }
  
  
@@ -1015,11 +1242,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) {
@@ -1029,17 +1256,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) {
@@ -1049,7 +1276,7 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
          return rval;
      }
  
          return rval;
      }
  
@@ -1058,19 +1285,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 ) {
@@ -1087,11 +1314,11 @@ public:
  class wxPyGridTableBase : public wxGridTableBase
  {
  public:
  class wxPyGridTableBase : public wxGridTableBase
  {
  public:
+    %addtofunc wxPyGridTableBase "self._setCallbackInfo(self, PyGridTableBase);self._setOORInfo(self)"
      wxPyGridTableBase();
      wxPyGridTableBase();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridTableBase)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
  
  
-    %addmethods { void Destroy() { delete self; } }
+    %extend { void Destroy() { delete self; } }
  
      wxString base_GetTypeName( int row, int col );
      bool base_CanGetValueAs( int row, int col, const wxString& typeName );
  
      wxString base_GetTypeName( int row, int col );
      bool base_CanGetValueAs( int row, int col, const wxString& typeName );
@@ -1108,7 +1335,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);
@@ -1121,6 +1349,7 @@ public:
  class  wxGridStringTable : public wxGridTableBase
  {
  public:
  class  wxGridStringTable : public wxGridTableBase
  {
  public:
+    %addtofunc wxGridStringTable "self._setOORInfo(self)"
      wxGridStringTable( int numRows=0, int numCols=0 );
  };
  
      wxGridStringTable( int numRows=0, int numCols=0 );
  };
  
@@ -1162,64 +1391,127 @@ public:
  
  //---------------------------------------------------------------------------
  
  
  //---------------------------------------------------------------------------
  
+
  class wxGridCellCoords
  {
  public:
      wxGridCellCoords( int r=-1, int c=-1 );
      ~wxGridCellCoords();
  
  class wxGridCellCoords
  {
  public:
      wxGridCellCoords( int r=-1, int c=-1 );
      ~wxGridCellCoords();
  
-    int GetRow() const { return m_row; }
-    void SetRow( int n ) { m_row = n; }
-    int GetCol() const { return m_col; }
-    void SetCol( int n ) { m_col = n; }
-    void Set( int row, int col ) { m_row = row; m_col = col; }
+    int GetRow() const;
+    void SetRow( int n );
+    int GetCol() const;
+    void SetCol( int n );
+    void Set( int row, int col );
  
  
-    %addmethods {
+    bool operator==( const wxGridCellCoords& other ) const;
+    bool operator!=( const wxGridCellCoords& other ) const;
+
+    %extend {
          PyObject* asTuple() {
              PyObject* tup = PyTuple_New(2);
              PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
              PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
              return tup;
          }
          PyObject* asTuple() {
              PyObject* tup = PyTuple_New(2);
              PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
              PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
              return tup;
          }
-
-        int __cmp__( const wxGridCellCoords& other ) {
-            return *self != other;
-        }
      }
      }
-    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
-    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+    %pythoncode {
+    def __str__(self):                   return str(self.asTuple())
+    def __repr__(self):                  return 'wxGridCellCoords'+str(self.asTuple())
+    def __len__(self):                   return len(self.asTuple())
+    def __getitem__(self, index):        return self.asTuple()[index]
+    def __setitem__(self, index, val):
+        if index == 0: self.SetRow(val)
+        elif index == 1: self.SetCol(val)
+        else: raise IndexError
+    }
+
  };
  
  // Typemap to allow conversion of sequence objects to wxGridCellCoords...
  };
  
  // Typemap to allow conversion of sequence objects to wxGridCellCoords...
-%typemap(python,in) wxGridCellCoords& (wxGridCellCoords temp) {
-    $target = &temp;
-    if (! wxGridCellCoords_helper($source, &$target))
-        return NULL;
+%typemap(in) wxGridCellCoords& (wxGridCellCoords temp) {
+    $1 = &temp;
+    if (! wxGridCellCoords_helper($input, &$1)) SWIG_fail;
  }
  }
+%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxGridCellCoords& {
+    $1 = wxGridCellCoords_typecheck($input);
+}
+
  
  // ...and here is the associated helper.
  %{
  bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
  
      // If source is an object instance then it may already be the right type
  
  // ...and here is the associated helper.
  %{
  bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
  
      // If source is an object instance then it may already be the right type
-    if (PyInstance_Check(source)) {
+    if (wxPySwigInstance_Check(source)) {
          wxGridCellCoords* ptr;
          wxGridCellCoords* ptr;
-        if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxGridCellCoords_p"))
+        if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))
              goto error;
          *obj = ptr;
              goto error;
          *obj = ptr;
-        return TRUE;
+        return True;
      }
      // otherwise a 2-tuple of integers is expected
      else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
          PyObject* o1 = PySequence_GetItem(source, 0);
          PyObject* o2 = PySequence_GetItem(source, 1);
      }
      // otherwise a 2-tuple of integers is expected
      else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
          PyObject* o1 = PySequence_GetItem(source, 0);
          PyObject* o2 = PySequence_GetItem(source, 1);
+        if (!PyNumber_Check(o1) || !PyNumber_Check(o2)) {
+            Py_DECREF(o1);
+            Py_DECREF(o2);
+            goto error;
+        }
          **obj = wxGridCellCoords(PyInt_AsLong(o1), PyInt_AsLong(o2));
          **obj = wxGridCellCoords(PyInt_AsLong(o1), PyInt_AsLong(o2));
-        return TRUE;
+        Py_DECREF(o1);
+        Py_DECREF(o2);
+        return True;
      }
  
   error:
      PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxGridCellCoords object.");
      }
  
   error:
      PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxGridCellCoords object.");
-    return FALSE;
+    return False;
+}
+
+
+bool wxGridCellCoords_typecheck(PyObject* source) {
+    void* ptr;
+    
+    if (wxPySwigInstance_Check(source) &&
+        wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))
+        return True;
+
+    PyErr_Clear();
+    if (PySequence_Check(source) && PySequence_Length(source) == 2)
+        return True;
+    
+    return False;
+}
+%}
+
+
+// Typemap to convert an array of cells coords to a list of tuples...
+%typemap(out) wxGridCellCoordsArray {
+    $result = wxGridCellCoordsArray_helper($1);
+}
+
+// %typemap(ret) wxGridCellCoordsArray {
+//     delete $1;
+// }
+
+
+// ...and the helper function for the above typemap.
+%{
+PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray& source)
+{
+    PyObject* list = PyList_New(0);
+    size_t idx;
+    for (idx = 0; idx < source.GetCount(); idx += 1) {
+        wxGridCellCoords& coord = source.Item(idx);
+        PyObject* tup = PyTuple_New(2);
+        PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(coord.GetRow()));
+        PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(coord.GetCol()));
+        PyList_Append(list, tup);
+        Py_DECREF(tup);
+    }
+    return list;
  }
  %}
  
  }
  %}
  
@@ -1241,14 +1533,15 @@ typedef wxGrid::wxGridSelectionModes WXGRIDSELECTIONMODES;
  class wxGrid : public wxScrolledWindow
  {
  public:
  class wxGrid : public wxScrolledWindow
  {
  public:
+    %addtofunc wxGrid "self._setOORInfo(self)"
+
      wxGrid( wxWindow *parent,
              wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxWANTS_CHARS,
      wxGrid( wxWindow *parent,
              wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxWANTS_CHARS,
-            const char* name = wxPanelNameStr );
+            const wxString& name = wxPyPanelNameStr);
  
  
-    //~wxGrid();
  
      enum wxGridSelectionModes {wxGridSelectCells,
                                 wxGridSelectRows,
  
      enum wxGridSelectionModes {wxGridSelectCells,
                                 wxGridSelectRows,
@@ -1257,6 +1550,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
@@ -1265,75 +1559,44 @@ 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& );
  
  
      wxGridTableBase * GetTable() const;
      bool ProcessTableMessage( wxGridTableMessage& );
  
  
      wxGridTableBase * GetTable() const;
-    bool SetTable( wxGridTableBase *table, bool takeOwnership=FALSE,
+    bool SetTable( wxGridTableBase *table, bool takeOwnership=False,
                     WXGRIDSELECTIONMODES selmode =
                     wxGrid::wxGridSelectCells );
  
      void ClearGrid();
                     WXGRIDSELECTIONMODES selmode =
                     wxGrid::wxGridSelectCells );
  
      void ClearGrid();
-    bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE );
-    bool AppendRows( int numRows = 1, bool updateLabels=TRUE );
-    bool DeleteRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE );
-    bool InsertCols( 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
+    bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=True );
+    bool AppendRows( int numRows = 1, bool updateLabels=True );
+    bool DeleteRows( int pos = 0, int numRows = 1, bool updateLabels=True );
+    bool InsertCols( 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 );
+
  
      // 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
      //
      void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,
                              int horizontalAlignment = wxLEFT,
  
      // ------ Cell text drawing functions
      //
      void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,
                              int horizontalAlignment = wxLEFT,
-                            int verticalAlignment = wxTOP );
+                            int verticalAlignment = wxTOP,
+                            int textOrientation = wxHORIZONTAL );
  
  
-    // 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,
-                         long *OUTPUT, long *OUTPUT );
+    DocDeclA(
+        void, GetTextBoxSize( wxDC& dc, wxArrayString& lines,
+                              long *OUTPUT, long *OUTPUT ),
+        "GetTextBoxSize(DC dc, list lines) -> (width, height)");
  
  
      // ------
  
  
      // ------
@@ -1344,14 +1607,16 @@ 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 EnableEditing( bool edit );
  
-    void EnableCellEditControl( bool enable = TRUE );
+    void EnableCellEditControl( bool enable = True );
      void DisableCellEditControl();
      bool CanEnableCellControl() const;
      bool IsCellEditControlEnabled() const;
      void DisableCellEditControl();
      bool CanEnableCellControl() const;
      bool IsCellEditControlEnabled() const;
@@ -1371,11 +1636,11 @@ public:
      //
  
      //void XYToCell( int x, int y, wxGridCellCoords& );
      //
  
      //void XYToCell( int x, int y, wxGridCellCoords& );
-    %addmethods {
-        %new wxGridCellCoords* XYToCell(int x, int y) {
+    %extend {
+        wxGridCellCoords XYToCell(int x, int y) {
              wxGridCellCoords rv;
              self->XYToCell(x, y, rv);
              wxGridCellCoords rv;
              self->XYToCell(x, y, rv);
-            return new wxGridCellCoords(rv);
+            return rv;
          }
      }
  
          }
      }
  
@@ -1395,8 +1660,8 @@ public:
      // check to see if a cell is either wholly visible (the default arg) or
      // at least partially visible in the grid window
      //
      // check to see if a cell is either wholly visible (the default arg) or
      // at least partially visible in the grid window
      //
-    bool IsVisible( int row, int col, bool wholeCellVisible = TRUE );
-    // TODO: ??? bool IsVisible( const wxGridCellCoords& coords, bool wholeCellVisible = TRUE );
+    bool IsVisible( int row, int col, bool wholeCellVisible = True );
+    // TODO: ??? bool IsVisible( const wxGridCellCoords& coords, bool wholeCellVisible = True );
      void MakeCellVisible( int row, int col );
      // TODO: ??? void MakeCellVisible( const wxGridCellCoords& coords );
  
      void MakeCellVisible( int row, int col );
      // TODO: ??? void MakeCellVisible( const wxGridCellCoords& coords );
  
@@ -1425,12 +1690,22 @@ public:
      wxColour GetLabelBackgroundColour();
      wxColour GetLabelTextColour();
      wxFont   GetLabelFont();
      wxColour GetLabelBackgroundColour();
      wxColour GetLabelTextColour();
      wxFont   GetLabelFont();
-    void     GetRowLabelAlignment( int *OUTPUT, int *OUTPUT );
-    void     GetColLabelAlignment( int *OUTPUT, int *OUTPUT );
+
+    DocDeclA(
+        void, GetRowLabelAlignment( int *OUTPUT, int *OUTPUT ),
+        "GetRowLabelAlignment() -> (horiz, vert)");
+    
+    DocDeclA(
+        void, GetColLabelAlignment( int *OUTPUT, int *OUTPUT ),
+        "GetColLabelAlignment() -> (horiz, vert)");
+
+    int      GetColLabelTextOrientation();
      wxString GetRowLabelValue( int row );
      wxString GetColLabelValue( int col );
      wxColour GetGridLineColour();
      wxColour GetCellHighlightColour();
      wxString GetRowLabelValue( int row );
      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 );
@@ -1439,22 +1714,26 @@ public:
      void     SetLabelFont( const wxFont& );
      void     SetRowLabelAlignment( int horiz, int vert );
      void     SetColLabelAlignment( int horiz, int vert );
      void     SetLabelFont( const wxFont& );
      void     SetRowLabelAlignment( int horiz, int vert );
      void     SetColLabelAlignment( int horiz, int vert );
+    void     SetColLabelTextOrientation( int textOrientation );
      void     SetRowLabelValue( int row, const wxString& );
      void     SetColLabelValue( int col, const wxString& );
      void     SetGridLineColour( const wxColour& );
      void     SetCellHighlightColour( const wxColour& );
      void     SetRowLabelValue( int row, const wxString& );
      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     EnableDragRowSize( bool enable = True );
      void     DisableDragRowSize();
      bool     CanDragRowSize();
      void     DisableDragRowSize();
      bool     CanDragRowSize();
-    void     EnableDragColSize( bool enable = TRUE );
+    void     EnableDragColSize( bool enable = True );
      void     DisableDragColSize();
      bool     CanDragColSize();
      void     DisableDragColSize();
      bool     CanDragColSize();
-    void     EnableDragGridSize(bool enable = TRUE);
+    void     EnableDragGridSize(bool enable = True);
      void     DisableDragGridSize();
      bool     CanDragGridSize();
  
      // this sets the specified attribute for all cells in this row/col
      void     DisableDragGridSize();
      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);
  
@@ -1466,7 +1745,7 @@ public:
      void     SetColFormatFloat(int col, int width = -1, int precision = -1);
      void     SetColFormatCustom(int col, const wxString& typeName);
  
      void     SetColFormatFloat(int col, int width = -1, int precision = -1);
      void     SetColFormatCustom(int col, const wxString& typeName);
  
-    void     EnableGridLines( bool enable = TRUE );
+    void     EnableGridLines( bool enable = True );
      bool     GridLinesEnabled();
  
      // ------ row and col formatting
      bool     GridLinesEnabled();
  
      // ------ row and col formatting
@@ -1481,36 +1760,61 @@ public:
      wxColour GetCellTextColour( int row, int col );
      wxFont   GetDefaultCellFont();
      wxFont   GetCellFont( int row, int col );
      wxColour GetCellTextColour( int row, int col );
      wxFont   GetDefaultCellFont();
      wxFont   GetCellFont( int row, int col );
-    void     GetDefaultCellAlignment( int *horiz, int *vert );
-    void     GetCellAlignment( int row, int col, int *horiz, int *vert );
  
  
-    void     SetDefaultRowSize( int height, bool resizeExistingRows = FALSE );
+    DocDeclA(
+        void, GetDefaultCellAlignment( int *OUTPUT, int *OUTPUT ),
+        "GetDefaultCellAlignment() -> (horiz, vert)");
+    
+    DocDeclA(
+        void, GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT ),
+        "GetCellAlignment() -> (horiz, vert)");
+
+    bool     GetDefaultCellOverflow();
+    bool     GetCellOverflow( int row, int col );
+
+    DocDeclA(
+        void, GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT ),
+        "GetCellSize(int row, int col) -> (num_rows, num_cols)");
+
+    void     SetDefaultRowSize( int height, bool resizeExistingRows = False );
      void     SetRowSize( int row, int height );
      void     SetRowSize( int row, int height );
-    void     SetDefaultColSize( int width, bool resizeExistingCols = FALSE );
+    void     SetDefaultColSize( int width, bool resizeExistingCols = False );
  
      void     SetColSize( int col, int width );
  
      // automatically size the column or row to fit to its contents, if
  
      void     SetColSize( int col, int width );
  
      // automatically size the column or row to fit to its contents, if
-    // setAsMin is TRUE, this optimal width will also be set as minimal width
+    // setAsMin is True, this optimal width will also be set as minimal width
      // for this column
      // for this column
-    void     AutoSizeColumn( int col, bool setAsMin = TRUE );
-    void     AutoSizeRow( int row, bool setAsMin = TRUE );
+    void     AutoSizeColumn( int col, bool setAsMin = True );
+    void     AutoSizeRow( int row, bool setAsMin = True );
  
  
      // auto size all columns (very ineffective for big grids!)
  
  
      // auto size all columns (very ineffective for big grids!)
-    void     AutoSizeColumns( bool setAsMin = TRUE );
-    void     AutoSizeRows( bool setAsMin = TRUE );
+    void     AutoSizeColumns( bool setAsMin = True );
+    void     AutoSizeRows( bool setAsMin = True );
  
      // auto size the grid, that is make the columns/rows of the "right" size
      // and also set the grid size to just fit its contents
      void     AutoSize();
  
  
      // auto size the grid, that is make the columns/rows of the "right" size
      // and also set the grid size to just fit its contents
      void     AutoSize();
  
+    // autosize row height depending on label text
+    void     AutoSizeRowLabelSize( int row );
+
+    // autosize column width depending on label text
+    void     AutoSizeColLabelSize( int col );
+
+
      // column won't be resized to be lesser width - this must be called during
      // the grid creation because it won't resize the column if it's already
      // narrower than the minimal width
      void     SetColMinimalWidth( int col, int width );
      void     SetRowMinimalHeight( int row, int width );
  
      // column won't be resized to be lesser width - this must be called during
      // the grid creation because it won't resize the column if it's already
      // narrower than the minimal width
      void     SetColMinimalWidth( int col, int width );
      void     SetRowMinimalHeight( int row, int width );
  
+    void     SetColMinimalAcceptableWidth( int width );
+    void     SetRowMinimalAcceptableHeight( int width );
+    int      GetColMinimalAcceptableWidth() const;
+    int      GetRowMinimalAcceptableHeight() const;
+
      void     SetDefaultCellBackgroundColour( const wxColour& );
      void     SetCellBackgroundColour( int row, int col, const wxColour& );
      void     SetDefaultCellTextColour( const wxColour& );
      void     SetDefaultCellBackgroundColour( const wxColour& );
      void     SetCellBackgroundColour( int row, int col, const wxColour& );
      void     SetDefaultCellTextColour( const wxColour& );
@@ -1520,6 +1824,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);
@@ -1543,19 +1850,19 @@ public:
      void SetCellValue( int row, int col, const wxString& s );
      // TODO: ??? void SetCellValue( const wxGridCellCoords& coords, const wxString& s )
  
      void SetCellValue( int row, int col, const wxString& s );
      // TODO: ??? void SetCellValue( const wxGridCellCoords& coords, const wxString& s )
  
-    // returns TRUE if the cell can't be edited
+    // returns True if the cell can't be edited
      bool IsReadOnly(int row, int col) const;
  
      // make the cell editable/readonly
      bool IsReadOnly(int row, int col) const;
  
      // make the cell editable/readonly
-    void SetReadOnly(int row, int col, bool isReadOnly = TRUE);
+    void SetReadOnly(int row, int col, bool isReadOnly = True);
  
      // ------ selections of blocks of cells
      //
  
      // ------ selections of blocks of cells
      //
-    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 );
+                      bool addToSelected = False );
      // TODO: ??? void SelectBlock( const wxGridCellCoords& topLeft,
      // TODO: ???                   const wxGridCellCoords& bottomRight )
  
      // TODO: ??? void SelectBlock( const wxGridCellCoords& topLeft,
      // TODO: ???                   const wxGridCellCoords& bottomRight )
  
@@ -1565,6 +1872,16 @@ 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 )
  
+    const wxGridCellCoordsArray GetSelectedCells() const;
+    const wxGridCellCoordsArray GetSelectionBlockTopLeft() const;
+    const wxGridCellCoordsArray GetSelectionBlockBottomRight() const;
+    const wxArrayInt GetSelectedRows() const;
+    const wxArrayInt GetSelectedCols() const;
+
+    void DeselectRow( int row );
+    void DeselectCol( int col );
+    void DeselectCell( int row, int col );
+
  
      // 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
@@ -1595,6 +1912,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();
+
+
  };
  
  
  };
  
  
@@ -1608,8 +1934,8 @@ class wxGridEvent : public wxNotifyEvent
  {
  public:
      wxGridEvent(int id, wxEventType type, wxGrid* obj,
  {
  public:
      wxGridEvent(int id, wxEventType type, wxGrid* obj,
-                int row=-1, int col=-1, int x=-1, int y=-1, bool sel = TRUE,
-                bool control=FALSE, bool shift=FALSE, bool alt=FALSE, bool meta=FALSE);
+                int row=-1, int col=-1, int x=-1, int y=-1, bool sel = True,
+                bool control=False, bool shift=False, bool alt=False, bool meta=False);
  
      virtual int GetRow();
      virtual int GetCol();
  
      virtual int GetRow();
      virtual int GetCol();
@@ -1628,7 +1954,7 @@ class  wxGridSizeEvent : public wxNotifyEvent
  public:
      wxGridSizeEvent(int id, wxEventType type, wxGrid* obj,
                  int rowOrCol=-1, int x=-1, int y=-1,
  public:
      wxGridSizeEvent(int id, wxEventType type, wxGrid* obj,
                  int rowOrCol=-1, int x=-1, int y=-1,
-                bool control=FALSE, bool shift=FALSE, bool alt=FALSE, bool meta=FALSE);
+                bool control=False, bool shift=False, bool alt=False, bool meta=False);
  
      int         GetRowOrCol();
      wxPoint     GetPosition();
  
      int         GetRowOrCol();
      wxPoint     GetPosition();
@@ -1646,9 +1972,9 @@ public:
      wxGridRangeSelectEvent(int id, wxEventType type, wxGrid* obj,
                             const wxGridCellCoords& topLeft,
                             const wxGridCellCoords& bottomRight,
      wxGridRangeSelectEvent(int id, wxEventType type, wxGrid* obj,
                             const wxGridCellCoords& topLeft,
                             const wxGridCellCoords& bottomRight,
-                           bool sel = TRUE,
-                           bool control=FALSE, bool shift=FALSE,
-                           bool alt=FALSE, bool meta=FALSE);
+                           bool sel = True,
+                           bool control=False, bool shift=False,
+                           bool alt=False, bool meta=False);
  
      wxGridCellCoords GetTopLeftCoords();
      wxGridCellCoords GetBottomRightCoords();
  
      wxGridCellCoords GetTopLeftCoords();
      wxGridCellCoords GetBottomRightCoords();
@@ -1663,79 +1989,65 @@ public:
      bool        AltDown();
  };
  
      bool        AltDown();
  };
  
-enum {
-    wxEVT_GRID_CELL_LEFT_CLICK,
-    wxEVT_GRID_CELL_RIGHT_CLICK,
-    wxEVT_GRID_CELL_LEFT_DCLICK,
-    wxEVT_GRID_CELL_RIGHT_DCLICK,
-    wxEVT_GRID_LABEL_LEFT_CLICK,
-    wxEVT_GRID_LABEL_RIGHT_CLICK,
-    wxEVT_GRID_LABEL_LEFT_DCLICK,
-    wxEVT_GRID_LABEL_RIGHT_DCLICK,
-    wxEVT_GRID_ROW_SIZE,
-    wxEVT_GRID_COL_SIZE,
-    wxEVT_GRID_RANGE_SELECT,
-    wxEVT_GRID_CELL_CHANGE,
-    wxEVT_GRID_SELECT_CELL,
-    wxEVT_GRID_EDITOR_SHOWN,
-    wxEVT_GRID_EDITOR_HIDDEN,
-};
-
-
  
  
-%pragma(python) code = "
-def EVT_GRID_CELL_LEFT_CLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_LEFT_CLICK, fn)
-
-def EVT_GRID_CELL_RIGHT_CLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_RIGHT_CLICK, fn)
-
-def EVT_GRID_CELL_LEFT_DCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_LEFT_DCLICK, fn)
-
-def EVT_GRID_CELL_RIGHT_DCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_RIGHT_DCLICK, fn)
-
-def EVT_GRID_LABEL_LEFT_CLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_LABEL_LEFT_CLICK, fn)
-
-def EVT_GRID_LABEL_RIGHT_CLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_LABEL_RIGHT_CLICK, fn)
-
-def EVT_GRID_LABEL_LEFT_DCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_LABEL_LEFT_DCLICK, fn)
-
-def EVT_GRID_LABEL_RIGHT_DCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_LABEL_RIGHT_DCLICK, fn)
-
-def EVT_GRID_ROW_SIZE(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_ROW_SIZE, fn)
-
-def EVT_GRID_COL_SIZE(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_COL_SIZE, fn)
-
-def EVT_GRID_RANGE_SELECT(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_RANGE_SELECT, fn)
-
-def EVT_GRID_CELL_CHANGE(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn)
+class wxGridEditorCreatedEvent : public wxCommandEvent {
+public:
+    wxGridEditorCreatedEvent(int id, wxEventType type, wxObject* obj,
+                             int row, int col, wxControl* ctrl);
  
  
-def EVT_GRID_SELECT_CELL(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn)
+    int GetRow();
+    int GetCol();
+    wxControl* GetControl();
+    void SetRow(int row);
+    void SetCol(int col);
+    void SetControl(wxControl* ctrl);
+};
  
  
-def EVT_GRID_EDITOR_SHOWN(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_EDITOR_SHOWN, fn)
  
  
-def EVT_GRID_EDITOR_HIDDEN(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_EDITOR_HIDDEN, fn)
  
  
-"
+%constant wxEventType wxEVT_GRID_CELL_LEFT_CLICK;
+%constant wxEventType wxEVT_GRID_CELL_RIGHT_CLICK;
+%constant wxEventType wxEVT_GRID_CELL_LEFT_DCLICK;
+%constant wxEventType wxEVT_GRID_CELL_RIGHT_DCLICK;
+%constant wxEventType wxEVT_GRID_LABEL_LEFT_CLICK;
+%constant wxEventType wxEVT_GRID_LABEL_RIGHT_CLICK;
+%constant wxEventType wxEVT_GRID_LABEL_LEFT_DCLICK;
+%constant wxEventType wxEVT_GRID_LABEL_RIGHT_DCLICK;
+%constant wxEventType wxEVT_GRID_ROW_SIZE;
+%constant wxEventType wxEVT_GRID_COL_SIZE;
+%constant wxEventType wxEVT_GRID_RANGE_SELECT;
+%constant wxEventType wxEVT_GRID_CELL_CHANGE;
+%constant wxEventType wxEVT_GRID_SELECT_CELL;
+%constant wxEventType wxEVT_GRID_EDITOR_SHOWN;
+%constant wxEventType wxEVT_GRID_EDITOR_HIDDEN;
+%constant wxEventType wxEVT_GRID_EDITOR_CREATED;
+
+
+
+%pythoncode {
+EVT_GRID_CELL_LEFT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_CLICK )
+EVT_GRID_CELL_RIGHT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_CLICK )
+EVT_GRID_CELL_LEFT_DCLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_DCLICK )
+EVT_GRID_CELL_RIGHT_DCLICK = wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_DCLICK )
+EVT_GRID_LABEL_LEFT_CLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_LEFT_CLICK )
+EVT_GRID_LABEL_RIGHT_CLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_RIGHT_CLICK )
+EVT_GRID_LABEL_LEFT_DCLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_LEFT_DCLICK )
+EVT_GRID_LABEL_RIGHT_DCLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_RIGHT_DCLICK )
+EVT_GRID_ROW_SIZE = wx.PyEventBinder( wxEVT_GRID_ROW_SIZE )
+EVT_GRID_COL_SIZE = wx.PyEventBinder( wxEVT_GRID_COL_SIZE )
+EVT_GRID_RANGE_SELECT = wx.PyEventBinder( wxEVT_GRID_RANGE_SELECT )
+EVT_GRID_CELL_CHANGE = wx.PyEventBinder( wxEVT_GRID_CELL_CHANGE )
+EVT_GRID_SELECT_CELL = wx.PyEventBinder( wxEVT_GRID_SELECT_CELL )
+EVT_GRID_EDITOR_SHOWN = wx.PyEventBinder( wxEVT_GRID_EDITOR_SHOWN )
+EVT_GRID_EDITOR_HIDDEN = wx.PyEventBinder( wxEVT_GRID_EDITOR_HIDDEN )
+EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
+}
  
  //---------------------------------------------------------------------------
  
  
  //---------------------------------------------------------------------------
  
-%pragma(python) include="_gridextras.py";
+%init %{
+%}
  
  //---------------------------------------------------------------------------
  
  //---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
  
  
-
-#endif