Add wx.Dialog.Get/SetAffirmativeId and Get/SetEscapeId

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

index 08ee4d60b61d2f48b71bfb9cf4359150cc03d853..3e63084f40d391df8b0933e0d184a82e5db08c42 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -10,7 +10,12 @@
  // Licence:     wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
  // Licence:     wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
-%module grid
+%define DOCSTRING
+"Classes for implementing a spreadsheet-like control."
+%enddef
+
+%module(package="wx", docstring=DOCSTRING) grid
+
  
  %{
  #include "wx/wxPython/wxPython.h"
  
  %{
  #include "wx/wxPython/wxPython.h"
@@ -26,31 +31,30 @@
  //---------------------------------------------------------------------------
  
  %import windows.i
  //---------------------------------------------------------------------------
  
  %import windows.i
-%pythoncode { wx = core }
-%pythoncode { __docfilter__ = wx.__docfilter__ }
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
  
  
  %include _grid_rename.i
  
  MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
  MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
  
  
  %include _grid_rename.i
  
  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); }
-%typemap(out) wxGridCellEditor*       { $result = wxPyMake_wxGridCellEditor($1); }
-%typemap(out) wxGridCellAttr*         { $result = wxPyMake_wxGridCellAttr($1); }
-%typemap(out) wxGridCellAttrProvider* { $result = wxPyMake_wxGridCellAttrProvider($1); }
-%typemap(out) wxGridTableBase*        { $result = wxPyMake_wxGridTableBase($1); }
+%typemap(out) wxGridCellRenderer*     { $result = wxPyMake_wxGridCellRenderer($1, (bool)$owner); }
+%typemap(out) wxGridCellEditor*       { $result = wxPyMake_wxGridCellEditor($1,   (bool)$owner); }
+%typemap(out) wxGridCellAttr*         { $result = wxPyMake_wxGridCellAttr($1,     (bool)$owner); }
+%typemap(out) wxGridCellAttrProvider* { $result = wxPyMake_wxGridCellAttrProvider($1, (bool)$owner); }
+%typemap(out) wxGridTableBase*        { $result = wxPyMake_wxGridTableBase($1,    (bool)$owner); }
  
  
  %{
  
  #define wxPyMake_TEMPLATE(TYPE) \
  
  
  %{
  
  #define wxPyMake_TEMPLATE(TYPE) \
-PyObject* wxPyMake_##TYPE(TYPE* source) { \
+PyObject* wxPyMake_##TYPE(TYPE* source, bool setThisOwn) { \
      PyObject* target = NULL; \
      if (source) { \
          /* Check if there is already a pointer to a Python object in the \
      PyObject* target = NULL; \
      if (source) { \
          /* Check if there is already a pointer to a Python object in the \
@@ -58,12 +62,13 @@ PyObject* wxPyMake_##TYPE(TYPE* source) { \
          wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \
          if (data) { \
              target = data->m_obj; \
          wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \
          if (data) { \
              target = data->m_obj; \
-            Py_INCREF(target); \
+            if (target) \
+                Py_INCREF(target); \
          } \
          /* Otherwise make a new wrapper for it the old fashioned way and \
             give it the OOR treatment */ \
          if (! target) { \
          } \
          /* Otherwise make a new wrapper for it the old fashioned way and \
             give it the OOR treatment */ \
          if (! target) { \
-            target = wxPyConstructObject(source, wxT(#TYPE), False); \
+            target = wxPyConstructObject(source, wxT(#TYPE), setThisOwn); \
              if (target) \
                  source->SetClientObject(new wxPyOORClientData(target)); \
          } \
              if (target) \
                  source->SetClientObject(new wxPyOORClientData(target)); \
          } \
@@ -94,7 +99,7 @@ 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;                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* ro;                                                       \
              wxGridCellAttr* ptr;                                                \
@@ -109,54 +114,44 @@ wxPyMake_TEMPLATE(wxGridTableBase)
          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))) {                \
          bool found;                                                             \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
-            PyObject* obj = wxPyMake_wxGridCellAttr(attr);                      \
+            PyObject* obj = wxPyMake_wxGridCellAttr(attr,false);                \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b));  \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(attr, a, b);                                         \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b));  \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          wxPyEndBlockThreads(blocked);                                                  \
          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))) {                \
          bool found;                                                             \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
-            PyObject* obj = wxPyMake_wxGridCellAttr(attr);                      \
+            PyObject* obj = wxPyMake_wxGridCellAttr(attr,false);                \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val));    \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          wxPyEndBlockThreads(blocked);                                             \
          if (! found)                                                            \
              PCLASS::CBNAME(attr, val);                                          \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val));    \
              Py_DECREF(obj);                                                     \
          }                                                                       \
          wxPyEndBlockThreads(blocked);                                             \
          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("()"));         \
@@ -168,7 +163,7 @@ 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));   \
@@ -179,7 +174,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
  
  #define PYCALLBACK_STRING_INTINT_pure(CBNAME)                                   \
      wxString CBNAME(int a, int b) {                                             \
  
  #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;                                                       \
@@ -196,7 +191,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
  
  #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
      void CBNAME(int a, int b, const wxString& c) {                              \
  
  #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
      void CBNAME(int a, int b, const wxString& c) {                              \
-        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));\
          if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
              PyObject* s = wx2PyString(c);                                       \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
@@ -209,7 +204,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
  #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;                                                       \
@@ -223,17 +218,14 @@ wxPyMake_TEMPLATE(wxGridTableBase)
          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));\
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* s = wx2PyString(c);                                       \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
@@ -243,10 +235,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
          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);                                           \
-    }
+    }              
  
  
  
  
  
  
@@ -255,42 +244,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));  \
          wxPyEndBlockThreads(blocked);                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
          wxPyEndBlockThreads(blocked);                                             \
          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));  \
          wxPyEndBlockThreads(blocked);                                             \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
          wxPyEndBlockThreads(blocked);                                             \
          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;                                                       \
@@ -305,27 +287,20 @@ wxPyMake_TEMPLATE(wxGridTableBase)
          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("()"));                \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME();                                                   \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME();                                                   \
-    }                                                                           \
-    void base_##CBNAME() {                                                      \
-        PCLASS::CBNAME();                                                       \
-    }
-
+    }               
  
  
  
  
  
  
@@ -333,17 +308,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));  \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a,b);                                         \
          return rval;                                                            \
-    }                                                                           \
-    bool base_##CBNAME(size_t a, size_t b) {                                    \
-        return PCLASS::CBNAME(a,b);                                             \
-    }
+    }          
  
  
  
  
  
  
@@ -351,23 +323,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));     \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME(a);                                           \
          return rval;                                                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));     \
          wxPyEndBlockThreads(blocked);                                                  \
          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;                                                       \
@@ -381,16 +350,13 @@ wxPyMake_TEMPLATE(wxGridTableBase)
          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));          \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
              PyObject* s = wx2PyString(c);                                       \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s));          \
@@ -399,10 +365,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,c);                                                \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,c);                                                \
-    }                                                                           \
-    void base_##CBNAME(int a, const wxString& c) {                              \
-        PCLASS::CBNAME(a,c);                                                    \
-    }
+    }           
  
  
  
  
  
  
@@ -411,33 +374,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("()"));         \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              rval = PCLASS::CBNAME();                                            \
          return rval;                                                            \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
          wxPyEndBlockThreads(blocked);                                                  \
          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));         \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b);                                                \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));         \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b);                                                \
-    }                                                                           \
-    void base_##CBNAME(size_t a, int b) {                                       \
-        PCLASS::CBNAME(a,b);                                                    \
-    }
+    }        
  
  
  
  
  
  
@@ -445,16 +402,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));      \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
-    }                                                                           \
-    void base_##CBNAME(int a, int b, long c) {                                  \
-        PCLASS::CBNAME(a,b,c);                                                  \
-    }
+    }          
  
  
  
  
  
  
@@ -462,33 +416,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));      \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c));      \
          wxPyEndBlockThreads(blocked);                                                  \
          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));      \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
          if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
          wxPyEndBlockThreads(blocked);                                                  \
          if (! found)                                                            \
              PCLASS::CBNAME(a,b,c);                                              \
-    }                                                                           \
-    void base_##CBNAME(int a, int b, bool c) {                                  \
-        PCLASS::CBNAME(a,b,c);                                                  \
-    }
-
+    }         
  
  
  
  
  
  
@@ -516,6 +463,33 @@ const wxRect           wxGridNoCellRect;
  %mutable;
  
  
  %mutable;
  
  
+%{
+#define wxGRID_DEFAULT_NUMBER_ROWS        WXGRID_DEFAULT_NUMBER_ROWS
+#define wxGRID_DEFAULT_NUMBER_COLS        WXGRID_DEFAULT_NUMBER_COLS
+#define wxGRID_DEFAULT_ROW_HEIGHT         WXGRID_DEFAULT_ROW_HEIGHT
+#define wxGRID_DEFAULT_COL_WIDTH          WXGRID_DEFAULT_COL_WIDTH
+#define wxGRID_DEFAULT_COL_LABEL_HEIGHT   WXGRID_DEFAULT_COL_LABEL_HEIGHT
+#define wxGRID_DEFAULT_ROW_LABEL_WIDTH    WXGRID_DEFAULT_ROW_LABEL_WIDTH
+#define wxGRID_LABEL_EDGE_ZONE            WXGRID_LABEL_EDGE_ZONE
+#define wxGRID_MIN_ROW_HEIGHT             WXGRID_MIN_ROW_HEIGHT
+#define wxGRID_MIN_COL_WIDTH              WXGRID_MIN_COL_WIDTH
+#define wxGRID_DEFAULT_SCROLLBAR_WIDTH    WXGRID_DEFAULT_SCROLLBAR_WIDTH
+%}
+
+enum {
+    wxGRID_DEFAULT_NUMBER_ROWS,
+    wxGRID_DEFAULT_NUMBER_COLS,
+    wxGRID_DEFAULT_ROW_HEIGHT,
+    wxGRID_DEFAULT_COL_WIDTH,
+    wxGRID_DEFAULT_COL_LABEL_HEIGHT,
+    wxGRID_DEFAULT_ROW_LABEL_WIDTH,
+    wxGRID_LABEL_EDGE_ZONE,
+    wxGRID_MIN_ROW_HEIGHT,
+    wxGRID_MIN_COL_WIDTH,
+    wxGRID_DEFAULT_SCROLLBAR_WIDTH
+};
+
+
  //---------------------------------------------------------------------------
  // wxGridCellRenderer is an ABC, and several derived classes are available.
  // Classes implemented in Python should be derived from wxPyGridCellRenderer.
  //---------------------------------------------------------------------------
  // wxGridCellRenderer is an ABC, and several derived classes are available.
  // Classes implemented in Python should be derived from wxPyGridCellRenderer.
@@ -526,7 +500,8 @@ class wxGridCellRenderer
  public:
      %extend {
          void _setOORInfo(PyObject* _self) {
  public:
      %extend {
          void _setOORInfo(PyObject* _self) {
-            self->SetClientObject(new wxPyOORClientData(_self));
+            if (!self->GetClientObject())
+                self->SetClientObject(new wxPyOORClientData(_self));
          }
      }
  
          }
      }
  
@@ -559,11 +534,11 @@ 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")) {
          if (wxPyCBH_findCallback(m_myInst, "Draw")) {
-            PyObject* go = wxPyMake_wxObject(&grid);
-            PyObject* dco = wxPyMake_wxObject(&dc);
-            PyObject* ao = wxPyMake_wxGridCellAttr(&attr);
+            PyObject* go = wxPyMake_wxObject(&grid,false);
+            PyObject* dco = wxPyMake_wxObject(&dc,false);
+            PyObject* ao = wxPyMake_wxGridCellAttr(&attr,false);
              PyObject* ro = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0);
  
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOiii)", go, ao, dco, ro,
              PyObject* ro = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0);
  
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOiii)", go, ao, dco, ro,
@@ -579,13 +554,13 @@ 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;
-            PyObject* go = wxPyMake_wxObject(&grid);
-            PyObject* dco = wxPyMake_wxObject(&dc);
-            PyObject* ao = wxPyMake_wxGridCellAttr(&attr);
+            PyObject* go = wxPyMake_wxObject(&grid,false);
+            PyObject* dco = wxPyMake_wxObject(&dc,false);
+            PyObject* ao = wxPyMake_wxGridCellAttr(&attr,false);
  
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOOii)",
                                                                   go, ao, dco,
  
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOOii)",
                                                                   go, ao, dco,
@@ -622,7 +597,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;
@@ -655,7 +630,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);
  };
  
  //---------------------------------------------------------------------------
  };
  
  //---------------------------------------------------------------------------
@@ -702,8 +678,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);
  };
  
  
  };
  
  
@@ -732,7 +708,8 @@ class  wxGridCellEditor
  public:
      %extend {
          void _setOORInfo(PyObject* _self) {
  public:
      %extend {
          void _setOORInfo(PyObject* _self) {
-            self->SetClientObject(new wxPyOORClientData(_self));
+            if (!self->GetClientObject())
+                self->SetClientObject(new wxPyOORClientData(_self));
          }
      }
  
          }
      }
  
@@ -762,6 +739,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();
  
  };
@@ -775,10 +754,10 @@ 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")) {
          if (wxPyCBH_findCallback(m_myInst, "Create")) {
-            PyObject* po = wxPyMake_wxObject(parent);
-            PyObject* eo = wxPyMake_wxObject(evtHandler);
+            PyObject* po = wxPyMake_wxObject(parent,false);
+            PyObject* eo = wxPyMake_wxObject(evtHandler,false);
  
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiO)", po, id, eo));
              Py_DECREF(po);
  
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiO)", po, id, eo));
              Py_DECREF(po);
@@ -789,9 +768,9 @@ 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")) {
          if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
-            PyObject* go = wxPyMake_wxObject(grid);
+            PyObject* go = wxPyMake_wxObject(grid,false);
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
              Py_DECREF(go);
          }
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
              Py_DECREF(go);
          }
@@ -800,10 +779,10 @@ 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")) {
          if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
-            PyObject* go = wxPyMake_wxObject(grid);
+            PyObject* go = wxPyMake_wxObject(grid,false);
              rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
              Py_DECREF(go);
          }
              rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
              Py_DECREF(go);
          }
@@ -814,7 +793,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;
@@ -832,9 +811,9 @@ 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"))) {
          if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) {
-            PyObject* ao = wxPyMake_wxGridCellAttr(attr);
+            PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao));
              Py_DECREF(ao);
          }
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao));
              Py_DECREF(ao);
          }
@@ -842,16 +821,13 @@ 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)"))) {
          if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
-            PyObject* ao = wxPyMake_wxGridCellAttr(attr);
+            PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
              PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);
  
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", ro, ao));
              PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);
  
              wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", ro, ao));
@@ -863,9 +839,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);
@@ -899,19 +872,29 @@ IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue)
  class wxPyGridCellEditor : public wxGridCellEditor {
  public:
      %pythonAppend wxPyGridCellEditor  "self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)"
  class wxPyGridCellEditor : public wxGridCellEditor {
  public:
      %pythonAppend wxPyGridCellEditor  "self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)"
-    
+
      wxPyGridCellEditor();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
      wxPyGridCellEditor();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
-    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);
  };
  
  //---------------------------------------------------------------------------
  };
  
  //---------------------------------------------------------------------------
@@ -958,7 +941,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();
  };
  
@@ -1000,14 +983,15 @@ public:
  
      %extend {
          void _setOORInfo(PyObject* _self) {
  
      %extend {
          void _setOORInfo(PyObject* _self) {
-            self->SetClientObject(new wxPyOORClientData(_self));
+            if (!self->GetClientObject())
+                self->SetClientObject(new wxPyOORClientData(_self));
          }
      }
          }
      }
-    
+
      %pythonAppend wxGridCellAttr  "self._setOORInfo(self)"
  
      wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
      %pythonAppend wxGridCellAttr  "self._setOORInfo(self)"
  
      wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
-
+    
      wxGridCellAttr *Clone() const;
      void MergeWith(wxGridCellAttr *mergefrom);
      void IncRef();
      wxGridCellAttr *Clone() const;
      void MergeWith(wxGridCellAttr *mergefrom);
      void IncRef();
@@ -1017,8 +1001,8 @@ public:
      void SetFont(const wxFont& font);
      void SetAlignment(int hAlign, int vAlign);
      void SetSize(int num_rows, int num_cols);
      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);
@@ -1040,7 +1024,7 @@ public:
      DocDeclA(
          void, GetAlignment(int *OUTPUT, int *OUTPUT) const,
          "GetAlignment() -> (hAlign, vAlign)");
      DocDeclA(
          void, GetAlignment(int *OUTPUT, int *OUTPUT) const,
          "GetAlignment() -> (hAlign, vAlign)");
-    
+
      DocDeclA(
          void, GetSize(int *OUTPUT, int *OUTPUT) const,
          "GetSize() -> (num_rows, num_cols)");
      DocDeclA(
          void, GetSize(int *OUTPUT, int *OUTPUT) const,
          "GetSize() -> (num_rows, num_cols)");
@@ -1050,6 +1034,7 @@ public:
      wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
  
      bool IsReadOnly() const;
      wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
  
      bool IsReadOnly() const;
+    wxAttrKind GetKind();
      void SetDefAttr(wxGridCellAttr* defAttr);
  };
  
      void SetDefAttr(wxGridCellAttr* defAttr);
  };
  
@@ -1064,7 +1049,8 @@ public:
  
      %extend {
          void _setOORInfo(PyObject* _self) {
  
      %extend {
          void _setOORInfo(PyObject* _self) {
-            self->SetClientObject(new wxPyOORClientData(_self));
+            if (!self->GetClientObject())
+                self->SetClientObject(new wxPyOORClientData(_self));
          }
      }
  
          }
      }
  
@@ -1105,11 +1091,16 @@ public:
      wxPyGridCellAttrProvider();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
      wxPyGridCellAttrProvider();
      void _setCallbackInfo(PyObject* self, PyObject* _class);
  
-    wxGridCellAttr *base_GetAttr(int row, int col,
+    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(PyGridCellAttrProvider, GetAttr);
+    %MAKE_BASE_FUNC(PyGridCellAttrProvider, SetAttr);
+    %MAKE_BASE_FUNC(PyGridCellAttrProvider, SetRowAttr);
+    %MAKE_BASE_FUNC(PyGridCellAttrProvider, SetColAttr);
  };
  
  
  };
  
  
@@ -1125,7 +1116,8 @@ public:
  
      %extend {
          void _setOORInfo(PyObject* _self) {
  
      %extend {
          void _setOORInfo(PyObject* _self) {
-            self->SetClientObject(new wxPyOORClientData(_self));
+            if (!self->GetClientObject())
+                self->SetClientObject(new wxPyOORClientData(_self));
          }
      }
  
          }
      }
  
@@ -1214,12 +1206,17 @@ 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;
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",row,col));
              if (ro) {
          wxString rval;
          if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
              PyObject* ro;
              ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",row,col));
              if (ro) {
+                if (!PyString_Check(ro) && !PyUnicode_Check(ro)) {
+                    PyObject* old = ro;
+                    ro = PyObject_Str(ro);
+                    Py_DECREF(old);
+                }
                  rval = Py2wxString(ro);
                  Py_DECREF(ro);
              }
                  rval = Py2wxString(ro);
                  Py_DECREF(ro);
              }
@@ -1229,7 +1226,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));
@@ -1243,7 +1240,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;
@@ -1263,7 +1260,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;
@@ -1286,7 +1283,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));
          }
@@ -1294,7 +1291,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));
          }
@@ -1319,28 +1316,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);
  };
  
  
  };
  
  
@@ -1409,7 +1427,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
@@ -1418,7 +1436,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) {
@@ -1432,27 +1450,27 @@ 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;
  }
  
  
  bool wxGridCellCoords_typecheck(PyObject* source) {
      void* ptr;
  }
  
  
  bool wxGridCellCoords_typecheck(PyObject* source) {
      void* ptr;
-    
+
      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 False;
+        return true;
+
+    return false;
  }
  %}
  
  }
  %}
  
@@ -1505,7 +1523,7 @@ public:
      bool operator!=( const wxGridCellCoords& other ) const;
  
      %extend {
      bool operator!=( const wxGridCellCoords& other ) const;
  
      %extend {
-        PyObject* asTuple() {
+        PyObject* Get() {
              PyObject* tup = PyTuple_New(2);
              PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
              PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
              PyObject* tup = PyTuple_New(2);
              PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
              PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
@@ -1513,9 +1531,10 @@ public:
          }
      }
      %pythoncode {
          }
      }
      %pythoncode {
-    def __str__(self):                   return str(self.asTuple())
-    def __repr__(self):                  return 'wxGridCellCoords'+str(self.asTuple())
-    def __len__(self):                   return len(self.asTuple())
+    asTuple = wx._deprecated(Get, "asTuple is deprecated, use `Get` instead")
+    def __str__(self):                   return str(self.Get())
+    def __repr__(self):                  return 'wxGridCellCoords'+str(self.Get())
+    def __len__(self):                   return len(self.Get())
      def __getitem__(self, index):        return self.asTuple()[index]
      def __setitem__(self, index, val):
          if index == 0: self.SetRow(val)
      def __getitem__(self, index):        return self.asTuple()[index]
      def __setitem__(self, index, val):
          if index == 0: self.SetRow(val)
@@ -1541,18 +1560,37 @@ typedef wxGrid::wxGridSelectionModes WXGRIDSELECTIONMODES;
  
  
  
  
  
  
+MustHaveApp(wxGrid);
+
  class wxGrid : public wxScrolledWindow
  {
  public:
      %pythonAppend wxGrid "self._setOORInfo(self)"
  class wxGrid : public wxScrolledWindow
  {
  public:
      %pythonAppend wxGrid "self._setOORInfo(self)"
+    %pythonAppend wxGrid() ""
+    
+    %typemap(out) wxGrid*;    // turn off this typemap
  
      wxGrid( wxWindow *parent,
  
      wxGrid( wxWindow *parent,
-            wxWindowID id,
+            wxWindowID id=-1,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxWANTS_CHARS,
              const wxString& name = wxPyPanelNameStr);
  
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxWANTS_CHARS,
              const wxString& name = wxPyPanelNameStr);
  
+    %RenameCtor(PreGrid,  wxGrid());
+
+    
+    // Turn it back on again
+    %typemap(out) wxGrid* { $result = wxPyMake_wxObject($1, $owner); }
+
+
+    bool Create( wxWindow *parent,
+                 wxWindowID id=-1,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxWANTS_CHARS,
+                 const wxString& name = wxPyPanelNameStr );
+
  
      enum wxGridSelectionModes {
          wxGridSelectCells,
  
      enum wxGridSelectionModes {
          wxGridSelectCells,
@@ -1581,17 +1619,17 @@ public:
  
  
      wxGridTableBase * GetTable() const;
  
  
      wxGridTableBase * GetTable() const;
-    bool SetTable( wxGridTableBase *table, bool takeOwnership=False,
+    bool SetTable( wxGridTableBase *table, bool takeOwnership=false,
                     WXGRIDSELECTIONMODES selmode =
                     wxGrid::wxGridSelectCells );
  
      void ClearGrid();
                     WXGRIDSELECTIONMODES selmode =
                     wxGrid::wxGridSelectCells );
  
      void ClearGrid();
-    bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=True );
-    bool AppendRows( int numRows = 1, bool updateLabels=True );
-    bool DeleteRows( int pos = 0, int numRows = 1, bool updateLabels=True );
-    bool InsertCols( int pos = 0, int numCols = 1, bool updateLabels=True );
-    bool AppendCols( int numCols = 1, bool updateLabels=True );
-    bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=True );
+    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
@@ -1633,7 +1671,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;
@@ -1677,8 +1715,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 );
  
@@ -1711,7 +1749,7 @@ public:
      DocDeclA(
          void, GetRowLabelAlignment( int *OUTPUT, int *OUTPUT ),
          "GetRowLabelAlignment() -> (horiz, vert)");
      DocDeclA(
          void, GetRowLabelAlignment( int *OUTPUT, int *OUTPUT ),
          "GetRowLabelAlignment() -> (horiz, vert)");
-    
+
      DocDeclA(
          void, GetColLabelAlignment( int *OUTPUT, int *OUTPUT ),
          "GetColLabelAlignment() -> (horiz, vert)");
      DocDeclA(
          void, GetColLabelAlignment( int *OUTPUT, int *OUTPUT ),
          "GetColLabelAlignment() -> (horiz, vert)");
@@ -1739,21 +1777,32 @@ 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     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
@@ -1762,7 +1811,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
@@ -1781,7 +1830,7 @@ public:
      DocDeclA(
          void, GetDefaultCellAlignment( int *OUTPUT, int *OUTPUT ),
          "GetDefaultCellAlignment() -> (horiz, vert)");
      DocDeclA(
          void, GetDefaultCellAlignment( int *OUTPUT, int *OUTPUT ),
          "GetDefaultCellAlignment() -> (horiz, vert)");
-    
+
      DocDeclA(
          void, GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT ),
          "GetCellAlignment() -> (horiz, vert)");
      DocDeclA(
          void, GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT ),
          "GetCellAlignment() -> (horiz, vert)");
@@ -1793,22 +1842,22 @@ 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 );
  
      // 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     SetColSize( int col, int width );
  
      // automatically size the column or row to fit to its contents, if
      // setAsMin is True, this optimal width will also be set as minimal width
      // 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
@@ -1871,15 +1920,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 )
  
@@ -1937,7 +1986,17 @@ public:
      wxWindow* GetGridColLabelWindow();
      wxWindow* GetGridCornerLabelWindow();
  
      wxWindow* GetGridColLabelWindow();
      wxWindow* GetGridCornerLabelWindow();
  
+    // Allow adjustment of scroll increment. The default is (15, 15).
+    void SetScrollLineX(int x);
+    void SetScrollLineY(int y);
+    int GetScrollLineX() const;
+    int GetScrollLineY() const;
  
  
+    int GetScrollX(int x) const;
+    int GetScrollY(int y) const;
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
  };
  
  
  };
  
  
@@ -1951,8 +2010,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();
@@ -1971,7 +2030,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();
@@ -1989,9 +2048,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();
@@ -2038,6 +2097,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;
  
  
  
  
  
  
@@ -2058,6 +2118,28 @@ 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
+EVT_GRID_CMD_CELL_LEFT_CLICK =     wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_CLICK,    1 )
+EVT_GRID_CMD_CELL_RIGHT_CLICK =    wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_CLICK,   1 )
+EVT_GRID_CMD_CELL_LEFT_DCLICK =    wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_DCLICK,   1 )
+EVT_GRID_CMD_CELL_RIGHT_DCLICK =   wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_DCLICK,  1 )
+EVT_GRID_CMD_LABEL_LEFT_CLICK =    wx.PyEventBinder( wxEVT_GRID_LABEL_LEFT_CLICK,   1 )
+EVT_GRID_CMD_LABEL_RIGHT_CLICK =   wx.PyEventBinder( wxEVT_GRID_LABEL_RIGHT_CLICK,  1 )
+EVT_GRID_CMD_LABEL_LEFT_DCLICK =   wx.PyEventBinder( wxEVT_GRID_LABEL_LEFT_DCLICK,  1 )
+EVT_GRID_CMD_LABEL_RIGHT_DCLICK =  wx.PyEventBinder( wxEVT_GRID_LABEL_RIGHT_DCLICK, 1 )
+EVT_GRID_CMD_ROW_SIZE =            wx.PyEventBinder( wxEVT_GRID_ROW_SIZE,           1 )
+EVT_GRID_CMD_COL_SIZE =            wx.PyEventBinder( wxEVT_GRID_COL_SIZE,           1 )
+EVT_GRID_CMD_RANGE_SELECT =        wx.PyEventBinder( wxEVT_GRID_RANGE_SELECT,       1 )
+EVT_GRID_CMD_CELL_CHANGE =         wx.PyEventBinder( wxEVT_GRID_CELL_CHANGE,        1 )
+EVT_GRID_CMD_SELECT_CELL =         wx.PyEventBinder( wxEVT_GRID_SELECT_CELL,        1 )
+EVT_GRID_CMD_EDITOR_SHOWN =        wx.PyEventBinder( wxEVT_GRID_EDITOR_SHOWN,       1 )
+EVT_GRID_CMD_EDITOR_HIDDEN =       wx.PyEventBinder( wxEVT_GRID_EDITOR_HIDDEN,      1 )
+EVT_GRID_CMD_EDITOR_CREATED =      wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED,     1 )
+EVT_GRID_CMD_CELL_BEGIN_DRAG =     wx.PyEventBinder( wxEVT_GRID_CELL_BEGIN_DRAG,    1 )
+    
  }
  
  //---------------------------------------------------------------------------
  }
  
  //---------------------------------------------------------------------------