Use GetKeyCode() instead of KeyCode()

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

index 9926f86910f517bf8b6664e85bcbb424d54e4473..6c78cc4bb7bbb993ee1db54c37d40a1e52ee938f 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
  //
@@ -10,32 +10,81 @@
  // Licence:     wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
  // Licence:     wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
-%module grid
+%define DOCSTRING
+"Classes for implementing a spreadsheet-like control."
+%enddef
+
+%module(package="wx", docstring=DOCSTRING) grid
  
  
-#ifndef OLD_GRID
  
  %{
  
  %{
-#include "export.h"
+#include "wx/wxPython/wxPython.h"
+#include "wx/wxPython/pyclasses.h"
+#include "wx/wxPython/printfw.h"
+
  #include <wx/grid.h>
  #include <wx/generic/gridctrl.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 }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
+
  
  
-%pragma(python) code = "import wx"
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
+MAKE_CONST_WXSTRING_NOSWIG(DefaultDateTimeFormat);
  
  //---------------------------------------------------------------------------
  
  //---------------------------------------------------------------------------
+// OOR related typemaps and helper functions
+
+%typemap(out) wxGridCellRenderer*     { $result = wxPyMake_wxGridCellRenderer($1, (bool)$owner); }
+%typemap(out) wxGridCellEditor*       { $result = wxPyMake_wxGridCellEditor($1,   (bool)$owner); }
+%typemap(out) wxGridCellAttr*         { $result = wxPyMake_wxGridCellAttr($1,     (bool)$owner); }
+%typemap(out) wxGridCellAttrProvider* { $result = wxPyMake_wxGridCellAttrProvider($1, (bool)$owner); }
+%typemap(out) wxGridTableBase*        { $result = wxPyMake_wxGridTableBase($1,    (bool)$owner); }
+
+
+%{
+
+#define wxPyMake_TEMPLATE(TYPE) \
+PyObject* wxPyMake_##TYPE(TYPE* source, bool setThisOwn) { \
+    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; \
+            if (target) \
+                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), setThisOwn); \
+            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
@@ -48,73 +97,63 @@
      wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) {        \
          wxGridCellAttr* rval = NULL;                                            \
          bool found;                                                             \
      wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) {        \
          wxGridCellAttr* rval = NULL;                                            \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = 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 ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              wxGridCellAttr* ptr;                                                \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \
              if (ro) {                                                           \
-                if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellAttr_p"))    \
+                if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr"))) \
                      rval = ptr;                                                 \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                      rval = ptr;                                                 \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b, c);                                     \
          return rval;                                                            \
          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) {                           \
  
  
  #define PYCALLBACK__GCAINTINT(PCLASS, CBNAME)                                   \
      void CBNAME(wxGridCellAttr *attr, int a, int b) {                           \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          bool found;                                                             \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
          bool found;                                                             \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
-            PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr", 0);\
-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b));   \
+            PyObject* obj = wxPyMake_wxGridCellAttr(attr,false);                \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b));  \
              Py_DECREF(obj);                                                     \
          }                                                                       \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(attr, a, b);                                         \
          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) {                                \
  
  
  
  #define PYCALLBACK__GCAINT(PCLASS, CBNAME)                                      \
      void CBNAME(wxGridCellAttr *attr, int val) {                                \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          bool found;                                                             \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
          bool found;                                                             \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
-            PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr", 0);\
+            PyObject* obj = wxPyMake_wxGridCellAttr(attr,false);                \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val));    \
              Py_DECREF(obj);                                                     \
          }                                                                       \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val));    \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(attr, val);                                          \
          if (! found)                                                            \
              PCLASS::CBNAME(attr, val);                                          \
-    }                                                                           \
-    void base_##CBNAME(wxGridCellAttr *attr, int val) {                         \
-        PCLASS::CBNAME(attr, val);                                              \
-    }
+    }      
  
  
  
  #define PYCALLBACK_INT__pure(CBNAME)                                            \
      int  CBNAME() {                                                             \
  
  
  
  #define PYCALLBACK_INT__pure(CBNAME)                                            \
      int  CBNAME() {                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          int rval = 0;                                                           \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
          int rval = 0;                                                           \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          return rval;                                                            \
      }
  
          return rval;                                                            \
      }
  
@@ -122,84 +161,79 @@
  
  #define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                                     \
      bool CBNAME(int a, int b) {                                                 \
  
  #define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                                     \
      bool CBNAME(int a, int b) {                                                 \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          bool rval = 0;                                                          \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));   \
          bool rval = 0;                                                          \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));   \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          return rval;                                                            \
      }
  
  
          return rval;                                                            \
      }
  
  
-// TODO: unicode fix
  #define PYCALLBACK_STRING_INTINT_pure(CBNAME)                                   \
      wxString CBNAME(int a, int b) {                                             \
  #define PYCALLBACK_STRING_INTINT_pure(CBNAME)                                   \
      wxString CBNAME(int a, int b) {                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          wxString rval;                                                          \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b));  \
              if (ro) {                                                           \
          wxString rval;                                                          \
          if (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 = PyString_AsString(str);                                  \
-                Py_DECREF(ro);  Py_DECREF(str);                                 \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          return rval;                                                            \
      }
  
  
          return rval;                                                            \
      }
  
  
-// TODO: unicode fix
  #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
      void CBNAME(int a, int b, const wxString& c) {                              \
  #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
      void CBNAME(int a, int b, const wxString& c) {                              \
-        wxPyBeginBlockThreads();                            \
-        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));\
-        wxPyEndBlockThreads();                                             \
+        wxPyBlock_t blocked = 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(blocked);                                           \
      }
  
      }
  
-// TODO: unicode fix
+
  #define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME)                                \
      wxString CBNAME(int a, int b) {                                             \
          bool found;                                                             \
  #define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME)                                \
      wxString CBNAME(int a, int b) {                                             \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          wxString rval;                                                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b));  \
              if (ro) {                                                           \
          wxString 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 = PyString_AsString(str);                                  \
-                Py_DECREF(ro);  Py_DECREF(str);                                 \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b);                                        \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b);                                        \
          return rval;                                                            \
-    }                                                                           \
-    wxString base_##CBNAME(int a, int b) {                                      \
-        return PCLASS::CBNAME(a, b);                                            \
-    }
+    }               
  
  
  
  
-// TODO: unicode fix
  #define PYCALLBACK_BOOL_INTINTSTRING(PCLASS, CBNAME)                            \
      bool CBNAME(int a, int b, const wxString& c)  {                             \
          bool rval = 0;                                                          \
          bool found;                                                             \
  #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)))                  \
-            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)", a,b,c.c_str()));\
-        wxPyEndBlockThreads();                                             \
+        wxPyBlock_t blocked = 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(blocked);                                           \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b,c);                                       \
          return rval;                                                            \
          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);                                           \
-    }
+    }              
  
  
  
  
  
  
@@ -208,42 +242,35 @@
      long CBNAME(int a, int b)  {                                                \
          long rval;                                                              \
          bool found;                                                             \
      long CBNAME(int a, int b)  {                                                \
          long rval;                                                              \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
          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 = 0;                                                          \
          bool found;                                                             \
  
  
  #define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME)                                  \
      bool CBNAME(int a, int b)  {                                                \
          bool rval = 0;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
          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 found;                                                             \
  
  
  
  #define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME)                                \
      double CBNAME(int a, int b) {                                               \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          double rval;                                                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
          double rval;                                                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
@@ -254,31 +281,24 @@
                  Py_DECREF(ro);   Py_DECREF(str);                                \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);   Py_DECREF(str);                                \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a, b);                                        \
          return rval;                                                            \
          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 found;                                                             \
  
  
  
  #define PYCALLBACK__(PCLASS, CBNAME)                                            \
      void CBNAME()  {                                                            \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              PCLASS::CBNAME();                                                   \
          if (! found)                                                            \
              PCLASS::CBNAME();                                                   \
-    }                                                                           \
-    void base_##CBNAME() {                                                      \
-        PCLASS::CBNAME();                                                       \
-    }
-
+    }               
  
  
  
  
  
  
@@ -286,17 +306,14 @@
      bool CBNAME(size_t a, size_t b)  {                                          \
          bool rval = 0;                                                          \
          bool found;                                                             \
      bool CBNAME(size_t a, size_t b)  {                                          \
          bool rval = 0;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
-    }                                                                           \
-    bool base_##CBNAME(size_t a, size_t b) {                                    \
-        return PCLASS::CBNAME(a,b);                                             \
-    }
+    }          
  
  
  
  
  
  
@@ -304,58 +321,49 @@
      bool CBNAME(size_t a)  {                                                    \
          bool rval = 0;                                                          \
          bool found;                                                             \
      bool CBNAME(size_t a)  {                                                    \
          bool rval = 0;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));     \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));     \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
-    }                                                                           \
-    bool base_##CBNAME(size_t a) {                                              \
-        return PCLASS::CBNAME(a);                                               \
-    }
+    }           
  
  
  
  
-// TODO: unicode fix
  #define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                                   \
      wxString CBNAME(int a) {                                                    \
          bool found;                                                             \
  #define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                                   \
      wxString CBNAME(int a) {                                                    \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          wxString rval;                                                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)",a));     \
              if (ro) {                                                           \
          wxString rval;                                                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)",a));     \
              if (ro) {                                                           \
-                PyObject* str = PyObject_Str(ro);                               \
-                rval = PyString_AsString(str);                                  \
-                Py_DECREF(ro);   Py_DECREF(str);                                \
+                rval = Py2wxString(ro);                                         \
+                Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
-    }                                                                           \
-    wxString base_##CBNAME(int a) {                                             \
-        return PCLASS::CBNAME(a);                                               \
-    }
+    }          
  
  
  
  
-// TODO: unicode fix
  #define PYCALLBACK__INTSTRING(PCLASS, CBNAME)                                   \
      void CBNAME(int a, const wxString& c)  {                                    \
          bool found;                                                             \
  #define PYCALLBACK__INTSTRING(PCLASS, CBNAME)                                   \
      void CBNAME(int a, const wxString& c)  {                                    \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
-        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(is)", a,c.c_str())); \
-        wxPyEndBlockThreads();                                             \
+        wxPyBlock_t blocked = 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(blocked);                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,c);                                                \
          if (! found)                                                            \
              PCLASS::CBNAME(a,c);                                                \
-    }                                                                           \
-    void base_##CBNAME(int a, const wxString& c) {                              \
-        PCLASS::CBNAME(a,c);                                                    \
-    }
+    }           
  
  
  
  
  
  
@@ -364,33 +372,27 @@
      bool CBNAME()  {                                                            \
          bool rval = 0;                                                          \
          bool found;                                                             \
      bool CBNAME()  {                                                            \
          bool rval = 0;                                                          \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
          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 found;                                                             \
  
  
  
  #define PYCALLBACK__SIZETINT(PCLASS, CBNAME)                                    \
      void CBNAME(size_t a, int b)  {                                             \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));         \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));         \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b);                                                \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b);                                                \
-    }                                                                           \
-    void base_##CBNAME(size_t a, int b) {                                       \
-        PCLASS::CBNAME(a,b);                                                    \
-    }
+    }        
  
  
  
  
  
  
@@ -398,16 +400,13 @@
  #define PYCALLBACK__INTINTLONG(PCLASS, CBNAME)                                  \
      void CBNAME(int a, int b, long c)  {                                        \
          bool found;                                                             \
  #define PYCALLBACK__INTINTLONG(PCLASS, CBNAME)                                  \
      void CBNAME(int a, int b, long c)  {                                        \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
-    }                                                                           \
-    void base_##CBNAME(int a, int b, long c) {                                  \
-        PCLASS::CBNAME(a,b,c);                                                  \
-    }
+    }          
  
  
  
  
  
  
@@ -415,33 +414,26 @@
  #define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME)                                \
      void CBNAME(int a, int b, double c)  {                                      \
          bool found;                                                             \
  #define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME)                                \
      void CBNAME(int a, int b, double c)  {                                      \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c));      \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c));      \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
          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 found;                                                             \
  
  
  
  #define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME)                                  \
      void CBNAME(int a, int b, bool c)  {                                        \
          bool found;                                                             \
-        wxPyBeginBlockThreads();                            \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
-    }                                                                           \
-    void base_##CBNAME(int a, int b, bool c) {                                  \
-        PCLASS::CBNAME(a,b,c);                                                  \
-    }
-
+    }         
  
  
  
  
  
  
@@ -452,8 +444,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"
@@ -461,39 +451,93 @@ 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;
+
+
+%{
+#define wxGRID_DEFAULT_NUMBER_ROWS        WXGRID_DEFAULT_NUMBER_ROWS
+#define wxGRID_DEFAULT_NUMBER_COLS        WXGRID_DEFAULT_NUMBER_COLS
+#define wxGRID_DEFAULT_ROW_HEIGHT         WXGRID_DEFAULT_ROW_HEIGHT
+#define wxGRID_DEFAULT_COL_WIDTH          WXGRID_DEFAULT_COL_WIDTH
+#define wxGRID_DEFAULT_COL_LABEL_HEIGHT   WXGRID_DEFAULT_COL_LABEL_HEIGHT
+#define wxGRID_DEFAULT_ROW_LABEL_WIDTH    WXGRID_DEFAULT_ROW_LABEL_WIDTH
+#define wxGRID_LABEL_EDGE_ZONE            WXGRID_LABEL_EDGE_ZONE
+#define wxGRID_MIN_ROW_HEIGHT             WXGRID_MIN_ROW_HEIGHT
+#define wxGRID_MIN_COL_WIDTH              WXGRID_MIN_COL_WIDTH
+#define wxGRID_DEFAULT_SCROLLBAR_WIDTH    WXGRID_DEFAULT_SCROLLBAR_WIDTH
+%}
+
+enum {
+    wxGRID_DEFAULT_NUMBER_ROWS,
+    wxGRID_DEFAULT_NUMBER_COLS,
+    wxGRID_DEFAULT_ROW_HEIGHT,
+    wxGRID_DEFAULT_COL_WIDTH,
+    wxGRID_DEFAULT_COL_LABEL_HEIGHT,
+    wxGRID_DEFAULT_ROW_LABEL_WIDTH,
+    wxGRID_LABEL_EDGE_ZONE,
+    wxGRID_MIN_ROW_HEIGHT,
+    wxGRID_MIN_COL_WIDTH,
+    wxGRID_DEFAULT_SCROLLBAR_WIDTH
+};
  
  
  //---------------------------------------------------------------------------
  
  
  //---------------------------------------------------------------------------
-// wxGridCellRenderer is an ABC, and several derived classes are available.
-// Classes implemented in Python should be derived from wxPyGridCellRenderer.
  
  
+// TODO: Use these to have SWIG automatically handle the IncRef/DecRef calls:
+// 
+//        %ref   wxGridCellWorker "$this->IncRef();";
+//        %unref wxGridCellWorker "$this->DecRef();";
+//
  
  
-class wxGridCellRenderer
+class  wxGridCellWorker
  {
  public:
  {
  public:
+    %extend {
+        void _setOORInfo(PyObject* _self) {
+            if (!self->GetClientObject())
+                self->SetClientObject(new wxPyOORClientData(_self));
+        }
+
+        // A dummy dtor to shut up SWIG.  (The real one is protected and can
+        // only be called by DecRef)
+        ~wxGridCellWorker() {
+        }
+    }
+
      void SetParameters(const wxString& params);
      void IncRef();
      void DecRef();
      void SetParameters(const wxString& params);
      void IncRef();
      void DecRef();
+};
+
+
+
+// wxGridCellRenderer is an ABC, and several derived classes are available.
+// Classes implemented in Python should be derived from wxPyGridCellRenderer.
  
  
+class wxGridCellRenderer : public wxGridCellWorker
+{
      virtual void Draw(wxGrid& grid,
                        wxGridCellAttr& attr,
                        wxDC& dc,
                        const wxRect& rect,
                        int row, int col,
      virtual void Draw(wxGrid& grid,
                        wxGridCellAttr& attr,
                        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;
  };
  
  
  };
  
  
+
  // The C++ version of wxPyGridCellRenderer
  %{
  class wxPyGridCellRenderer : public wxGridCellRenderer
  // The C++ version of wxPyGridCellRenderer
  %{
  class wxPyGridCellRenderer : public wxGridCellRenderer
@@ -505,57 +549,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) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Draw")) {
          if (wxPyCBH_findCallback(m_myInst, "Draw")) {
-            wxPyCBH_callCallback(m_myInst,
-                Py_BuildValue("(OOOOiii)",
-                              wxPyConstructObject((void*)&grid, "wxGrid", 0),
-                              wxPyConstructObject((void*)&attr, "wxGridCellAttr", 0),
-                              wxPyConstructObject((void*)&dc,   "wxDC", 0),
-                              wxPyConstructObject((void*)&rect, "wxRect", 0),
-                              row, col, isSelected));
+            PyObject* go = wxPyMake_wxObject(&grid,false);
+            PyObject* dco = wxPyMake_wxObject(&dc,false);
+            PyObject* ao = wxPyMake_wxGridCellAttr(&attr,false);
+            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);
          }
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
      }
  
      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;
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
              PyObject* ro;
              wxSize*   ptr;
          if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
              PyObject* ro;
              wxSize*   ptr;
-            ro = wxPyCBH_callCallbackObj(m_myInst,
-                Py_BuildValue("(OOOii)",
-                              wxPyConstructObject((void*)&grid, "wxGrid", 0),
-                              wxPyConstructObject((void*)&attr, "wxGridCellAttr", 0),
-                              wxPyConstructObject((void*)&dc,   "wxDC", 0),
-                              row, col));
+            PyObject* go = wxPyMake_wxObject(&grid,false);
+            PyObject* dco = wxPyMake_wxObject(&dc,false);
+            PyObject* ao = wxPyMake_wxGridCellAttr(&attr,false);
+
+            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);
              }
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
          return rval;
      }
  
  
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
          return rval;
      }
  
  
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellRenderer* ptr;
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
              if (ro) {
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellRenderer* ptr;
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
              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);
              }
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
          return rval;
      }
  
          return rval;
      }
  
@@ -572,11 +640,13 @@ 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:
+    %pythonAppend wxPyGridCellRenderer  "self._setCallbackInfo(self, PyGridCellRenderer);self._setOORInfo(self)"
+
      wxPyGridCellRenderer();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
      wxPyGridCellRenderer();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellRenderer)"
  
  
-    void base_SetParameters(const wxString& params);
+    void SetParameters(const wxString& params);
+    %MAKE_BASE_FUNC(PyGridCellRenderer, SetParameters);
  };
  
  //---------------------------------------------------------------------------
  };
  
  //---------------------------------------------------------------------------
@@ -585,6 +655,7 @@ public:
  class wxGridCellStringRenderer : public wxGridCellRenderer
  {
  public:
  class wxGridCellStringRenderer : public wxGridCellRenderer
  {
  public:
+    %pythonAppend wxGridCellStringRenderer "self._setOORInfo(self)"
      wxGridCellStringRenderer();
  };
  
      wxGridCellStringRenderer();
  };
  
@@ -592,6 +663,7 @@ public:
  class  wxGridCellNumberRenderer : public wxGridCellStringRenderer
  {
  public:
  class  wxGridCellNumberRenderer : public wxGridCellStringRenderer
  {
  public:
+    %pythonAppend wxGridCellNumberRenderer "self._setOORInfo(self)"
      wxGridCellNumberRenderer();
  };
  
      wxGridCellNumberRenderer();
  };
  
@@ -599,6 +671,7 @@ public:
  class  wxGridCellFloatRenderer : public wxGridCellStringRenderer
  {
  public:
  class  wxGridCellFloatRenderer : public wxGridCellStringRenderer
  {
  public:
+    %pythonAppend wxGridCellFloatRenderer "self._setOORInfo(self)"
      wxGridCellFloatRenderer(int width = -1, int precision = -1);
  
      int GetWidth() const;
      wxGridCellFloatRenderer(int width = -1, int precision = -1);
  
      int GetWidth() const;
@@ -611,6 +684,7 @@ public:
  class  wxGridCellBoolRenderer : public wxGridCellRenderer
  {
  public:
  class  wxGridCellBoolRenderer : public wxGridCellRenderer
  {
  public:
+    %pythonAppend wxGridCellBoolRenderer "self._setOORInfo(self)"
      wxGridCellBoolRenderer();
  };
  
      wxGridCellBoolRenderer();
  };
  
@@ -618,21 +692,24 @@ public:
  class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
  {
  public:
  class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
  {
  public:
-    wxGridCellDateTimeRenderer(wxString outformat = "%c",
-                               wxString informat =  "%c");
+    %pythonAppend wxGridCellDateTimeRenderer "self._setOORInfo(self)"
+    wxGridCellDateTimeRenderer(wxString outformat = wxPyDefaultDateTimeFormat,
+                               wxString informat =  wxPyDefaultDateTimeFormat);
  };
  
  
  class wxGridCellEnumRenderer : public wxGridCellStringRenderer
  {
  public:
  };
  
  
  class wxGridCellEnumRenderer : public wxGridCellStringRenderer
  {
  public:
-    wxGridCellEnumRenderer( const wxString& choices = "" );
+    %pythonAppend wxGridCellEnumRenderer "self._setOORInfo(self)"
+    wxGridCellEnumRenderer( const wxString& choices = wxPyEmptyString );
  };
  
  
  class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
  {
  public:
  };
  
  
  class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
  {
  public:
+    %pythonAppend wxGridCellAutoWrapStringRenderer "self._setOORInfo(self)"
      wxGridCellAutoWrapStringRenderer();
  };
  
      wxGridCellAutoWrapStringRenderer();
  };
  
@@ -641,24 +718,23 @@ public:
  // wxGridCellEditor is an ABC, and several derived classes are available.
  // Classes implemented in Python should be derived from wxPyGridCellEditor.
  
  // wxGridCellEditor is an ABC, and several derived classes are available.
  // Classes implemented in Python should be derived from wxPyGridCellEditor.
  
-class  wxGridCellEditor
+class  wxGridCellEditor : public wxGridCellWorker
  {
  public:
      bool IsCreated();
      wxControl* GetControl();
      void SetControl(wxControl* control);
  
  {
  public:
      bool IsCreated();
      wxControl* GetControl();
      void SetControl(wxControl* control);
  
-    void SetParameters(const wxString& params);
-    void IncRef();
-    void DecRef();
+    wxGridCellAttr* GetCellAttr();
+    void SetCellAttr(wxGridCellAttr* attr);
  
      virtual void Create(wxWindow* parent,
                          wxWindowID id,
  
      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);
@@ -667,6 +743,8 @@ public:
      virtual void StartingKey(wxKeyEvent& event);
      virtual void StartingClick();
      virtual void HandleReturn(wxKeyEvent& event);
      virtual void StartingKey(wxKeyEvent& event);
      virtual void StartingClick();
      virtual void HandleReturn(wxKeyEvent& event);
+
+    %pythonAppend Destroy "args[0].thisown = 0"
      virtual void Destroy();
  
  };
      virtual void Destroy();
  
  };
@@ -680,91 +758,91 @@ public:
      wxPyGridCellEditor() : wxGridCellEditor() {}
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
      wxPyGridCellEditor() : wxGridCellEditor() {}
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Create")) {
          if (wxPyCBH_findCallback(m_myInst, "Create")) {
-            wxPyCBH_callCallback(m_myInst,
-                Py_BuildValue("(OiO)",
-                              wxPyConstructObject((void*)parent, "wxWindow", 0),
-                              id,
-                              wxPyConstructObject((void*)evtHandler, "wxEvtHandler", 0)));
+            PyObject* po = wxPyMake_wxObject(parent,false);
+            PyObject* eo = wxPyMake_wxObject(evtHandler,false);
+
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiO)", po, id, eo));
+            Py_DECREF(po);
+            Py_DECREF(eo);
          }
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
      }
  
  
      void BeginEdit(int row, int col, wxGrid* grid) {
      }
  
  
      void BeginEdit(int row, int col, wxGrid* grid) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
          if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
-            wxPyCBH_callCallback(m_myInst,
-                Py_BuildValue("(iiO)", row, col,
-                              wxPyConstructObject((void*)grid, "wxGrid", 0)));
+            PyObject* go = wxPyMake_wxObject(grid,false);
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
+            Py_DECREF(go);
          }
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
      }
  
  
      bool EndEdit(int row, int col, wxGrid* grid) {
      }
  
  
      bool EndEdit(int row, int col, wxGrid* grid) {
-        bool rv = FALSE;
-        wxPyBeginBlockThreads();
+        bool rv = false;
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
          if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
-            rv = wxPyCBH_callCallback(m_myInst,
-                Py_BuildValue("(iiO)", row, col,
-                              wxPyConstructObject((void*)grid, "wxGrid", 0)));
+            PyObject* go = wxPyMake_wxObject(grid,false);
+            rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
+            Py_DECREF(go);
          }
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
          return rv;
      }
  
  
          return rv;
      }
  
  
-    wxGridCellEditor*Clone() const {
+    wxGridCellEditor* Clone() const {
          wxGridCellEditor* rval = NULL;
          wxGridCellEditor* rval = NULL;
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellEditor* ptr;
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
              if (ro) {
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellEditor* ptr;
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
              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);
              }
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
          return rval;
      }
  
  
      void Show(bool show, wxGridCellAttr *attr) {
          bool found;
          return rval;
      }
  
  
      void Show(bool show, wxGridCellAttr *attr) {
          bool found;
-        wxPyBeginBlockThreads();
-        if ((found = wxPyCBH_findCallback(m_myInst, "Show")))
-            wxPyCBH_callCallback(m_myInst,
-                Py_BuildValue("(iO)", show,
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
-        wxPyEndBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) {
+            PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao));
+            Py_DECREF(ao);
+        }
+        wxPyEndBlockThreads(blocked);
          if (! found)
              wxGridCellEditor::Show(show, attr);
      }
          if (! found)
              wxGridCellEditor::Show(show, attr);
      }
-    void base_Show(bool show, wxGridCellAttr *attr) {
-        wxGridCellEditor::Show(show, attr);
-    }
  
  
      void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
  
  
      void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
-        bool found;                                                             \
-        wxPyBeginBlockThreads();
-        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)")))
-            wxPyCBH_callCallback(m_myInst,
-                Py_BuildValue("(OO)",
-                              wxPyConstructObject((void*)&rectCell, "wxRect", 0),
-                              wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
-        wxPyEndBlockThreads();
+        bool found;
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
+            PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
+            PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);
+
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", ro, ao));
+
+            Py_DECREF(ro);
+            Py_DECREF(ao);
+        }
+        wxPyEndBlockThreads(blocked);
          if (! found)
              wxGridCellEditor::PaintBackground(rectCell, attr);
      }
          if (! found)
              wxGridCellEditor::PaintBackground(rectCell, attr);
      }
-    void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
-        wxGridCellEditor::PaintBackground(rectCell, attr);
-    }
  
  
      DEC_PYCALLBACK___pure(Reset);
  
  
      DEC_PYCALLBACK___pure(Reset);
@@ -775,6 +853,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;
  };
@@ -788,6 +867,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);
  
  %}
  
  
  %}
  
@@ -795,19 +875,30 @@ 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:
+    %pythonAppend wxPyGridCellEditor  "self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)"
+
      wxPyGridCellEditor();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
      wxPyGridCellEditor();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellEditor)"
-
-    void base_SetSize(const wxRect& rect);
-    void base_Show(bool show, wxGridCellAttr *attr = NULL);
-    void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
-    void base_IsAcceptedKey(wxKeyEvent& event);
-    void base_StartingKey(wxKeyEvent& event);
-    void base_StartingClick();
-    void base_HandleReturn(wxKeyEvent& event);
-    void base_Destroy();
-    void base_SetParameters(const wxString& params);
+
+    void SetSize(const wxRect& rect);
+    void Show(bool show, wxGridCellAttr *attr = NULL);
+    void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
+    bool IsAcceptedKey(wxKeyEvent& event);
+    void StartingKey(wxKeyEvent& event);
+    void StartingClick();
+    void HandleReturn(wxKeyEvent& event);
+    void Destroy();
+    void SetParameters(const wxString& params);
+
+    %MAKE_BASE_FUNC(PyGridCellEditor, SetSize);
+    %MAKE_BASE_FUNC(PyGridCellEditor, Show);
+    %MAKE_BASE_FUNC(PyGridCellEditor, PaintBackground);
+    %MAKE_BASE_FUNC(PyGridCellEditor, IsAcceptedKey);
+    %MAKE_BASE_FUNC(PyGridCellEditor, StartingKey);
+    %MAKE_BASE_FUNC(PyGridCellEditor, StartingClick);
+    %MAKE_BASE_FUNC(PyGridCellEditor, HandleReturn);
+    %MAKE_BASE_FUNC(PyGridCellEditor, Destroy);
+    %MAKE_BASE_FUNC(PyGridCellEditor, SetParameters);
  };
  
  //---------------------------------------------------------------------------
  };
  
  //---------------------------------------------------------------------------
@@ -816,50 +907,64 @@ public:
  class wxGridCellTextEditor : public wxGridCellEditor
  {
  public:
  class wxGridCellTextEditor : public wxGridCellEditor
  {
  public:
+    %pythonAppend wxGridCellTextEditor  "self._setOORInfo(self)"
      wxGridCellTextEditor();
      wxGridCellTextEditor();
+    virtual wxString GetValue();
  };
  
  
  class wxGridCellNumberEditor : public wxGridCellTextEditor
  {
  public:
  };
  
  
  class wxGridCellNumberEditor : public wxGridCellTextEditor
  {
  public:
+    %pythonAppend 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:
-    wxGridCellFloatEditor();
+    %pythonAppend wxGridCellFloatEditor  "self._setOORInfo(self)"
+    wxGridCellFloatEditor(int width = -1, int precision = -1);
+    virtual wxString GetValue();
  };
  
  
  class wxGridCellBoolEditor : public wxGridCellEditor
  {
  public:
  };
  
  
  class wxGridCellBoolEditor : public wxGridCellEditor
  {
  public:
+    %pythonAppend 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);
+    %pythonAppend wxGridCellChoiceEditor  "self._setOORInfo(self)"
+    wxGridCellChoiceEditor(int choices = 0,
+                           const wxString* choices_array = NULL,
+                           bool allowOthers = false);
+    virtual wxString GetValue();
  };
  
  
  class wxGridCellEnumEditor : public wxGridCellChoiceEditor
  {
  public:
  };
  
  
  class wxGridCellEnumEditor : public wxGridCellChoiceEditor
  {
  public:
-    wxGridCellEnumEditor( const wxString& choices = "" );
+    %pythonAppend wxGridCellEnumEditor  "self._setOORInfo(self)"
+    wxGridCellEnumEditor( const wxString& choices = wxPyEmptyString );
+    virtual wxString GetValue();
  };
  
  
  class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
  {
  public:
  };
  
  
  class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
  {
  public:
+    %pythonAppend wxGridCellAutoWrapStringEditor  "self._setOORInfo(self)"
      wxGridCellAutoWrapStringEditor();
      wxGridCellAutoWrapStringEditor();
+    virtual wxString GetValue();
  };
  
  
  };
  
  
@@ -880,17 +985,37 @@ public:
          Merged
      };
  
          Merged
      };
  
+    %extend {
+        void _setOORInfo(PyObject* _self) {
+            if (!self->GetClientObject())
+                self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }
+
+    %pythonAppend wxGridCellAttr  "self._setOORInfo(self)"
+
      wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
  
      wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
  
+    %extend {
+        // A dummy dtor to shut up SWIG.  (The real one is protected and can
+        // only be called by DecRef)
+        ~wxGridCellAttr() {
+        }
+    }
+    
      wxGridCellAttr *Clone() const;
      void MergeWith(wxGridCellAttr *mergefrom);
      wxGridCellAttr *Clone() const;
      void MergeWith(wxGridCellAttr *mergefrom);
+    
      void IncRef();
      void DecRef();
      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 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);
@@ -903,15 +1028,26 @@ public:
      bool HasRenderer() const;
      bool HasEditor() const;
      bool HasReadWriteMode() const;
      bool HasRenderer() const;
      bool HasEditor() const;
      bool HasReadWriteMode() const;
+    bool HasOverflowMode() const;
  
      wxColour GetTextColour() const;
      wxColour GetBackgroundColour() const;
      wxFont GetFont() const;
  
      wxColour GetTextColour() const;
      wxColour GetBackgroundColour() const;
      wxFont GetFont() const;
-    void GetAlignment(int *OUTPUT, int *OUTPUT) 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;
  
      bool IsReadOnly() const;
      wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
      wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
  
      bool IsReadOnly() const;
+    wxAttrKind GetKind();
      void SetDefAttr(wxGridCellAttr* defAttr);
  };
  
      void SetDefAttr(wxGridCellAttr* defAttr);
  };
  
@@ -920,9 +1056,17 @@ public:
  class wxGridCellAttrProvider
  {
  public:
  class wxGridCellAttrProvider
  {
  public:
+    %pythonAppend wxGridCellAttrProvider "self._setOORInfo(self)"
      wxGridCellAttrProvider();
      // ???? virtual ~wxGridCellAttrProvider();
  
      wxGridCellAttrProvider();
      // ???? virtual ~wxGridCellAttrProvider();
  
+    %extend {
+        void _setOORInfo(PyObject* _self) {
+            if (!self->GetClientObject())
+                self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }
+
      wxGridCellAttr *GetAttr(int row, int col,
                              wxGridCellAttr::wxAttrKind  kind) const;
      void SetAttr(wxGridCellAttr *attr, int row, int col);
      wxGridCellAttr *GetAttr(int row, int col,
                              wxGridCellAttr::wxAttrKind  kind) const;
      void SetAttr(wxGridCellAttr *attr, int row, int col);
@@ -956,15 +1100,20 @@ public:
  class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
  {
  public:
  class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
  {
  public:
+    %pythonAppend wxPyGridCellAttrProvider  "self._setCallbackInfo(self, PyGridCellAttrProvider)"
      wxPyGridCellAttrProvider();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
      wxPyGridCellAttrProvider();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellAttrProvider)"
  
  
-    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);
+    wxGridCellAttr *GetAttr(int row, int col,
+                            wxGridCellAttr::wxAttrKind kind);
+    void SetAttr(wxGridCellAttr *attr, int row, int col);
+    void SetRowAttr(wxGridCellAttr *attr, int row);
+    void SetColAttr(wxGridCellAttr *attr, int col);
+
+    %MAKE_BASE_FUNC(PyGridCellAttrProvider, GetAttr);
+    %MAKE_BASE_FUNC(PyGridCellAttrProvider, SetAttr);
+    %MAKE_BASE_FUNC(PyGridCellAttrProvider, SetRowAttr);
+    %MAKE_BASE_FUNC(PyGridCellAttrProvider, SetColAttr);
  };
  
  
  };
  
  
@@ -972,12 +1121,18 @@ public:
  // Grid Table Base class and Python aware version
  
  
  // Grid Table Base class and Python aware version
  
  
-
  class wxGridTableBase : public wxObject
  {
  public:
      // wxGridTableBase();   This is an ABC
  class wxGridTableBase : public wxObject
  {
  public:
      // wxGridTableBase();   This is an ABC
-    //~wxGridTableBase();
+    ~wxGridTableBase();
+
+    %extend {
+        void _setOORInfo(PyObject* _self) {
+            if (!self->GetClientObject())
+                self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }
  
      void SetAttrProvider(wxGridCellAttrProvider *attrProvider);
      wxGridCellAttrProvider *GetAttrProvider() const;
  
      void SetAttrProvider(wxGridCellAttrProvider *attrProvider);
      wxGridCellAttrProvider *GetAttrProvider() const;
@@ -986,11 +1141,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 );
@@ -1064,37 +1219,33 @@ public:
  
  
      wxString GetValue(int row, int col) {
  
  
      wxString GetValue(int row, int col) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          wxString rval;
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",row,col));
              if (ro) {
          wxString rval;
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",row,col));
              if (ro) {
-#if wxUSE_UNICODE
-             PyObject* str = PyObject_Unicode(ro);
-             rval = PyUnicode_AS_UNICODE(str);
-#else
-             PyObject* str = PyObject_Str(ro);
-             rval = PyString_AsString(str);
-#endif
+                if (!PyString_Check(ro) && !PyUnicode_Check(ro)) {
+                    PyObject* old = ro;
+                    ro = PyObject_Str(ro);
+                    Py_DECREF(old);
+                }
+                rval = Py2wxString(ro);
                  Py_DECREF(ro);
                  Py_DECREF(ro);
-                Py_DECREF(str);
              }
          }
              }
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
          return rval;
      }
  
      void SetValue(int row, int col, const wxString& val) {
          return rval;
      }
  
      void SetValue(int row, int col, const wxString& val) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
-#if wxUSE_UNICODE
-         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiu)",row,col,val.c_str()));
-#else
-         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",row,col,val.c_str()));
-#endif
+            PyObject* s = wx2PyString(val);
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,s));
+            Py_DECREF(s);
         }
         }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
      }
  
  
      }
  
  
@@ -1102,7 +1253,7 @@ 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;
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
@@ -1116,13 +1267,13 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
          return rval;
      }
  
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
          return rval;
      }
  
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              PyObject* num;
@@ -1136,7 +1287,7 @@ public:
                  Py_DECREF(ro);
              }
          }
                  Py_DECREF(ro);
              }
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
          return rval;
      }
  
          return rval;
      }
  
@@ -1145,19 +1296,19 @@ public:
      }
  
      void SetValueAsLong( int row, int col, long value ) {
      }
  
      void SetValueAsLong( int row, int col, long value ) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
          }
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
      }
  
      void SetValueAsDouble( int row, int col, double value ) {
      }
  
      void SetValueAsDouble( int row, int col, double value ) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
          }
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
          }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
      }
  
      void SetValueAsBool( int row, int col, bool value ) {
      }
  
      void SetValueAsBool( int row, int col, bool value ) {
@@ -1174,32 +1325,53 @@ public:
  class wxPyGridTableBase : public wxGridTableBase
  {
  public:
  class wxPyGridTableBase : public wxGridTableBase
  {
  public:
+    %pythonAppend wxPyGridTableBase "self._setCallbackInfo(self, PyGridTableBase);self._setOORInfo(self)"
      wxPyGridTableBase();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
      wxPyGridTableBase();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridTableBase)"
-
-    %addmethods { void Destroy() { delete self; } }
-
-    wxString base_GetTypeName( int row, int col );
-    bool base_CanGetValueAs( int row, int col, const wxString& typeName );
-    bool base_CanSetValueAs( int row, int col, const wxString& typeName );
-    void base_Clear();
-    bool base_InsertRows( size_t pos = 0, size_t numRows = 1 );
-    bool base_AppendRows( size_t numRows = 1 );
-    bool base_DeleteRows( size_t pos = 0, size_t numRows = 1 );
-    bool base_InsertCols( size_t pos = 0, size_t numCols = 1 );
-    bool base_AppendCols( size_t numCols = 1 );
-    bool base_DeleteCols( size_t pos = 0, size_t numCols = 1 );
-    wxString base_GetRowLabelValue( int row );
-    wxString base_GetColLabelValue( int col );
-    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,
+
+    %pythonAppend Destroy "args[0].thisown = 0"
+    %extend { void Destroy() { delete self; } }
+
+    wxString GetTypeName( int row, int col );
+    bool CanGetValueAs( int row, int col, const wxString& typeName );
+    bool CanSetValueAs( int row, int col, const wxString& typeName );
+    void Clear();
+    bool InsertRows( size_t pos = 0, size_t numRows = 1 );
+    bool AppendRows( size_t numRows = 1 );
+    bool DeleteRows( size_t pos = 0, size_t numRows = 1 );
+    bool InsertCols( size_t pos = 0, size_t numCols = 1 );
+    bool AppendCols( size_t numCols = 1 );
+    bool DeleteCols( size_t pos = 0, size_t numCols = 1 );
+    wxString GetRowLabelValue( int row );
+    wxString GetColLabelValue( int col );
+    void SetRowLabelValue( int row, const wxString& value );
+    void SetColLabelValue( int col, const wxString& value );
+    bool CanHaveAttributes();
+    wxGridCellAttr *GetAttr( int row, int col,
                                    wxGridCellAttr::wxAttrKind kind );
                                    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 SetAttr(wxGridCellAttr* attr, int row, int col);
+    void SetRowAttr(wxGridCellAttr *attr, int row);
+    void SetColAttr(wxGridCellAttr *attr, int col);
+
+    %MAKE_BASE_FUNC(PyGridTableBase, GetTypeName);
+    %MAKE_BASE_FUNC(PyGridTableBase, CanGetValueAs);
+    %MAKE_BASE_FUNC(PyGridTableBase, CanSetValueAs);
+    %MAKE_BASE_FUNC(PyGridTableBase, Clear);
+    %MAKE_BASE_FUNC(PyGridTableBase, InsertRows);
+    %MAKE_BASE_FUNC(PyGridTableBase, AppendRows);
+    %MAKE_BASE_FUNC(PyGridTableBase, DeleteRows);
+    %MAKE_BASE_FUNC(PyGridTableBase, InsertCols);
+    %MAKE_BASE_FUNC(PyGridTableBase, AppendCols);
+    %MAKE_BASE_FUNC(PyGridTableBase, DeleteCols);
+    %MAKE_BASE_FUNC(PyGridTableBase, GetRowLabelValue);
+    %MAKE_BASE_FUNC(PyGridTableBase, GetColLabelValue);
+    %MAKE_BASE_FUNC(PyGridTableBase, SetRowLabelValue);
+    %MAKE_BASE_FUNC(PyGridTableBase, SetColLabelValue);
+    %MAKE_BASE_FUNC(PyGridTableBase, CanHaveAttributes);
+    %MAKE_BASE_FUNC(PyGridTableBase, GetAttr);
+    %MAKE_BASE_FUNC(PyGridTableBase, SetAttr);
+    %MAKE_BASE_FUNC(PyGridTableBase, SetRowAttr);
+    %MAKE_BASE_FUNC(PyGridTableBase, SetColAttr);
  };
  
  
  };
  
  
@@ -1209,6 +1381,7 @@ public:
  class  wxGridStringTable : public wxGridTableBase
  {
  public:
  class  wxGridStringTable : public wxGridTableBase
  {
  public:
+    %pythonAppend wxGridStringTable "self._setOORInfo(self)"
      wxGridStringTable( int numRows=0, int numCols=0 );
  };
  
      wxGridStringTable( int numRows=0, int numCols=0 );
  };
  
@@ -1250,67 +1423,166 @@ public:
  
  //---------------------------------------------------------------------------
  
  
  //---------------------------------------------------------------------------
  
-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; }
-
-    %addmethods {
-        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())"
-};
  
  // 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) {
  
  // ...and here is the associated helper.
  %{
  bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
  
+    if (source == Py_None) {
+        **obj = wxGridCellCoords(-1,-1);
+        return true;
+    }
+
      // If source is an object instance then it may already be the right type
      // 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;
  }
  %}
  
  }
  %}
  
+
+
+
+
+class wxGridCellCoords
+{
+public:
+    wxGridCellCoords( int r=-1, int c=-1 );
+    ~wxGridCellCoords();
+
+    int GetRow() const;
+    void SetRow( int n );
+    int GetCol() const;
+    void SetCol( int n );
+    void Set( int row, int col );
+
+    %extend {
+        KeepGIL(__eq__);
+        DocStr(__eq__, "Test for equality of GridCellCoords objects.", "");
+        bool __eq__(PyObject* other) {
+            wxGridCellCoords  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGridCellCoords_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+
+        
+        KeepGIL(__ne__);
+        DocStr(__ne__, "Test for inequality of GridCellCoords objects.", "");
+        bool __ne__(PyObject* other) {
+            wxGridCellCoords  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGridCellCoords_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }
+    }
+
+
+    %extend {
+        PyObject* Get() {
+            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;
+        }
+    }
+    %pythoncode {
+    asTuple = wx._deprecated(Get, "asTuple is deprecated, use `Get` instead")
+    def __str__(self):                   return str(self.Get())
+    def __repr__(self):                  return 'wxGridCellCoords'+str(self.Get())
+    def __len__(self):                   return len(self.Get())
+    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
+    }
+
+};
+
+
  //---------------------------------------------------------------------------
  //---------------------------------------------------------------------------
  // The grid itself
  //---------------------------------------------------------------------------
  //---------------------------------------------------------------------------
  // The grid itself
@@ -1326,25 +1598,58 @@ typedef wxGrid::wxGridSelectionModes WXGRIDSELECTIONMODES;
  
  
  
  
  
  
+MustHaveApp(wxGrid);
+
  class wxGrid : public wxScrolledWindow
  {
  public:
  class wxGrid : public wxScrolledWindow
  {
  public:
+    %pythonAppend wxGrid "self._setOORInfo(self)"
+    %pythonAppend wxGrid() ""
+    
+    %typemap(out) wxGrid*;    // turn off this typemap
+
      wxGrid( wxWindow *parent,
      wxGrid( wxWindow *parent,
-            wxWindowID id,
+            wxWindowID id=-1,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxWANTS_CHARS,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxWANTS_CHARS,
-            const char* name = wxPanelNameStr );
-
-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
-
-    enum wxGridSelectionModes {wxGridSelectCells,
-                               wxGridSelectRows,
-                               wxGridSelectColumns};
+            const wxString& name = wxPyPanelNameStr);
+
+    %RenameCtor(PreGrid,  wxGrid());
+
+    
+    // Turn it back on again
+    %typemap(out) wxGrid* { $result = wxPyMake_wxObject($1, $owner); }
+
+
+    bool Create( wxWindow *parent,
+                 wxWindowID id=-1,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxWANTS_CHARS,
+                 const wxString& name = wxPyPanelNameStr );
+
+    // Override the global renamer to leave these as they are, for backwards
+    // compatibility
+    %rename(wxGridSelectCells)   wxGridSelectCells;
+    %rename(wxGridSelectRows)    wxGridSelectRows;
+    %rename(wxGridSelectColumns) wxGridSelectColumns;
+    
+    enum wxGridSelectionModes {
+        wxGridSelectCells,
+        wxGridSelectRows,
+        wxGridSelectColumns
+    };
+    %pythoncode {
+        SelectCells =   wxGridSelectCells
+        SelectRows =    wxGridSelectRows
+        SelectColumns = wxGridSelectColumns
+    }
  
      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
@@ -1357,17 +1662,20 @@ public:
  
  
      wxGridTableBase * GetTable() const;
  
  
      wxGridTableBase * GetTable() const;
-    bool SetTable( wxGridTableBase *table, bool takeOwnership=FALSE,
+
+    %disownarg(wxGridTableBase *);
+    bool SetTable( wxGridTableBase *table, bool takeOwnership=false,
                     WXGRIDSELECTIONMODES selmode =
                     wxGrid::wxGridSelectCells );
                     WXGRIDSELECTIONMODES selmode =
                     wxGrid::wxGridSelectCells );
+    %cleardisown(wxGridTableBase *);
  
      void ClearGrid();
  
      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 );
+    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
  
  
      // this function is called when the current cell highlight must be redrawn
@@ -1379,16 +1687,18 @@ public:
      //
      void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,
                              int horizontalAlignment = wxLEFT,
      //
      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)");
  
  
      // ------
  
  
      // ------
@@ -1404,10 +1714,10 @@ public:
  
      // ------ 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;
@@ -1427,16 +1737,16 @@ 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;
          }
      }
  
      int  YToRow( int y );
          }
      }
  
      int  YToRow( int y );
-    int  XToCol( int x );
+    int  XToCol( int x, bool clipToMinMax = false );
  
      int  YToEdgeOfRow( int y );
      int  XToEdgeOfCol( int x );
  
      int  YToEdgeOfRow( int y );
      int  XToEdgeOfCol( int x );
@@ -1451,8 +1761,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 );
  
@@ -1481,11 +1791,25 @@ 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();
      wxString GetRowLabelValue( int row );
      wxString GetColLabelValue( int col );
      wxColour GetGridLineColour();
+
+    virtual wxPen GetDefaultGridLinePen();
+    virtual wxPen GetRowGridLinePen(int row);
+    virtual wxPen GetColGridLinePen(int col);
+    
+    
      wxColour GetCellHighlightColour();
      int      GetCellHighlightPenWidth();
      int      GetCellHighlightROPenWidth();
      wxColour GetCellHighlightColour();
      int      GetCellHighlightPenWidth();
      int      GetCellHighlightROPenWidth();
@@ -1497,6 +1821,7 @@ 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     SetRowLabelValue( int row, const wxString& );
      void     SetColLabelValue( int col, const wxString& );
      void     SetGridLineColour( const wxColour& );
@@ -1504,20 +1829,35 @@ public:
      void     SetCellHighlightPenWidth(int width);
      void     SetCellHighlightROPenWidth(int width);
  
      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     EnableDragColMove( bool enable = true );
+    void     DisableDragColMove() { EnableDragColMove( false ); }
+    bool     CanDragColMove() { return m_canDragColMove; }
+    void     EnableDragGridSize(bool enable = true);
      void     DisableDragGridSize();
      bool     CanDragGridSize();
  
      void     DisableDragGridSize();
      bool     CanDragGridSize();
  
+    void     EnableDragCell( bool enable = true );
+    void     DisableDragCell();
+    bool     CanDragCell();
+
      // this sets the specified attribute for all cells in this row/col
      // 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);
  
+    // returns the attribute we may modify in place: a new one if this cell
+    // doesn't have any yet or the existing one if it does
+    //
+    // DecRef() must be called on the returned pointer, as usual
+    wxGridCellAttr *GetOrCreateCellAttr(int row, int col) const;
+
+    
      // shortcuts for setting the column parameters
  
      // set the format for the data in the column: default is string
      // shortcuts for setting the column parameters
  
      // set the format for the data in the column: default is string
@@ -1526,7 +1866,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
@@ -1541,36 +1881,65 @@ 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 );
  
  
      void     SetColSize( int col, int width );
  
+    int GetColAt( int colPos ) const;
+    void SetColPos( int colID, int newPos );
+    int GetColPos( int colID ) const;
+    
      // automatically size the column or row to fit to its contents, if
      // 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& );
@@ -1580,6 +1949,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);
@@ -1603,19 +1975,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 )
  
@@ -1625,6 +1997,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
@@ -1663,7 +2045,17 @@ public:
      wxWindow* GetGridColLabelWindow();
      wxWindow* GetGridCornerLabelWindow();
  
      wxWindow* GetGridColLabelWindow();
      wxWindow* GetGridCornerLabelWindow();
  
+    // Allow adjustment of scroll increment. The default is (15, 15).
+    void SetScrollLineX(int x);
+    void SetScrollLineY(int y);
+    int GetScrollLineX() const;
+    int GetScrollLineY() const;
+
+    int GetScrollX(int x) const;
+    int GetScrollY(int y) const;
  
  
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
  };
  
  
  };
  
  
@@ -1677,8 +2069,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();
@@ -1688,7 +2080,7 @@ public:
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
-
+    bool        CmdDown();
  };
  
  
  };
  
  
@@ -1697,7 +2089,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();
@@ -1705,7 +2097,7 @@ public:
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
-
+    bool        CmdDown();
  };
  
  
  };
  
  
@@ -1715,9 +2107,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();
@@ -1730,6 +2122,7 @@ public:
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
+    bool        CmdDown();
  };
  
  
  };
  
  
@@ -1748,90 +2141,72 @@ public:
  
  
  
  
  
  
-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,
-    wxEVT_GRID_EDITOR_CREATED,
-};
-
-
-
-%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)
-
-def EVT_GRID_SELECT_CELL(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn)
-
-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)
-
-def EVT_GRID_EDITOR_CREATED(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_EDITOR_CREATED, 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;
+%constant wxEventType wxEVT_GRID_CELL_BEGIN_DRAG;
+
+
+
+%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 )
+EVT_GRID_CELL_BEGIN_DRAG = wx.PyEventBinder( wxEVT_GRID_CELL_BEGIN_DRAG )
+
+
+%# The same as above but with the ability to specify an identifier
+EVT_GRID_CMD_CELL_LEFT_CLICK =     wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_CLICK,    1 )
+EVT_GRID_CMD_CELL_RIGHT_CLICK =    wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_CLICK,   1 )
+EVT_GRID_CMD_CELL_LEFT_DCLICK =    wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_DCLICK,   1 )
+EVT_GRID_CMD_CELL_RIGHT_DCLICK =   wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_DCLICK,  1 )
+EVT_GRID_CMD_LABEL_LEFT_CLICK =    wx.PyEventBinder( wxEVT_GRID_LABEL_LEFT_CLICK,   1 )
+EVT_GRID_CMD_LABEL_RIGHT_CLICK =   wx.PyEventBinder( wxEVT_GRID_LABEL_RIGHT_CLICK,  1 )
+EVT_GRID_CMD_LABEL_LEFT_DCLICK =   wx.PyEventBinder( wxEVT_GRID_LABEL_LEFT_DCLICK,  1 )
+EVT_GRID_CMD_LABEL_RIGHT_DCLICK =  wx.PyEventBinder( wxEVT_GRID_LABEL_RIGHT_DCLICK, 1 )
+EVT_GRID_CMD_ROW_SIZE =            wx.PyEventBinder( wxEVT_GRID_ROW_SIZE,           1 )
+EVT_GRID_CMD_COL_SIZE =            wx.PyEventBinder( wxEVT_GRID_COL_SIZE,           1 )
+EVT_GRID_CMD_RANGE_SELECT =        wx.PyEventBinder( wxEVT_GRID_RANGE_SELECT,       1 )
+EVT_GRID_CMD_CELL_CHANGE =         wx.PyEventBinder( wxEVT_GRID_CELL_CHANGE,        1 )
+EVT_GRID_CMD_SELECT_CELL =         wx.PyEventBinder( wxEVT_GRID_SELECT_CELL,        1 )
+EVT_GRID_CMD_EDITOR_SHOWN =        wx.PyEventBinder( wxEVT_GRID_EDITOR_SHOWN,       1 )
+EVT_GRID_CMD_EDITOR_HIDDEN =       wx.PyEventBinder( wxEVT_GRID_EDITOR_HIDDEN,      1 )
+EVT_GRID_CMD_EDITOR_CREATED =      wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED,     1 )
+EVT_GRID_CMD_CELL_BEGIN_DRAG =     wx.PyEventBinder( wxEVT_GRID_CELL_BEGIN_DRAG,    1 )
+    
+}
  
  //---------------------------------------------------------------------------
  
  %init %{
  
  //---------------------------------------------------------------------------
  
  %init %{
-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();
  %}
  
  //---------------------------------------------------------------------------
  %}
  
  //---------------------------------------------------------------------------
-
-%pragma(python) include="_gridextras.py";
-
  //---------------------------------------------------------------------------
  
  //---------------------------------------------------------------------------
  
-
-#endif