GetTmpDefaultItem

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

index 771190095b997263817203188b7d2c097ca65cac..e2c63de53a6087c244e97ca49fb0906473daf9c9 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -35,21 +35,18 @@
  %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
  
  
  %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
  
  
-%include _grid_rename.i
-
  MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
  MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
  MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
  MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
-MAKE_CONST_WXSTRING2(DateTimeFormatStr, wxT("%c"));
-
+MAKE_CONST_WXSTRING_NOSWIG(DefaultDateTimeFormat);
  
  //---------------------------------------------------------------------------
  // OOR related typemaps and helper functions
  
  
  //---------------------------------------------------------------------------
  // OOR related typemaps and helper functions
  
-%typemap(out) wxGridCellRenderer*     { $result = wxPyMake_wxGridCellRenderer($1, $owner); }
-%typemap(out) wxGridCellEditor*       { $result = wxPyMake_wxGridCellEditor($1, $owner); }
-%typemap(out) wxGridCellAttr*         { $result = wxPyMake_wxGridCellAttr($1, $owner); }
-%typemap(out) wxGridCellAttrProvider* { $result = wxPyMake_wxGridCellAttrProvider($1, $owner); }
-%typemap(out) wxGridTableBase*        { $result = wxPyMake_wxGridTableBase($1, $owner); }
+%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); }
  
  
  %{
  
  
  %{
@@ -100,73 +97,63 @@ wxPyMake_TEMPLATE(wxGridTableBase)
      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;                                                             \
-        bool blocked = 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 (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr")))    \
+                if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr"))) \
                      rval = ptr;                                                 \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                      rval = ptr;                                                 \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads(blocked);                                             \
+        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) {                           \
-        bool blocked = wxPyBeginBlockThreads();                                                \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          bool found;                                                             \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxGridCellAttr(attr,false);                \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b));  \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          bool found;                                                             \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxGridCellAttr(attr,false);                \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b));  \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads(blocked);                                                  \
+        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) {                                \
-        bool blocked = wxPyBeginBlockThreads();                                                \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          bool found;                                                             \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxGridCellAttr(attr,false);                \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val));    \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          bool found;                                                             \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* obj = wxPyMake_wxGridCellAttr(attr,false);                \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val));    \
              Py_DECREF(obj);                                                     \
          }                                                                       \
-        wxPyEndBlockThreads(blocked);                                             \
+        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() {                                                             \
-        bool blocked = 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(blocked);                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          return rval;                                                            \
      }
  
          return rval;                                                            \
      }
  
@@ -174,18 +161,18 @@ wxPyMake_TEMPLATE(wxGridTableBase)
  
  #define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                                     \
      bool CBNAME(int a, int b) {                                                 \
  
  #define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                                     \
      bool CBNAME(int a, int b) {                                                 \
-        bool blocked = 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(blocked);                                             \
+        wxPyEndBlockThreads(blocked);                                           \
          return rval;                                                            \
      }
  
  
  #define PYCALLBACK_STRING_INTINT_pure(CBNAME)                                   \
      wxString CBNAME(int a, int b) {                                             \
          return rval;                                                            \
      }
  
  
  #define PYCALLBACK_STRING_INTINT_pure(CBNAME)                                   \
      wxString CBNAME(int a, int b) {                                             \
-        bool blocked = wxPyBeginBlockThreads();                                                \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          wxString rval;                                                          \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
          wxString rval;                                                          \
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* ro;                                                       \
@@ -195,27 +182,27 @@ wxPyMake_TEMPLATE(wxGridTableBase)
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads(blocked);                                                  \
+        wxPyEndBlockThreads(blocked);                                           \
          return rval;                                                            \
      }
  
  
  #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
      void CBNAME(int a, int b, const wxString& c) {                              \
          return rval;                                                            \
      }
  
  
  #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
      void CBNAME(int a, int b, const wxString& c) {                              \
-        bool blocked = wxPyBeginBlockThreads();                                                \
+        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);                                                       \
          }                                                                       \
          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);                                                  \
+        wxPyEndBlockThreads(blocked);                                           \
      }
  
  
  #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;                                                             \
-        bool blocked = wxPyBeginBlockThreads();                                                \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          wxString rval;                                                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
          wxString rval;                                                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
@@ -225,34 +212,28 @@ wxPyMake_TEMPLATE(wxGridTableBase)
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads(blocked);                                                  \
+        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);                                            \
-    }
+    }               
  
  
  #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;                                                             \
-        bool blocked = wxPyBeginBlockThreads();                                                \
+        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);                                                       \
          }                                                                       \
          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);                                                  \
+        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);                                           \
-    }
+    }              
  
  
  
  
  
  
@@ -261,42 +242,35 @@ wxPyMake_TEMPLATE(wxGridTableBase)
      long CBNAME(int a, int b)  {                                                \
          long rval;                                                              \
          bool found;                                                             \
      long CBNAME(int a, int b)  {                                                \
          long rval;                                                              \
          bool found;                                                             \
-        bool blocked = 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(blocked);                                             \
+        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;                                                             \
-        bool blocked = 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(blocked);                                             \
+        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;                                                             \
-        bool blocked = 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;                                                       \
@@ -307,31 +281,24 @@ wxPyMake_TEMPLATE(wxGridTableBase)
                  Py_DECREF(ro);   Py_DECREF(str);                                \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);   Py_DECREF(str);                                \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads(blocked);                                                  \
+        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;                                                             \
-        bool blocked = 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(blocked);                                                  \
+        wxPyEndBlockThreads(blocked);                                           \
          if (! found)                                                            \
              PCLASS::CBNAME();                                                   \
          if (! found)                                                            \
              PCLASS::CBNAME();                                                   \
-    }                                                                           \
-    void base_##CBNAME() {                                                      \
-        PCLASS::CBNAME();                                                       \
-    }
-
+    }               
  
  
  
  
  
  
@@ -339,17 +306,14 @@ wxPyMake_TEMPLATE(wxGridTableBase)
      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;                                                             \
-        bool blocked = 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(blocked);                                                  \
+        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);                                             \
-    }
+    }          
  
  
  
  
  
  
@@ -357,23 +321,20 @@ wxPyMake_TEMPLATE(wxGridTableBase)
      bool CBNAME(size_t a)  {                                                    \
          bool rval = 0;                                                          \
          bool found;                                                             \
      bool CBNAME(size_t a)  {                                                    \
          bool rval = 0;                                                          \
          bool found;                                                             \
-        bool blocked = 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(blocked);                                                  \
+        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);                                               \
-    }
+    }           
  
  
  #define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                                   \
      wxString CBNAME(int a) {                                                    \
          bool found;                                                             \
  
  
  #define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                                   \
      wxString CBNAME(int a) {                                                    \
          bool found;                                                             \
-        bool blocked = wxPyBeginBlockThreads();                                                \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                          \
          wxString rval;                                                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
          wxString rval;                                                          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
@@ -383,32 +344,26 @@ wxPyMake_TEMPLATE(wxGridTableBase)
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
                  Py_DECREF(ro);                                                  \
              }                                                                   \
          }                                                                       \
-        wxPyEndBlockThreads(blocked);                                                  \
+        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);                                               \
-    }
+    }          
  
  
  #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;                                                             \
-        bool blocked = wxPyBeginBlockThreads();                                                \
+        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);                                                       \
          }                                                                       \
          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);                                                  \
+        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);                                                    \
-    }
+    }           
  
  
  
  
  
  
@@ -417,33 +372,27 @@ wxPyMake_TEMPLATE(wxGridTableBase)
      bool CBNAME()  {                                                            \
          bool rval = 0;                                                          \
          bool found;                                                             \
      bool CBNAME()  {                                                            \
          bool rval = 0;                                                          \
          bool found;                                                             \
-        bool blocked = 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(blocked);                                                  \
+        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;                                                             \
-        bool blocked = 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(blocked);                                                  \
+        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);                                                    \
-    }
+    }        
  
  
  
  
  
  
@@ -451,16 +400,13 @@ wxPyMake_TEMPLATE(wxGridTableBase)
  #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;                                                             \
-        bool blocked = 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(blocked);                                                  \
+        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);                                                  \
-    }
+    }          
  
  
  
  
  
  
@@ -468,33 +414,26 @@ wxPyMake_TEMPLATE(wxGridTableBase)
  #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;                                                             \
-        bool blocked = 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(blocked);                                                  \
+        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;                                                             \
-        bool blocked = 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(blocked);                                                  \
+        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);                                                  \
-    }
-
+    }         
  
  
  
  
  
  
@@ -550,11 +489,14 @@ enum {
  
  
  //---------------------------------------------------------------------------
  
  
  //---------------------------------------------------------------------------
-// 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:
      %extend {
  {
  public:
      %extend {
@@ -562,12 +504,25 @@ public:
              if (!self->GetClientObject())
                  self->SetClientObject(new wxPyOORClientData(_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,
      virtual void Draw(wxGrid& grid,
                        wxGridCellAttr& attr,
                        wxDC& dc,
@@ -582,6 +537,7 @@ public:
  };
  
  
  };
  
  
+
  // The C++ version of wxPyGridCellRenderer
  %{
  class wxPyGridCellRenderer : public wxGridCellRenderer
  // The C++ version of wxPyGridCellRenderer
  %{
  class wxPyGridCellRenderer : public wxGridCellRenderer
@@ -593,7 +549,7 @@ public:
      void Draw(wxGrid& grid, wxGridCellAttr& attr,
                wxDC& dc, const wxRect& rect,
                int row, int col, bool isSelected) {
      void Draw(wxGrid& grid, wxGridCellAttr& attr,
                wxDC& dc, const wxRect& rect,
                int row, int col, bool isSelected) {
-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Draw")) {
              PyObject* go = wxPyMake_wxObject(&grid,false);
              PyObject* dco = wxPyMake_wxObject(&dc,false);
          if (wxPyCBH_findCallback(m_myInst, "Draw")) {
              PyObject* go = wxPyMake_wxObject(&grid,false);
              PyObject* dco = wxPyMake_wxObject(&dc,false);
@@ -613,7 +569,7 @@ public:
      wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
                         int row, int col) {
          wxSize rval;
      wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
                         int row, int col) {
          wxSize rval;
-        bool blocked = 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;
@@ -656,7 +612,7 @@ public:
  
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
  
      wxGridCellRenderer *Clone() const {
          wxGridCellRenderer* rval = NULL;
-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellRenderer* ptr;
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellRenderer* ptr;
@@ -689,7 +645,8 @@ public:
      wxPyGridCellRenderer();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
      wxPyGridCellRenderer();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
-    void base_SetParameters(const wxString& params);
+    void SetParameters(const wxString& params);
+    %MAKE_BASE_FUNC(PyGridCellRenderer, SetParameters);
  };
  
  //---------------------------------------------------------------------------
  };
  
  //---------------------------------------------------------------------------
@@ -736,8 +693,8 @@ class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
  {
  public:
      %pythonAppend wxGridCellDateTimeRenderer "self._setOORInfo(self)"
  {
  public:
      %pythonAppend wxGridCellDateTimeRenderer "self._setOORInfo(self)"
-    wxGridCellDateTimeRenderer(wxString outformat = wxPyDateTimeFormatStr,
-                               wxString informat =  wxPyDateTimeFormatStr);
+    wxGridCellDateTimeRenderer(wxString outformat = wxPyDefaultDateTimeFormat,
+                               wxString informat =  wxPyDefaultDateTimeFormat);
  };
  
  
  };
  
  
@@ -761,16 +718,9 @@ 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:
  {
  public:
-    %extend {
-        void _setOORInfo(PyObject* _self) {
-            if (!self->GetClientObject())
-                self->SetClientObject(new wxPyOORClientData(_self));
-        }
-    }
-
      bool IsCreated();
      wxControl* GetControl();
      void SetControl(wxControl* control);
      bool IsCreated();
      wxControl* GetControl();
      void SetControl(wxControl* control);
@@ -778,10 +728,6 @@ public:
      wxGridCellAttr* GetCellAttr();
      void SetCellAttr(wxGridCellAttr* attr);
  
      wxGridCellAttr* GetCellAttr();
      void SetCellAttr(wxGridCellAttr* attr);
  
-    void SetParameters(const wxString& params);
-    void IncRef();
-    void DecRef();
-
      virtual void Create(wxWindow* parent,
                          wxWindowID id,
                          wxEvtHandler* evtHandler);
      virtual void Create(wxWindow* parent,
                          wxWindowID id,
                          wxEvtHandler* evtHandler);
@@ -797,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();
  
  };
@@ -810,7 +758,7 @@ public:
      wxPyGridCellEditor() : wxGridCellEditor() {}
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
      wxPyGridCellEditor() : wxGridCellEditor() {}
  
      void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Create")) {
              PyObject* po = wxPyMake_wxObject(parent,false);
              PyObject* eo = wxPyMake_wxObject(evtHandler,false);
          if (wxPyCBH_findCallback(m_myInst, "Create")) {
              PyObject* po = wxPyMake_wxObject(parent,false);
              PyObject* eo = wxPyMake_wxObject(evtHandler,false);
@@ -824,7 +772,7 @@ public:
  
  
      void BeginEdit(int row, int col, wxGrid* grid) {
  
  
      void BeginEdit(int row, int col, wxGrid* grid) {
-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
              PyObject* go = wxPyMake_wxObject(grid,false);
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
          if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
              PyObject* go = wxPyMake_wxObject(grid,false);
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
@@ -835,8 +783,8 @@ public:
  
  
      bool EndEdit(int row, int col, wxGrid* grid) {
  
  
      bool EndEdit(int row, int col, wxGrid* grid) {
-        bool rv = False;
-        bool blocked = wxPyBeginBlockThreads();
+        bool rv = false;
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
              PyObject* go = wxPyMake_wxObject(grid,false);
              rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
          if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
              PyObject* go = wxPyMake_wxObject(grid,false);
              rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
@@ -849,7 +797,7 @@ public:
  
      wxGridCellEditor* Clone() const {
          wxGridCellEditor* rval = NULL;
  
      wxGridCellEditor* Clone() const {
          wxGridCellEditor* rval = NULL;
-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellEditor* ptr;
          if (wxPyCBH_findCallback(m_myInst, "Clone")) {
              PyObject* ro;
              wxGridCellEditor* ptr;
@@ -867,7 +815,7 @@ public:
  
      void Show(bool show, wxGridCellAttr *attr) {
          bool found;
  
      void Show(bool show, wxGridCellAttr *attr) {
          bool found;
-        bool blocked = wxPyBeginBlockThreads();
+        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));
          if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) {
              PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao));
@@ -877,14 +825,11 @@ public:
          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) {
          bool found;
  
  
      void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
          bool found;
-        bool blocked = wxPyBeginBlockThreads();
+        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);
          if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
              PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
              PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);
@@ -898,9 +843,6 @@ public:
          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);
@@ -938,15 +880,25 @@ public:
      wxPyGridCellEditor();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
      wxPyGridCellEditor();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
-    void base_SetSize(const wxRect& rect);
-    void base_Show(bool show, wxGridCellAttr *attr = NULL);
-    void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
-    bool 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);
  };
  
  //---------------------------------------------------------------------------
  };
  
  //---------------------------------------------------------------------------
@@ -993,7 +945,7 @@ public:
      %pythonAppend wxGridCellChoiceEditor  "self._setOORInfo(self)"
      wxGridCellChoiceEditor(int choices = 0,
                             const wxString* choices_array = NULL,
      %pythonAppend wxGridCellChoiceEditor  "self._setOORInfo(self)"
      wxGridCellChoiceEditor(int choices = 0,
                             const wxString* choices_array = NULL,
-                           bool allowOthers = False);
+                           bool allowOthers = false);
      virtual wxString GetValue();
  };
  
      virtual wxString GetValue();
  };
  
@@ -1043,18 +995,27 @@ public:
      %pythonAppend wxGridCellAttr  "self._setOORInfo(self)"
  
      wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
      %pythonAppend wxGridCellAttr  "self._setOORInfo(self)"
  
      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 SetSize(int num_rows, int num_cols);
      void SetTextColour(const wxColour& colText);
      void SetBackgroundColour(const wxColour& colBack);
      void SetFont(const wxFont& font);
      void SetAlignment(int hAlign, int vAlign);
      void SetSize(int num_rows, int num_cols);
-    void SetOverflow( bool allow = True );
-    void SetReadOnly(bool isReadOnly = True);
+    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);
@@ -1143,11 +1104,16 @@ public:
      wxPyGridCellAttrProvider();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
      wxPyGridCellAttrProvider();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
-    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);
  };
  
  
  };
  
  
@@ -1159,7 +1125,7 @@ class wxGridTableBase : public wxObject
  {
  public:
      // wxGridTableBase();   This is an ABC
  {
  public:
      // wxGridTableBase();   This is an ABC
-    //~wxGridTableBase();
+    ~wxGridTableBase();
  
      %extend {
          void _setOORInfo(PyObject* _self) {
  
      %extend {
          void _setOORInfo(PyObject* _self) {
@@ -1253,7 +1219,7 @@ public:
  
  
      wxString GetValue(int row, int col) {
  
  
      wxString GetValue(int row, int col) {
-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          wxString rval;
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
          wxString rval;
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
@@ -1273,7 +1239,7 @@ public:
      }
  
      void SetValue(int row, int col, const wxString& val) {
      }
  
      void SetValue(int row, int col, const wxString& val) {
-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
              PyObject* s = wx2PyString(val);
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,s));
          if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
              PyObject* s = wx2PyString(val);
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,s));
@@ -1287,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;
-        bool blocked = 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;
@@ -1307,7 +1273,7 @@ public:
  
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
  
      double GetValueAsDouble( int row, int col ) {
          double rval = 0.0;
-        bool blocked = 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;
@@ -1330,7 +1296,7 @@ public:
      }
  
      void SetValueAsLong( int row, int col, long value ) {
      }
  
      void SetValueAsLong( int row, int col, long value ) {
-        bool blocked = 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));
          }
@@ -1338,7 +1304,7 @@ public:
      }
  
      void SetValueAsDouble( int row, int col, double value ) {
      }
  
      void SetValueAsDouble( int row, int col, double value ) {
-        bool blocked = 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));
          }
@@ -1363,28 +1329,49 @@ public:
      wxPyGridTableBase();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
      wxPyGridTableBase();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
+    %pythonAppend Destroy "args[0].thisown = 0"
      %extend { void Destroy() { delete self; } }
  
      %extend { void Destroy() { delete self; } }
  
-    wxString base_GetTypeName( int row, int col );
-    bool base_CanGetValueAs( int row, int col, const wxString& typeName );
-    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,
+    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);
  };
  
  
  };
  
  
@@ -1453,7 +1440,7 @@ bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
  
      if (source == Py_None) {
          **obj = wxGridCellCoords(-1,-1);
  
      if (source == Py_None) {
          **obj = wxGridCellCoords(-1,-1);
-        return True;
+        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
@@ -1462,7 +1449,7 @@ bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
          if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))
              goto error;
          *obj = ptr;
          if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))
              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) {
      }
      // otherwise a 2-tuple of integers is expected
      else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
@@ -1476,12 +1463,12 @@ bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
          **obj = wxGridCellCoords(PyInt_AsLong(o1), PyInt_AsLong(o2));
          Py_DECREF(o1);
          Py_DECREF(o2);
          **obj = wxGridCellCoords(PyInt_AsLong(o1), PyInt_AsLong(o2));
          Py_DECREF(o1);
          Py_DECREF(o2);
-        return True;
+        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;
  }
  
  
  }
  
  
@@ -1490,13 +1477,13 @@ bool wxGridCellCoords_typecheck(PyObject* source) {
  
      if (wxPySwigInstance_Check(source) &&
          wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))
  
      if (wxPySwigInstance_Check(source) &&
          wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))
-        return True;
+        return true;
  
      PyErr_Clear();
      if (PySequence_Check(source) && PySequence_Length(source) == 2)
  
      PyErr_Clear();
      if (PySequence_Check(source) && PySequence_Length(source) == 2)
-        return True;
+        return true;
  
  
-    return False;
+    return false;
  }
  %}
  
  }
  %}
  
@@ -1545,8 +1532,33 @@ public:
      void SetCol( int n );
      void Set( int row, int col );
  
      void SetCol( int n );
      void Set( int row, int col );
  
-    bool operator==( const wxGridCellCoords& other ) const;
-    bool operator!=( const wxGridCellCoords& other ) const;
+    %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() {
  
      %extend {
          PyObject* Get() {
@@ -1592,6 +1604,9 @@ class wxGrid : public wxScrolledWindow
  {
  public:
      %pythonAppend wxGrid "self._setOORInfo(self)"
  {
  public:
      %pythonAppend wxGrid "self._setOORInfo(self)"
+    %pythonAppend wxGrid() ""
+    
+    %typemap(out) wxGrid*;    // turn off this typemap
  
      wxGrid( wxWindow *parent,
              wxWindowID id=-1,
  
      wxGrid( wxWindow *parent,
              wxWindowID id=-1,
@@ -1600,7 +1615,11 @@ public:
              long style = wxWANTS_CHARS,
              const wxString& name = wxPyPanelNameStr);
  
              long style = wxWANTS_CHARS,
              const wxString& name = wxPyPanelNameStr);
  
-    %name(PreGrid) wxGrid();
+    %RenameCtor(PreGrid,  wxGrid());
+
+    
+    // Turn it back on again
+    %typemap(out) wxGrid* { $result = wxPyMake_wxObject($1, $owner); }
  
  
      bool Create( wxWindow *parent,
  
  
      bool Create( wxWindow *parent,
@@ -1610,7 +1629,12 @@ public:
                   long style = wxWANTS_CHARS,
                   const wxString& name = wxPyPanelNameStr );
  
                   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,
      enum wxGridSelectionModes {
          wxGridSelectCells,
          wxGridSelectRows,
@@ -1638,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
@@ -1690,7 +1717,7 @@ public:
      bool IsEditable();
      void EnableEditing( bool edit );
  
      bool IsEditable();
      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;
@@ -1719,7 +1746,7 @@ public:
      }
  
      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 );
@@ -1734,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 );
  
@@ -1796,21 +1823,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
      void     SetAttr(int row, int col, wxGridCellAttr *attr);
      void     SetRowAttr(int row, wxGridCellAttr *attr);
      void     SetColAttr(int col, wxGridCellAttr *attr);
  
      // 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);
  
+    // 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
@@ -1819,7 +1860,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
@@ -1850,22 +1891,26 @@ public:
          void, GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT ),
          "GetCellSize(int row, int col) -> (num_rows, num_cols)");
  
          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     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
      // setAsMin is True, this optimal width will also be set as minimal width
      // for this column
      // 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
      // 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
  
      // 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
@@ -1928,15 +1973,15 @@ public:
      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 )
  
@@ -1994,6 +2039,14 @@ 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);
  
      static wxVisualAttributes
      GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
@@ -2010,8 +2063,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();
@@ -2021,7 +2074,7 @@ public:
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
-
+    bool        CmdDown();
  };
  
  
  };
  
  
@@ -2030,7 +2083,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();
@@ -2038,7 +2091,7 @@ public:
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
-
+    bool        CmdDown();
  };
  
  
  };
  
  
@@ -2048,9 +2101,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();
@@ -2063,6 +2116,7 @@ public:
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
      bool        MetaDown();
      bool        ShiftDown();
      bool        AltDown();
+    bool        CmdDown();
  };
  
  
  };
  
  
@@ -2097,6 +2151,7 @@ public:
  %constant wxEventType wxEVT_GRID_EDITOR_SHOWN;
  %constant wxEventType wxEVT_GRID_EDITOR_HIDDEN;
  %constant wxEventType wxEVT_GRID_EDITOR_CREATED;
  %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;
  
  
  
  
  
  
@@ -2117,6 +2172,7 @@ 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_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
  
  
  %# The same as above but with the ability to specify an identifier
@@ -2136,6 +2192,8 @@ EVT_GRID_CMD_SELECT_CELL =         wx.PyEventBinder( wxEVT_GRID_SELECT_CELL,
  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_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 )
+    
  }
  
  //---------------------------------------------------------------------------
  }
  
  //---------------------------------------------------------------------------