Typos

[wxWidgets.git] / wxPython / src / grid.i

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index 8e10b08c6f50ec6c1d3acfe752be310a71046596..d7d4d4bca35309ec6bb41b5343701e6c0662a615 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -12,46 +12,38 @@
 
 %module grid
 
 
 %module grid
 

-#ifndef OLD_GRID
-

 %{
 %{

-#include "wxPython.h"
+#include "wx/wxPython/wxPython.h"
+#include "wx/wxPython/pyclasses.h"
+#include "wx/wxPython/printfw.h"
+

 #include <wx/grid.h>
 #include <wx/generic/gridctrl.h>
 #include <wx/grid.h>
 #include <wx/generic/gridctrl.h>

+

 %}
 
 %}
 

-//----------------------------------------------------------------------

 
 

-%include typemaps.i
-%include my_typemaps.i
+//---------------------------------------------------------------------------

 
 

-// Import some definitions of other classes, etc.
-%import _defs.i
-%import misc.i
-%import gdi.i

 %import windows.i
 %import windows.i

-%import controls.i
-%import events.i
+%pythoncode { wx = core }

 
 

-%pragma(python) code = "import wx"

 
 

-//----------------------------------------------------------------------
+%include _grid_rename.i
+
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
+MAKE_CONST_WXSTRING2(DateTimeFormatStr, wxT("%c"));

 
 

-%{
-    // Put some wx default wxChar* values into wxStrings.
-    DECLARE_DEF_STRING(PanelNameStr);
-    DECLARE_DEF_STRING2(DateTimeFormatStr, wxT("%c"));
-    static const wxString wxPyEmptyString(wxT(""));
-%}

 
 //---------------------------------------------------------------------------
 // OOR related typemaps and helper functions
 
 
 //---------------------------------------------------------------------------
 // OOR related typemaps and helper functions
 

-%typemap(python, out) wxGridCellRenderer*     { $target = wxPyMake_wxGridCellRenderer($source); }
-%typemap(python, out) wxGridCellEditor*       { $target = wxPyMake_wxGridCellEditor($source); }
-%typemap(python, out) wxGridCellAttr*         { $target = wxPyMake_wxGridCellAttr($source); }
-%typemap(python, out) wxGridCellAttrProvider* { $target = wxPyMake_wxGridCellAttrProvider($source); }
-%typemap(python, out) wxGridTableBase*        { $target = wxPyMake_wxGridTableBase($source); }
+%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); }

 
 
 %{
 
 
 %{


@@ -70,7 +62,7 @@ PyObject* wxPyMake_##TYPE(TYPE* source) { \
         /* 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), False); \

             if (target) \
                 source->SetClientObject(new wxPyOORClientData(target)); \
         } \
             if (target) \
                 source->SetClientObject(new wxPyOORClientData(target)); \
         } \


@@ -101,18 +93,18 @@ 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;                                                             \

-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
             wxGridCellAttr* ptr;                                                \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \
             if (ro) {                                                           \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
             wxGridCellAttr* ptr;                                                \
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \
             if (ro) {                                                           \

-                if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellAttr_p"))    \
+                if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr")))    \

                     rval = ptr;                                                 \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \
                     rval = ptr;                                                 \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a, b, c);                                     \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a, b, c);                                     \
         return rval;                                                            \


@@ -125,14 +117,14 @@ wxPyMake_TEMPLATE(wxGridTableBase)
 
 #define PYCALLBACK__GCAINTINT(PCLASS, CBNAME)                                   \
     void CBNAME(wxGridCellAttr *attr, int a, int b) {                           \
 
 #define PYCALLBACK__GCAINTINT(PCLASS, CBNAME)                                   \
     void CBNAME(wxGridCellAttr *attr, int a, int b) {                           \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         bool found;                                                             \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* obj = wxPyMake_wxGridCellAttr(attr);                      \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b));  \
             Py_DECREF(obj);                                                     \
         }                                                                       \
         bool found;                                                             \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* obj = wxPyMake_wxGridCellAttr(attr);                      \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b));  \
             Py_DECREF(obj);                                                     \
         }                                                                       \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             PCLASS::CBNAME(attr, a, b);                                         \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(attr, a, b);                                         \
     }                                                                           \


@@ -144,14 +136,14 @@ wxPyMake_TEMPLATE(wxGridTableBase)
 
 #define PYCALLBACK__GCAINT(PCLASS, CBNAME)                                      \
     void CBNAME(wxGridCellAttr *attr, int val) {                                \
 
 #define PYCALLBACK__GCAINT(PCLASS, CBNAME)                                      \
     void CBNAME(wxGridCellAttr *attr, int val) {                                \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         bool found;                                                             \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* obj = wxPyMake_wxGridCellAttr(attr);                      \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val));    \
             Py_DECREF(obj);                                                     \
         }                                                                       \
         bool found;                                                             \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* obj = wxPyMake_wxGridCellAttr(attr);                      \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val));    \
             Py_DECREF(obj);                                                     \
         }                                                                       \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \

         if (! found)                                                            \
             PCLASS::CBNAME(attr, val);                                          \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(attr, val);                                          \
     }                                                                           \


@@ -163,11 +155,11 @@ wxPyMake_TEMPLATE(wxGridTableBase)
 
 #define PYCALLBACK_INT__pure(CBNAME)                                            \
     int  CBNAME() {                                                             \
 
 #define PYCALLBACK_INT__pure(CBNAME)                                            \
     int  CBNAME() {                                                             \

-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \

         int rval = 0;                                                           \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
         int rval = 0;                                                           \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \

         return rval;                                                            \
     }
 
         return rval;                                                            \
     }
 


@@ -175,18 +167,18 @@ wxPyMake_TEMPLATE(wxGridTableBase)
 
 #define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                                     \
     bool CBNAME(int a, int b) {                                                 \
 
 #define PYCALLBACK_BOOL_INTINT_pure(CBNAME)                                     \
     bool CBNAME(int a, int b) {                                                 \

-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \

         bool rval = 0;                                                          \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));   \
         bool rval = 0;                                                          \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b));   \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \

         return rval;                                                            \
     }
 
 
 #define PYCALLBACK_STRING_INTINT_pure(CBNAME)                                   \
     wxString CBNAME(int a, int b) {                                             \
         return rval;                                                            \
     }
 
 
 #define PYCALLBACK_STRING_INTINT_pure(CBNAME)                                   \
     wxString CBNAME(int a, int b) {                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         wxString rval;                                                          \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
             PyObject* ro;                                                       \
         wxString rval;                                                          \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
             PyObject* ro;                                                       \


@@ -196,27 +188,27 @@ wxPyMake_TEMPLATE(wxGridTableBase)
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         return rval;                                                            \
     }
 
 
 #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
     void CBNAME(int a, int b, const wxString& c) {                              \
         return rval;                                                            \
     }
 
 
 #define PYCALLBACK__INTINTSTRING_pure(CBNAME)                                   \
     void CBNAME(int a, int b, const wxString& c) {                              \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
             PyObject* s = wx2PyString(c);                                       \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
             Py_DECREF(s);                                                       \
         }                                                                       \
         if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
             PyObject* s = wx2PyString(c);                                       \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
             Py_DECREF(s);                                                       \
         }                                                                       \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

     }
 
 
 #define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME)                                \
     wxString CBNAME(int a, int b) {                                             \
         bool found;                                                             \
     }
 
 
 #define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME)                                \
     wxString CBNAME(int a, int b) {                                             \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         wxString rval;                                                          \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
         wxString rval;                                                          \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \


@@ -226,7 +218,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a, b);                                        \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a, b);                                        \
         return rval;                                                            \


@@ -240,13 +232,13 @@ wxPyMake_TEMPLATE(wxGridTableBase)
     bool CBNAME(int a, int b, const wxString& c)  {                             \
         bool rval = 0;                                                          \
         bool found;                                                             \
     bool CBNAME(int a, int b, const wxString& c)  {                             \
         bool rval = 0;                                                          \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* s = wx2PyString(c);                                       \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
             Py_DECREF(s);                                                       \
         }                                                                       \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* s = wx2PyString(c);                                       \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
             Py_DECREF(s);                                                       \
         }                                                                       \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a,b,c);                                       \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a,b,c);                                       \
         return rval;                                                            \


@@ -262,10 +254,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
     long CBNAME(int a, int b)  {                                                \
         long rval;                                                              \
         bool found;                                                             \
     long CBNAME(int a, int b)  {                                                \
         long rval;                                                              \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a,b);                                         \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a,b);                                         \
         return rval;                                                            \


@@ -280,10 +272,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
     bool CBNAME(int a, int b)  {                                                \
         bool rval = 0;                                                          \
         bool found;                                                             \
     bool CBNAME(int a, int b)  {                                                \
         bool rval = 0;                                                          \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \

-        wxPyEndBlockThreads();                                             \
+        wxPyEndBlockThreads(blocked);                                             \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a,b);                                         \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a,b);                                         \
         return rval;                                                            \


@@ -297,7 +289,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
 #define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME)                                \
     double CBNAME(int a, int b) {                                               \
         bool found;                                                             \
 #define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME)                                \
     double CBNAME(int a, int b) {                                               \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                            \
+        bool blocked = wxPyBeginBlockThreads();                            \

         double rval;                                                            \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
         double rval;                                                            \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \


@@ -308,7 +300,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
                 Py_DECREF(ro);   Py_DECREF(str);                                \
             }                                                                   \
         }                                                                       \
                 Py_DECREF(ro);   Py_DECREF(str);                                \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a, b);                                        \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a, b);                                        \
         return rval;                                                            \


@@ -322,10 +314,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
 #define PYCALLBACK__(PCLASS, CBNAME)                                            \
     void CBNAME()  {                                                            \
         bool found;                                                             \
 #define PYCALLBACK__(PCLASS, CBNAME)                                            \
     void CBNAME()  {                                                            \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));                \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             PCLASS::CBNAME();                                                   \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME();                                                   \
     }                                                                           \


@@ -340,10 +332,10 @@ 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;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));  \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a,b);                                         \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a,b);                                         \
         return rval;                                                            \


@@ -358,10 +350,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
     bool CBNAME(size_t a)  {                                                    \
         bool rval = 0;                                                          \
         bool found;                                                             \
     bool CBNAME(size_t a)  {                                                    \
         bool rval = 0;                                                          \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));     \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));     \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \


@@ -374,7 +366,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
 #define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                                   \
     wxString CBNAME(int a) {                                                    \
         bool found;                                                             \
 #define PYCALLBACK_STRING_INT(PCLASS, CBNAME)                                   \
     wxString CBNAME(int a) {                                                    \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         wxString rval;                                                          \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \
         wxString rval;                                                          \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* ro;                                                       \


@@ -384,7 +376,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
         }                                                                       \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME(a);                                           \
         return rval;                                                            \


@@ -397,13 +389,13 @@ wxPyMake_TEMPLATE(wxGridTableBase)
 #define PYCALLBACK__INTSTRING(PCLASS, CBNAME)                                   \
     void CBNAME(int a, const wxString& c)  {                                    \
         bool found;                                                             \
 #define PYCALLBACK__INTSTRING(PCLASS, CBNAME)                                   \
     void CBNAME(int a, const wxString& c)  {                                    \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* s = wx2PyString(c);                                       \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s));          \
             Py_DECREF(s);                                                       \
         }                                                                       \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* s = wx2PyString(c);                                       \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s));          \
             Py_DECREF(s);                                                       \
         }                                                                       \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             PCLASS::CBNAME(a,c);                                                \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(a,c);                                                \
     }                                                                           \


@@ -418,10 +410,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
     bool CBNAME()  {                                                            \
         bool rval = 0;                                                          \
         bool found;                                                             \
     bool CBNAME()  {                                                            \
         bool rval = 0;                                                          \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));         \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             rval = PCLASS::CBNAME();                                            \
         return rval;                                                            \
         if (! found)                                                            \
             rval = PCLASS::CBNAME();                                            \
         return rval;                                                            \


@@ -435,10 +427,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
 #define PYCALLBACK__SIZETINT(PCLASS, CBNAME)                                    \
     void CBNAME(size_t a, int b)  {                                             \
         bool found;                                                             \
 #define PYCALLBACK__SIZETINT(PCLASS, CBNAME)                                    \
     void CBNAME(size_t a, int b)  {                                             \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));         \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b));         \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             PCLASS::CBNAME(a,b);                                                \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(a,b);                                                \
     }                                                                           \


@@ -452,10 +444,10 @@ 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;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             PCLASS::CBNAME(a,b,c);                                              \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(a,b,c);                                              \
     }                                                                           \


@@ -469,10 +461,10 @@ 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;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c));      \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c));      \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             PCLASS::CBNAME(a,b,c);                                              \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(a,b,c);                                              \
     }                                                                           \


@@ -485,10 +477,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
 #define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME)                                  \
     void CBNAME(int a, int b, bool c)  {                                        \
         bool found;                                                             \
 #define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME)                                  \
     void CBNAME(int a, int b, bool c)  {                                        \
         bool found;                                                             \

-        wxPyBeginBlockThreads();                                                \
+        bool blocked = wxPyBeginBlockThreads();                                                \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME)))                  \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));      \

-        wxPyEndBlockThreads();                                                  \
+        wxPyEndBlockThreads(blocked);                                                  \

         if (! found)                                                            \
             PCLASS::CBNAME(a,b,c);                                              \
     }                                                                           \
         if (! found)                                                            \
             PCLASS::CBNAME(a,b,c);                                              \
     }                                                                           \


@@ -517,10 +509,10 @@ class wxGridCellAttr;
 #define wxGRID_VALUE_DATETIME   "datetime"
 
 
 #define wxGRID_VALUE_DATETIME   "datetime"
 
 

-%readonly
-wxGridCellCoords wxGridNoCellCoords;
-wxRect           wxGridNoCellRect;
-%readwrite
+%immutable;
+const wxGridCellCoords wxGridNoCellCoords;
+const wxRect           wxGridNoCellRect;
+%mutable;

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------


@@ -531,7 +523,7 @@ wxRect           wxGridNoCellRect;
 class wxGridCellRenderer
 {
 public:
 class wxGridCellRenderer
 {
 public:

-    %addmethods {
+    %extend {

         void _setOORInfo(PyObject* _self) {
             self->SetClientObject(new wxPyOORClientData(_self));
         }
         void _setOORInfo(PyObject* _self) {
             self->SetClientObject(new wxPyOORClientData(_self));
         }


@@ -546,12 +538,12 @@ public:
                       wxDC& dc,
                       const wxRect& rect,
                       int row, int col,
                       wxDC& dc,
                       const wxRect& rect,
                       int row, int col,

-                      bool isSelected) = 0;
+                      bool isSelected);

     virtual wxSize GetBestSize(wxGrid& grid,
                                wxGridCellAttr& attr,
                                wxDC& dc,
     virtual wxSize GetBestSize(wxGrid& grid,
                                wxGridCellAttr& attr,
                                wxDC& dc,

-                               int row, int col) = 0;
-    virtual wxGridCellRenderer *Clone() const = 0;
+                               int row, int col);
+    virtual wxGridCellRenderer *Clone() const;

 };
 
 
 };
 
 


@@ -566,7 +558,7 @@ public:
     void Draw(wxGrid& grid, wxGridCellAttr& attr,
               wxDC& dc, const wxRect& rect,
               int row, int col, bool isSelected) {
     void Draw(wxGrid& grid, wxGridCellAttr& attr,
               wxDC& dc, const wxRect& rect,
               int row, int col, bool isSelected) {

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "Draw")) {
             PyObject* go = wxPyMake_wxObject(&grid);
             PyObject* dco = wxPyMake_wxObject(&dc);
         if (wxPyCBH_findCallback(m_myInst, "Draw")) {
             PyObject* go = wxPyMake_wxObject(&grid);
             PyObject* dco = wxPyMake_wxObject(&dc);


@@ -580,13 +572,13 @@ public:
             Py_DECREF(dco);
             Py_DECREF(ro);
         }
             Py_DECREF(dco);
             Py_DECREF(ro);
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
 
     wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
                        int row, int col) {
         wxSize rval;
     }
 
     wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
                        int row, int col) {
         wxSize rval;

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
             PyObject* ro;
             wxSize*   ptr;
         if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
             PyObject* ro;
             wxSize*   ptr;


@@ -603,7 +595,7 @@ public:
 
             if (ro) {
                 const char* errmsg = "GetBestSize should return a 2-tuple of integers or a wxSize object.";
 
             if (ro) {
                 const char* errmsg = "GetBestSize should return a 2-tuple of integers or a wxSize object.";

-                if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p")) {
+                if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxSize"))) {

                     rval = *ptr;
                 }
                 else if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
                     rval = *ptr;
                 }
                 else if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {


@@ -622,25 +614,25 @@ public:
                 Py_DECREF(ro);
             }
         }
                 Py_DECREF(ro);
             }
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         return rval;
     }
 
 
     wxGridCellRenderer *Clone() const {
         wxGridCellRenderer* rval = NULL;
         return rval;
     }
 
 
     wxGridCellRenderer *Clone() const {
         wxGridCellRenderer* rval = NULL;

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "Clone")) {
             PyObject* ro;
             wxGridCellRenderer* ptr;
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
             if (ro) {
         if (wxPyCBH_findCallback(m_myInst, "Clone")) {
             PyObject* ro;
             wxGridCellRenderer* ptr;
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
             if (ro) {

-                if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellRenderer_p"))
+                if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellRenderer")))

                     rval = ptr;
                 Py_DECREF(ro);
             }
         }
                     rval = ptr;
                 Py_DECREF(ro);
             }
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         return rval;
     }
 
         return rval;
     }
 


@@ -657,10 +649,10 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters)
 // Let SWIG know about it so it can create the Python version
 class wxPyGridCellRenderer : public wxGridCellRenderer {
 public:
 // Let SWIG know about it so it can create the Python version
 class wxPyGridCellRenderer : public wxGridCellRenderer {
 public:

+    %pythonAppend wxPyGridCellRenderer  "self._setCallbackInfo(self, PyGridCellRenderer);self._setOORInfo(self)"
+

     wxPyGridCellRenderer();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     wxPyGridCellRenderer();
     void _setCallbackInfo(PyObject* self, PyObject* _class);

-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellRenderer)"
-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 
     void base_SetParameters(const wxString& params);
 };
 
     void base_SetParameters(const wxString& params);
 };


@@ -671,24 +663,24 @@ public:
 class wxGridCellStringRenderer : public wxGridCellRenderer
 {
 public:
 class wxGridCellStringRenderer : public wxGridCellRenderer
 {
 public:

+    %pythonAppend wxGridCellStringRenderer "self._setOORInfo(self)"

     wxGridCellStringRenderer();
     wxGridCellStringRenderer();

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 };
 
 
 class  wxGridCellNumberRenderer : public wxGridCellStringRenderer
 {
 public:
 };
 
 
 class  wxGridCellNumberRenderer : public wxGridCellStringRenderer
 {
 public:

+    %pythonAppend wxGridCellNumberRenderer "self._setOORInfo(self)"

     wxGridCellNumberRenderer();
     wxGridCellNumberRenderer();

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 };
 
 
 class  wxGridCellFloatRenderer : public wxGridCellStringRenderer
 {
 public:
 };
 
 
 class  wxGridCellFloatRenderer : public wxGridCellStringRenderer
 {
 public:

+    %pythonAppend wxGridCellFloatRenderer "self._setOORInfo(self)"

     wxGridCellFloatRenderer(int width = -1, int precision = -1);
     wxGridCellFloatRenderer(int width = -1, int precision = -1);

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 
     int GetWidth() const;
     void SetWidth(int width);
 
     int GetWidth() const;
     void SetWidth(int width);


@@ -700,33 +692,33 @@ public:
 class  wxGridCellBoolRenderer : public wxGridCellRenderer
 {
 public:
 class  wxGridCellBoolRenderer : public wxGridCellRenderer
 {
 public:

+    %pythonAppend wxGridCellBoolRenderer "self._setOORInfo(self)"

     wxGridCellBoolRenderer();
     wxGridCellBoolRenderer();

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 };
 
 
 class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
 {
 public:
 };
 
 
 class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
 {
 public:

+    %pythonAppend wxGridCellDateTimeRenderer "self._setOORInfo(self)"

     wxGridCellDateTimeRenderer(wxString outformat = wxPyDateTimeFormatStr,
                                wxString informat =  wxPyDateTimeFormatStr);
     wxGridCellDateTimeRenderer(wxString outformat = wxPyDateTimeFormatStr,
                                wxString informat =  wxPyDateTimeFormatStr);

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 };
 
 
 class wxGridCellEnumRenderer : public wxGridCellStringRenderer
 {
 public:
 };
 
 
 class wxGridCellEnumRenderer : public wxGridCellStringRenderer
 {
 public:

+    %pythonAppend wxGridCellEnumRenderer "self._setOORInfo(self)"

     wxGridCellEnumRenderer( const wxString& choices = wxPyEmptyString );
     wxGridCellEnumRenderer( const wxString& choices = wxPyEmptyString );

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 };
 
 
 class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
 {
 public:
 };
 
 
 class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
 {
 public:

+    %pythonAppend wxGridCellAutoWrapStringRenderer "self._setOORInfo(self)"

     wxGridCellAutoWrapStringRenderer();
     wxGridCellAutoWrapStringRenderer();

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 };
 
 
 };
 
 


@@ -737,7 +729,7 @@ public:
 class  wxGridCellEditor
 {
 public:
 class  wxGridCellEditor
 {
 public:

-    %addmethods {
+    %extend {

         void _setOORInfo(PyObject* _self) {
             self->SetClientObject(new wxPyOORClientData(_self));
         }
         void _setOORInfo(PyObject* _self) {
             self->SetClientObject(new wxPyOORClientData(_self));
         }


@@ -756,11 +748,11 @@ public:
 
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
 
     virtual void Create(wxWindow* parent,
                         wxWindowID id,

-                        wxEvtHandler* evtHandler) = 0;
-    virtual void BeginEdit(int row, int col, wxGrid* grid) = 0;
-    virtual bool EndEdit(int row, int col, wxGrid* grid) = 0;
-    virtual void Reset() = 0;
-    virtual wxGridCellEditor *Clone() const = 0;
+                        wxEvtHandler* evtHandler);
+    virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual bool EndEdit(int row, int col, wxGrid* grid);
+    virtual void Reset();
+    virtual wxGridCellEditor *Clone() const;

 
     virtual void SetSize(const wxRect& rect);
     virtual void Show(bool show, wxGridCellAttr *attr = NULL);
 
     virtual void SetSize(const wxRect& rect);
     virtual void Show(bool show, wxGridCellAttr *attr = NULL);


@@ -771,7 +763,6 @@ public:
     virtual void HandleReturn(wxKeyEvent& event);
     virtual void Destroy();
 
     virtual void HandleReturn(wxKeyEvent& event);
     virtual void Destroy();
 

-    virtual wxString GetValue();

 };
 
 
 };
 
 


@@ -783,7 +774,7 @@ public:
     wxPyGridCellEditor() : wxGridCellEditor() {}
 
     void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
     wxPyGridCellEditor() : wxGridCellEditor() {}
 
     void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "Create")) {
             PyObject* po = wxPyMake_wxObject(parent);
             PyObject* eo = wxPyMake_wxObject(evtHandler);
         if (wxPyCBH_findCallback(m_myInst, "Create")) {
             PyObject* po = wxPyMake_wxObject(parent);
             PyObject* eo = wxPyMake_wxObject(evtHandler);


@@ -792,61 +783,61 @@ public:
             Py_DECREF(po);
             Py_DECREF(eo);
         }
             Py_DECREF(po);
             Py_DECREF(eo);
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
 
 
     void BeginEdit(int row, int col, wxGrid* grid) {
     }
 
 
     void BeginEdit(int row, int col, wxGrid* grid) {

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
             PyObject* go = wxPyMake_wxObject(grid);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
             Py_DECREF(go);
         }
         if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
             PyObject* go = wxPyMake_wxObject(grid);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
             Py_DECREF(go);
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
 
 
     bool EndEdit(int row, int col, wxGrid* grid) {
     }
 
 
     bool EndEdit(int row, int col, wxGrid* grid) {

-        bool rv = FALSE;
-        wxPyBeginBlockThreads();
+        bool rv = False;
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
             PyObject* go = wxPyMake_wxObject(grid);
             rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
             Py_DECREF(go);
         }
         if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
             PyObject* go = wxPyMake_wxObject(grid);
             rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
             Py_DECREF(go);
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         return rv;
     }
 
 
     wxGridCellEditor* Clone() const {
         wxGridCellEditor* rval = NULL;
         return rv;
     }
 
 
     wxGridCellEditor* Clone() const {
         wxGridCellEditor* rval = NULL;

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "Clone")) {
             PyObject* ro;
             wxGridCellEditor* ptr;
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
             if (ro) {
         if (wxPyCBH_findCallback(m_myInst, "Clone")) {
             PyObject* ro;
             wxGridCellEditor* ptr;
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
             if (ro) {

-                if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellEditor_p"))
+                if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellEditor")))

                     rval = ptr;
                 Py_DECREF(ro);
             }
         }
                     rval = ptr;
                 Py_DECREF(ro);
             }
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         return rval;
     }
 
 
     void Show(bool show, wxGridCellAttr *attr) {
         bool found;
         return rval;
     }
 
 
     void Show(bool show, wxGridCellAttr *attr) {
         bool found;

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) {
             PyObject* ao = wxPyMake_wxGridCellAttr(attr);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao));
             Py_DECREF(ao);
         }
         if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) {
             PyObject* ao = wxPyMake_wxGridCellAttr(attr);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao));
             Py_DECREF(ao);
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         if (! found)
             wxGridCellEditor::Show(show, attr);
     }
         if (! found)
             wxGridCellEditor::Show(show, attr);
     }


@@ -857,7 +848,7 @@ public:
 
     void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
         bool found;
 
     void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
         bool found;

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
             PyObject* ao = wxPyMake_wxGridCellAttr(attr);
             PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);
         if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
             PyObject* ao = wxPyMake_wxGridCellAttr(attr);
             PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);


@@ -867,7 +858,7 @@ public:
             Py_DECREF(ro);
             Py_DECREF(ao);
         }
             Py_DECREF(ro);
             Py_DECREF(ao);
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         if (! found)
             wxGridCellEditor::PaintBackground(rectCell, attr);
     }
         if (! found)
             wxGridCellEditor::PaintBackground(rectCell, attr);
     }


@@ -884,7 +875,7 @@ public:
     DEC_PYCALLBACK__(StartingClick);
     DEC_PYCALLBACK__(Destroy);
     DEC_PYCALLBACK__STRING(SetParameters);
     DEC_PYCALLBACK__(StartingClick);
     DEC_PYCALLBACK__(Destroy);
     DEC_PYCALLBACK__STRING(SetParameters);

-    DEC_PYCALLBACK_STRING__const(GetValue);
+    DEC_PYCALLBACK_STRING__constpure(GetValue);

 
     PYPRIVATE;
 };
 
     PYPRIVATE;
 };


@@ -898,7 +889,7 @@ IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, StartingKey, wxKeyEven
 IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, HandleReturn, wxKeyEvent);
 IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, StartingClick);
 IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, Destroy);
 IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, HandleReturn, wxKeyEvent);
 IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, StartingClick);
 IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, Destroy);

-IMP_PYCALLBACK_STRING__const(wxPyGridCellEditor, wxGridCellEditor, GetValue);
+IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue);

 
 %}
 
 
 %}
 


@@ -906,21 +897,20 @@ IMP_PYCALLBACK_STRING__const(wxPyGridCellEditor, wxGridCellEditor, GetValue);
 // Let SWIG know about it so it can create the Python version
 class wxPyGridCellEditor : public wxGridCellEditor {
 public:
 // Let SWIG know about it so it can create the Python version
 class wxPyGridCellEditor : public wxGridCellEditor {
 public:

+    %pythonAppend wxPyGridCellEditor  "self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)"
+    

     wxPyGridCellEditor();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     wxPyGridCellEditor();
     void _setCallbackInfo(PyObject* self, PyObject* _class);

-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellEditor)"
-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 
     void base_SetSize(const wxRect& rect);
     void base_Show(bool show, wxGridCellAttr *attr = NULL);
     void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
 
     void base_SetSize(const wxRect& rect);
     void base_Show(bool show, wxGridCellAttr *attr = NULL);
     void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);

-    void base_IsAcceptedKey(wxKeyEvent& event);
+    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 base_StartingKey(wxKeyEvent& event);
     void base_StartingClick();
     void base_HandleReturn(wxKeyEvent& event);
     void base_Destroy();
     void base_SetParameters(const wxString& params);

-    wxString base_GetValue();

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -929,57 +919,64 @@ public:
 class wxGridCellTextEditor : public wxGridCellEditor
 {
 public:
 class wxGridCellTextEditor : public wxGridCellEditor
 {
 public:

+    %pythonAppend wxGridCellTextEditor  "self._setOORInfo(self)"

     wxGridCellTextEditor();
     wxGridCellTextEditor();

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    virtual wxString GetValue();

 };
 
 
 class wxGridCellNumberEditor : public wxGridCellTextEditor
 {
 public:
 };
 
 
 class wxGridCellNumberEditor : public wxGridCellTextEditor
 {
 public:

+    %pythonAppend wxGridCellNumberEditor  "self._setOORInfo(self)"

     wxGridCellNumberEditor(int min = -1, int max = -1);
     wxGridCellNumberEditor(int min = -1, int max = -1);

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    virtual wxString GetValue();

 };
 
 
 class wxGridCellFloatEditor : public wxGridCellTextEditor
 {
 public:
 };
 
 
 class wxGridCellFloatEditor : public wxGridCellTextEditor
 {
 public:

+    %pythonAppend wxGridCellFloatEditor  "self._setOORInfo(self)"

     wxGridCellFloatEditor();
     wxGridCellFloatEditor();

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    virtual wxString GetValue();

 };
 
 
 class wxGridCellBoolEditor : public wxGridCellEditor
 {
 public:
 };
 
 
 class wxGridCellBoolEditor : public wxGridCellEditor
 {
 public:

+    %pythonAppend wxGridCellBoolEditor  "self._setOORInfo(self)"

     wxGridCellBoolEditor();
     wxGridCellBoolEditor();

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    virtual wxString GetValue();

 };
 
 class wxGridCellChoiceEditor : public wxGridCellEditor
 {
 public:
 };
 
 class wxGridCellChoiceEditor : public wxGridCellEditor
 {
 public:

-    wxGridCellChoiceEditor(int LCOUNT = 0,
-                           const wxString* choices = NULL,
-                           bool allowOthers = FALSE);
-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pythonAppend wxGridCellChoiceEditor  "self._setOORInfo(self)"
+    wxGridCellChoiceEditor(int choices = 0,
+                           const wxString* choices_array = NULL,
+                           bool allowOthers = False);
+    virtual wxString GetValue();

 };
 
 
 class wxGridCellEnumEditor : public wxGridCellChoiceEditor
 {
 public:
 };
 
 
 class wxGridCellEnumEditor : public wxGridCellChoiceEditor
 {
 public:

+    %pythonAppend wxGridCellEnumEditor  "self._setOORInfo(self)"

     wxGridCellEnumEditor( const wxString& choices = wxPyEmptyString );
     wxGridCellEnumEditor( const wxString& choices = wxPyEmptyString );

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    virtual wxString GetValue();

 };
 
 
 class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
 {
 public:
 };
 
 
 class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
 {
 public:

+    %pythonAppend wxGridCellAutoWrapStringEditor  "self._setOORInfo(self)"

     wxGridCellAutoWrapStringEditor();
     wxGridCellAutoWrapStringEditor();

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    virtual wxString GetValue();

 };
 
 
 };
 
 


@@ -1000,14 +997,15 @@ public:
         Merged
     };
 
         Merged
     };
 

-    %addmethods {
+    %extend {

         void _setOORInfo(PyObject* _self) {
             self->SetClientObject(new wxPyOORClientData(_self));
         }
     }
         void _setOORInfo(PyObject* _self) {
             self->SetClientObject(new wxPyOORClientData(_self));
         }
     }

+    
+    %pythonAppend wxGridCellAttr  "self._setOORInfo(self)"

 
     wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
 
     wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 
     wxGridCellAttr *Clone() const;
     void MergeWith(wxGridCellAttr *mergefrom);
 
     wxGridCellAttr *Clone() const;
     void MergeWith(wxGridCellAttr *mergefrom);


@@ -1018,8 +1016,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 );
-    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);


@@ -1032,12 +1030,20 @@ public:
     bool HasRenderer() const;
     bool HasEditor() const;
     bool HasReadWriteMode() const;
     bool HasRenderer() const;
     bool HasEditor() const;
     bool HasReadWriteMode() const;

+    bool HasOverflowMode() const;

 
     wxColour GetTextColour() const;
     wxColour GetBackgroundColour() const;
     wxFont GetFont() const;
 
     wxColour GetTextColour() const;
     wxColour GetBackgroundColour() const;
     wxFont GetFont() const;

-    void GetAlignment(int *OUTPUT, int *OUTPUT) const;
-    void GetSize(int *num_rows, int *num_cols) const;
+
+    DocDeclA(
+        void, GetAlignment(int *OUTPUT, int *OUTPUT) const,
+        "GetAlignment() -> (hAlign, vAlign)");
+    
+    DocDeclA(
+        void, GetSize(int *OUTPUT, int *OUTPUT) const,
+        "GetSize() -> (num_rows, num_cols)");
+

     bool GetOverflow() const;
     wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
     wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
     bool GetOverflow() const;
     wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
     wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;


@@ -1051,11 +1057,11 @@ public:
 class wxGridCellAttrProvider
 {
 public:
 class wxGridCellAttrProvider
 {
 public:

+    %pythonAppend wxGridCellAttrProvider "self._setOORInfo(self)"

     wxGridCellAttrProvider();
     // ???? virtual ~wxGridCellAttrProvider();
     wxGridCellAttrProvider();
     // ???? virtual ~wxGridCellAttrProvider();

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 
 

-    %addmethods {
+    %extend {

         void _setOORInfo(PyObject* _self) {
             self->SetClientObject(new wxPyOORClientData(_self));
         }
         void _setOORInfo(PyObject* _self) {
             self->SetClientObject(new wxPyOORClientData(_self));
         }


@@ -1094,9 +1100,9 @@ public:
 class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
 {
 public:
 class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
 {
 public:

+    %pythonAppend wxPyGridCellAttrProvider  "self._setCallbackInfo(self, PyGridCellAttrProvider)"

     wxPyGridCellAttrProvider();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     wxPyGridCellAttrProvider();
     void _setCallbackInfo(PyObject* self, PyObject* _class);

-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellAttrProvider)"

 
     wxGridCellAttr *base_GetAttr(int row, int col,
                                  wxGridCellAttr::wxAttrKind kind);
 
     wxGridCellAttr *base_GetAttr(int row, int col,
                                  wxGridCellAttr::wxAttrKind kind);


@@ -1116,7 +1122,7 @@ public:
     // wxGridTableBase();   This is an ABC
     //~wxGridTableBase();
 
     // wxGridTableBase();   This is an ABC
     //~wxGridTableBase();
 

-    %addmethods {
+    %extend {

         void _setOORInfo(PyObject* _self) {
             self->SetClientObject(new wxPyOORClientData(_self));
         }
         void _setOORInfo(PyObject* _self) {
             self->SetClientObject(new wxPyOORClientData(_self));
         }


@@ -1129,11 +1135,11 @@ public:
 
 
     // pure virtuals
 
 
     // pure virtuals

-    virtual int GetNumberRows() = 0;
-    virtual int GetNumberCols() = 0;
-    virtual bool IsEmptyCell( int row, int col ) = 0;
-    virtual wxString GetValue( int row, int col ) = 0;
-    virtual void SetValue( int row, int col, const wxString& value ) = 0;
+    virtual int GetNumberRows();
+    virtual int GetNumberCols();
+    virtual bool IsEmptyCell( int row, int col );
+    virtual wxString GetValue( int row, int col );
+    virtual void SetValue( int row, int col, const wxString& value );

 
     // virtuals overridable in wxPyGridTableBase
     virtual wxString GetTypeName( int row, int col );
 
     // virtuals overridable in wxPyGridTableBase
     virtual wxString GetTypeName( int row, int col );


@@ -1207,7 +1213,7 @@ public:
 
 
     wxString GetValue(int row, int col) {
 
 
     wxString GetValue(int row, int col) {

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         wxString rval;
         if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
             PyObject* ro;
         wxString rval;
         if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
             PyObject* ro;


@@ -1217,18 +1223,18 @@ public:
                 Py_DECREF(ro);
             }
         }
                 Py_DECREF(ro);
             }
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         return rval;
     }
 
     void SetValue(int row, int col, const wxString& val) {
         return rval;
     }
 
     void SetValue(int row, int col, const wxString& val) {

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
             PyObject* s = wx2PyString(val);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,s));
             Py_DECREF(s);
        }
         if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
             PyObject* s = wx2PyString(val);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,s));
             Py_DECREF(s);
        }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
 
 
     }
 
 


@@ -1236,7 +1242,7 @@ public:
     // the GetValue and SetValue python methods.
     long GetValueAsLong( int row, int col ) {
         long rval = 0;
     // the GetValue and SetValue python methods.
     long GetValueAsLong( int row, int col ) {
         long rval = 0;

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
             PyObject* ro;
             PyObject* num;
         if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
             PyObject* ro;
             PyObject* num;


@@ -1250,13 +1256,13 @@ public:
                 Py_DECREF(ro);
             }
         }
                 Py_DECREF(ro);
             }
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         return rval;
     }
 
     double GetValueAsDouble( int row, int col ) {
         double rval = 0.0;
         return rval;
     }
 
     double GetValueAsDouble( int row, int col ) {
         double rval = 0.0;

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
             PyObject* ro;
             PyObject* num;
         if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
             PyObject* ro;
             PyObject* num;


@@ -1270,7 +1276,7 @@ public:
                 Py_DECREF(ro);
             }
         }
                 Py_DECREF(ro);
             }
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         return rval;
     }
 
         return rval;
     }
 


@@ -1279,19 +1285,19 @@ public:
     }
 
     void SetValueAsLong( int row, int col, long value ) {
     }
 
     void SetValueAsLong( int row, int col, long value ) {

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
         }
         if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
 
     void SetValueAsDouble( int row, int col, double value ) {
     }
 
     void SetValueAsDouble( int row, int col, double value ) {

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
         }
         if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
 
     void SetValueAsBool( int row, int col, bool value ) {
     }
 
     void SetValueAsBool( int row, int col, bool value ) {


@@ -1308,12 +1314,11 @@ public:
 class wxPyGridTableBase : public wxGridTableBase
 {
 public:
 class wxPyGridTableBase : public wxGridTableBase
 {
 public:

+    %pythonAppend wxPyGridTableBase "self._setCallbackInfo(self, PyGridTableBase);self._setOORInfo(self)"

     wxPyGridTableBase();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     wxPyGridTableBase();
     void _setCallbackInfo(PyObject* self, PyObject* _class);

-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridTableBase)"
-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 
 

-    %addmethods { void Destroy() { delete self; } }
+    %extend { void Destroy() { delete self; } }

 
     wxString base_GetTypeName( int row, int col );
     bool base_CanGetValueAs( int row, int col, const wxString& typeName );
 
     wxString base_GetTypeName( int row, int col );
     bool base_CanGetValueAs( int row, int col, const wxString& typeName );


@@ -1344,8 +1349,8 @@ public:
 class  wxGridStringTable : public wxGridTableBase
 {
 public:
 class  wxGridStringTable : public wxGridTableBase
 {
 public:

+    %pythonAppend wxGridStringTable "self._setOORInfo(self)"

     wxGridStringTable( int numRows=0, int numCols=0 );
     wxGridStringTable( int numRows=0, int numCols=0 );

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -1386,96 +1391,89 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-class wxGridCellCoords
-{
-public:
-    wxGridCellCoords( int r=-1, int c=-1 );
-    ~wxGridCellCoords();
-
-    int GetRow() const { return m_row; }
-    void SetRow( int n ) { m_row = n; }
-    int GetCol() const { return m_col; }
-    void SetCol( int n ) { m_col = n; }
-    void Set( int row, int col ) { m_row = row; m_col = col; }
-
-    %addmethods {
-        PyObject* asTuple() {
-            PyObject* tup = PyTuple_New(2);
-            PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
-            PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
-            return tup;
-        }
-
-        int __cmp__( const wxGridCellCoords& other ) {
-            return *self != other;
-        }
-    }
-    %pragma(python) addtoclass = "
-    def __str__(self):                   return str(self.asTuple())
-    def __repr__(self):                  return 'wxGridCellCoords'+str(self.asTuple())
-    def __len__(self):                   return len(self.asTuple())
-    def __getitem__(self, index):        return self.asTuple()[index]
-    def __setitem__(self, index, val):
-        if index == 0: self.SetRow(val)
-        elif index == 1: self.SetCol(val)
-        else: raise IndexError
-    "
-
-};

 
 // Typemap to allow conversion of sequence objects to wxGridCellCoords...
 
 // Typemap to allow conversion of sequence objects to wxGridCellCoords...

-%typemap(python,in) wxGridCellCoords& (wxGridCellCoords temp) {
-    $target = &temp;
-    if (! wxGridCellCoords_helper($source, &$target))
-        return NULL;
+%typemap(in) wxGridCellCoords& (wxGridCellCoords temp) {
+    $1 = &temp;
+    if (! wxGridCellCoords_helper($input, &$1)) SWIG_fail;
+}
+%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxGridCellCoords& {
+    $1 = wxGridCellCoords_typecheck($input);

 }
 
 }
 

+

 // ...and here is the associated helper.
 %{
 bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
 
 // ...and here is the associated helper.
 %{
 bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
 

+    if (source == Py_None) {
+        **obj = wxGridCellCoords(-1,-1);
+        return True;
+    }
+

     // If source is an object instance then it may already be the right type
     // If source is an object instance then it may already be the right type

-    if (PyInstance_Check(source)) {
+    if (wxPySwigInstance_Check(source)) {

         wxGridCellCoords* ptr;
         wxGridCellCoords* ptr;

-        if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxGridCellCoords_p"))
+        if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))

             goto error;
         *obj = ptr;
             goto error;
         *obj = ptr;

-        return TRUE;
+        return True;

     }
     // otherwise a 2-tuple of integers is expected
     else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
         PyObject* o1 = PySequence_GetItem(source, 0);
         PyObject* o2 = PySequence_GetItem(source, 1);
     }
     // otherwise a 2-tuple of integers is expected
     else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
         PyObject* o1 = PySequence_GetItem(source, 0);
         PyObject* o2 = PySequence_GetItem(source, 1);

+        if (!PyNumber_Check(o1) || !PyNumber_Check(o2)) {
+            Py_DECREF(o1);
+            Py_DECREF(o2);
+            goto error;
+        }

         **obj = wxGridCellCoords(PyInt_AsLong(o1), PyInt_AsLong(o2));
         **obj = wxGridCellCoords(PyInt_AsLong(o1), PyInt_AsLong(o2));

-        return TRUE;
+        Py_DECREF(o1);
+        Py_DECREF(o2);
+        return True;

     }
 
  error:
     PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxGridCellCoords object.");
     }
 
  error:
     PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxGridCellCoords object.");

-    return FALSE;
+    return False;

 }
 }

-%}

 
 
 
 

+bool wxGridCellCoords_typecheck(PyObject* source) {
+    void* ptr;
+    
+    if (wxPySwigInstance_Check(source) &&
+        wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))
+        return True;

 
 

-// Typemap to convert an array of cells coords to a list of tuples...
-%typemap(python, out) wxGridCellCoordsArray {
-    $target = wxGridCellCoordsArray_helper($source);
+    PyErr_Clear();
+    if (PySequence_Check(source) && PySequence_Length(source) == 2)
+        return True;
+    
+    return False;

 }
 }

+%}
+

 
 

-%typemap(python, ret) wxGridCellCoordsArray {
-    delete $source;
+// Typemap to convert an array of cells coords to a list of tuples...
+%typemap(out) wxGridCellCoordsArray {
+    $result = wxGridCellCoordsArray_helper($1);

 }
 
 }
 

+// %typemap(ret) wxGridCellCoordsArray {
+//     delete $1;
+// }
+

 
 // ...and the helper function for the above typemap.
 %{
 
 // ...and the helper function for the above typemap.
 %{

-PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray* source)
+PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray& source)

 {
     PyObject* list = PyList_New(0);
     size_t idx;
 {
     PyObject* list = PyList_New(0);
     size_t idx;

-    for (idx = 0; idx < source->GetCount(); idx += 1) {
-        wxGridCellCoords& coord = source->Item(idx);
+    for (idx = 0; idx < source.GetCount(); idx += 1) {
+        wxGridCellCoords& coord = source.Item(idx);

         PyObject* tup = PyTuple_New(2);
         PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(coord.GetRow()));
         PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(coord.GetCol()));
         PyObject* tup = PyTuple_New(2);
         PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(coord.GetRow()));
         PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(coord.GetCol()));


@@ -1486,6 +1484,47 @@ PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray* source)
 }
 %}
 
 }
 %}
 

+
+
+
+
+class wxGridCellCoords
+{
+public:
+    wxGridCellCoords( int r=-1, int c=-1 );
+    ~wxGridCellCoords();
+
+    int GetRow() const;
+    void SetRow( int n );
+    int GetCol() const;
+    void SetCol( int n );
+    void Set( int row, int col );
+
+    bool operator==( const wxGridCellCoords& other ) const;
+    bool operator!=( const wxGridCellCoords& other ) const;
+
+    %extend {
+        PyObject* asTuple() {
+            PyObject* tup = PyTuple_New(2);
+            PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
+            PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
+            return tup;
+        }
+    }
+    %pythoncode {
+    def __str__(self):                   return str(self.asTuple())
+    def __repr__(self):                  return 'wxGridCellCoords'+str(self.asTuple())
+    def __len__(self):                   return len(self.asTuple())
+    def __getitem__(self, index):        return self.asTuple()[index]
+    def __setitem__(self, index, val):
+        if index == 0: self.SetRow(val)
+        elif index == 1: self.SetCol(val)
+        else: raise IndexError
+    }
+
+};
+
+

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // The grid itself
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // The grid itself


@@ -1504,6 +1543,8 @@ typedef wxGrid::wxGridSelectionModes WXGRIDSELECTIONMODES;
 class wxGrid : public wxScrolledWindow
 {
 public:
 class wxGrid : public wxScrolledWindow
 {
 public:

+    %pythonAppend wxGrid "self._setOORInfo(self)"
+

     wxGrid( wxWindow *parent,
             wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
     wxGrid( wxWindow *parent,
             wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,


@@ -1511,11 +1552,17 @@ public:
             long style = wxWANTS_CHARS,
             const wxString& name = wxPyPanelNameStr);
 
             long style = wxWANTS_CHARS,
             const wxString& name = wxPyPanelNameStr);
 

-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 
 

-    enum wxGridSelectionModes {wxGridSelectCells,
-                               wxGridSelectRows,
-                               wxGridSelectColumns};
+    enum wxGridSelectionModes {
+        wxGridSelectCells,
+        wxGridSelectRows,
+        wxGridSelectColumns
+    };
+    %pythoncode {
+        SelectCells =   wxGridSelectCells
+        SelectRows =    wxGridSelectRows
+        SelectColumns = wxGridSelectColumns
+    }

 
     bool CreateGrid( int numRows, int numCols,
                      WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells );
 
     bool CreateGrid( int numRows, int numCols,
                      WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells );


@@ -1533,17 +1580,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


@@ -1563,9 +1610,10 @@ public:
 //      //
 //      void StringToLines( const wxString& value, wxArrayString& lines );
 
 //      //
 //      void StringToLines( const wxString& value, wxArrayString& lines );
 

-    void GetTextBoxSize( wxDC& dc,
-                         wxArrayString& lines,
-                         long *OUTPUT, long *OUTPUT );
+    DocDeclA(
+        void, GetTextBoxSize( wxDC& dc, wxArrayString& lines,
+                              long *OUTPUT, long *OUTPUT ),
+        "GetTextBoxSize(DC dc, list lines) -> (width, height)");

 
 
     // ------
 
 
     // ------


@@ -1577,7 +1625,6 @@ public:
     void     EndBatch();
     int      GetBatchCount();
     void     ForceRefresh();
     void     EndBatch();
     int      GetBatchCount();
     void     ForceRefresh();

-    void     Refresh(bool eraseb=TRUE, const wxRect* rect= NULL);

 
 
     // ------ edit control functions
 
 
     // ------ edit control functions


@@ -1585,7 +1632,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;


@@ -1605,11 +1652,11 @@ public:
     //
 
     //void XYToCell( int x, int y, wxGridCellCoords& );
     //
 
     //void XYToCell( int x, int y, wxGridCellCoords& );

-    %addmethods {
-        %new wxGridCellCoords* XYToCell(int x, int y) {
+    %extend {
+        wxGridCellCoords XYToCell(int x, int y) {

             wxGridCellCoords rv;
             self->XYToCell(x, y, rv);
             wxGridCellCoords rv;
             self->XYToCell(x, y, rv);

-            return new wxGridCellCoords(rv);
+            return rv;

         }
     }
 
         }
     }
 


@@ -1629,8 +1676,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 );
 


@@ -1659,8 +1706,15 @@ public:
     wxColour GetLabelBackgroundColour();
     wxColour GetLabelTextColour();
     wxFont   GetLabelFont();
     wxColour GetLabelBackgroundColour();
     wxColour GetLabelTextColour();
     wxFont   GetLabelFont();

-    void     GetRowLabelAlignment( int *OUTPUT, int *OUTPUT );
-    void     GetColLabelAlignment( int *OUTPUT, int *OUTPUT );
+
+    DocDeclA(
+        void, GetRowLabelAlignment( int *OUTPUT, int *OUTPUT ),
+        "GetRowLabelAlignment() -> (horiz, vert)");
+    
+    DocDeclA(
+        void, GetColLabelAlignment( int *OUTPUT, int *OUTPUT ),
+        "GetColLabelAlignment() -> (horiz, vert)");
+

     int      GetColLabelTextOrientation();
     wxString GetRowLabelValue( int row );
     wxString GetColLabelValue( int col );
     int      GetColLabelTextOrientation();
     wxString GetRowLabelValue( int row );
     wxString GetColLabelValue( int col );


@@ -1684,13 +1738,13 @@ 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();
 


@@ -1707,7 +1761,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


@@ -1722,28 +1776,38 @@ public:
     wxColour GetCellTextColour( int row, int col );
     wxFont   GetDefaultCellFont();
     wxFont   GetCellFont( int row, int col );
     wxColour GetCellTextColour( int row, int col );
     wxFont   GetDefaultCellFont();
     wxFont   GetCellFont( int row, int col );

-    void     GetDefaultCellAlignment( int *horiz, int *vert );
-    void     GetCellAlignment( int row, int col, int *horiz, int *vert );
+
+    DocDeclA(
+        void, GetDefaultCellAlignment( int *OUTPUT, int *OUTPUT ),
+        "GetDefaultCellAlignment() -> (horiz, vert)");
+    
+    DocDeclA(
+        void, GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT ),
+        "GetCellAlignment() -> (horiz, vert)");
+

     bool     GetDefaultCellOverflow();
     bool     GetCellOverflow( int row, int col );
     bool     GetDefaultCellOverflow();
     bool     GetCellOverflow( int row, int col );

-    void     GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT );

 
 

-    void     SetDefaultRowSize( int height, bool resizeExistingRows = FALSE );
+    DocDeclA(
+        void, GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT ),
+        "GetCellSize(int row, int col) -> (num_rows, num_cols)");
+
+    void     SetDefaultRowSize( int height, bool resizeExistingRows = False );

     void     SetRowSize( int row, int height );
     void     SetRowSize( int row, int height );

-    void     SetDefaultColSize( int width, bool resizeExistingCols = FALSE );
+    void     SetDefaultColSize( int width, bool resizeExistingCols = False );

 
     void     SetColSize( int col, int width );
 
     // automatically size the column or row to fit to its contents, if
 
     void     SetColSize( int col, int width );
 
     // automatically size the column or row to fit to its contents, if

-    // setAsMin is TRUE, this optimal width will also be set as minimal width
+    // setAsMin is True, this optimal width will also be set as minimal width

     // for this column
     // for this column

-    void     AutoSizeColumn( int col, bool setAsMin = TRUE );
-    void     AutoSizeRow( int row, bool setAsMin = TRUE );
+    void     AutoSizeColumn( int col, bool setAsMin = True );
+    void     AutoSizeRow( int row, bool setAsMin = True );

 
 
     // auto size all columns (very ineffective for big grids!)
 
 
     // auto size all columns (very ineffective for big grids!)

-    void     AutoSizeColumns( bool setAsMin = TRUE );
-    void     AutoSizeRows( bool setAsMin = TRUE );
+    void     AutoSizeColumns( bool setAsMin = True );
+    void     AutoSizeRows( bool setAsMin = True );

 
     // auto size the grid, that is make the columns/rows of the "right" size
     // and also set the grid size to just fit its contents
 
     // 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


@@ -1762,6 +1826,11 @@ public:
     void     SetColMinimalWidth( int col, int width );
     void     SetRowMinimalHeight( int row, int width );
 
     void     SetColMinimalWidth( int col, int width );
     void     SetRowMinimalHeight( int row, int width );
 

+    void     SetColMinimalAcceptableWidth( int width );
+    void     SetRowMinimalAcceptableHeight( int width );
+    int      GetColMinimalAcceptableWidth() const;
+    int      GetRowMinimalAcceptableHeight() const;
+

     void     SetDefaultCellBackgroundColour( const wxColour& );
     void     SetCellBackgroundColour( int row, int col, const wxColour& );
     void     SetDefaultCellTextColour( const wxColour& );
     void     SetDefaultCellBackgroundColour( const wxColour& );
     void     SetCellBackgroundColour( int row, int col, const wxColour& );
     void     SetDefaultCellTextColour( const wxColour& );


@@ -1797,19 +1866,19 @@ public:
     void SetCellValue( int row, int col, const wxString& s );
     // TODO: ??? void SetCellValue( const wxGridCellCoords& coords, const wxString& s )
 
     void SetCellValue( int row, int col, const wxString& s );
     // TODO: ??? void SetCellValue( const wxGridCellCoords& coords, const wxString& s )
 

-    // returns TRUE if the cell can't be edited
+    // returns True if the cell can't be edited

     bool IsReadOnly(int row, int col) const;
 
     // make the cell editable/readonly
     bool IsReadOnly(int row, int col) const;
 
     // make the cell editable/readonly

-    void SetReadOnly(int row, int col, bool isReadOnly = TRUE);
+    void SetReadOnly(int row, int col, bool isReadOnly = True);

 
     // ------ selections of blocks of cells
     //
 
     // ------ selections of blocks of cells
     //

-    void SelectRow( int row, bool addToSelected = FALSE );
-    void SelectCol( int col, bool addToSelected = FALSE );
+    void SelectRow( int row, bool addToSelected = False );
+    void SelectCol( int col, bool addToSelected = False );

 
     void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
 
     void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,

-                      bool addToSelected = FALSE );
+                      bool addToSelected = False );

     // TODO: ??? void SelectBlock( const wxGridCellCoords& topLeft,
     // TODO: ???                   const wxGridCellCoords& bottomRight )
 
     // TODO: ??? void SelectBlock( const wxGridCellCoords& topLeft,
     // TODO: ???                   const wxGridCellCoords& bottomRight )
 


@@ -1881,8 +1950,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();


@@ -1901,7 +1970,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();


@@ -1919,9 +1988,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();


@@ -1952,90 +2021,49 @@ public:
 
 
 
 
 
 

-enum {
-    wxEVT_GRID_CELL_LEFT_CLICK,
-    wxEVT_GRID_CELL_RIGHT_CLICK,
-    wxEVT_GRID_CELL_LEFT_DCLICK,
-    wxEVT_GRID_CELL_RIGHT_DCLICK,
-    wxEVT_GRID_LABEL_LEFT_CLICK,
-    wxEVT_GRID_LABEL_RIGHT_CLICK,
-    wxEVT_GRID_LABEL_LEFT_DCLICK,
-    wxEVT_GRID_LABEL_RIGHT_DCLICK,
-    wxEVT_GRID_ROW_SIZE,
-    wxEVT_GRID_COL_SIZE,
-    wxEVT_GRID_RANGE_SELECT,
-    wxEVT_GRID_CELL_CHANGE,
-    wxEVT_GRID_SELECT_CELL,
-    wxEVT_GRID_EDITOR_SHOWN,
-    wxEVT_GRID_EDITOR_HIDDEN,
-    wxEVT_GRID_EDITOR_CREATED,
-};
-
-
-
-%pragma(python) code = "
-def EVT_GRID_CELL_LEFT_CLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_LEFT_CLICK, fn)
-
-def EVT_GRID_CELL_RIGHT_CLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_RIGHT_CLICK, fn)
-
-def EVT_GRID_CELL_LEFT_DCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_LEFT_DCLICK, fn)
-
-def EVT_GRID_CELL_RIGHT_DCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_RIGHT_DCLICK, fn)
-
-def EVT_GRID_LABEL_LEFT_CLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_LABEL_LEFT_CLICK, fn)
-
-def EVT_GRID_LABEL_RIGHT_CLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_LABEL_RIGHT_CLICK, fn)
-
-def EVT_GRID_LABEL_LEFT_DCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_LABEL_LEFT_DCLICK, fn)
-
-def EVT_GRID_LABEL_RIGHT_DCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_LABEL_RIGHT_DCLICK, fn)
-
-def EVT_GRID_ROW_SIZE(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_ROW_SIZE, fn)
-
-def EVT_GRID_COL_SIZE(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_COL_SIZE, fn)
-
-def EVT_GRID_RANGE_SELECT(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_RANGE_SELECT, fn)
-
-def EVT_GRID_CELL_CHANGE(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn)
-
-def EVT_GRID_SELECT_CELL(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn)
-
-def EVT_GRID_EDITOR_SHOWN(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_EDITOR_SHOWN, fn)
-
-def EVT_GRID_EDITOR_HIDDEN(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_EDITOR_HIDDEN, fn)
-
-def EVT_GRID_EDITOR_CREATED(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_EDITOR_CREATED, fn)
-
-"
+%constant wxEventType wxEVT_GRID_CELL_LEFT_CLICK;
+%constant wxEventType wxEVT_GRID_CELL_RIGHT_CLICK;
+%constant wxEventType wxEVT_GRID_CELL_LEFT_DCLICK;
+%constant wxEventType wxEVT_GRID_CELL_RIGHT_DCLICK;
+%constant wxEventType wxEVT_GRID_LABEL_LEFT_CLICK;
+%constant wxEventType wxEVT_GRID_LABEL_RIGHT_CLICK;
+%constant wxEventType wxEVT_GRID_LABEL_LEFT_DCLICK;
+%constant wxEventType wxEVT_GRID_LABEL_RIGHT_DCLICK;
+%constant wxEventType wxEVT_GRID_ROW_SIZE;
+%constant wxEventType wxEVT_GRID_COL_SIZE;
+%constant wxEventType wxEVT_GRID_RANGE_SELECT;
+%constant wxEventType wxEVT_GRID_CELL_CHANGE;
+%constant wxEventType wxEVT_GRID_SELECT_CELL;
+%constant wxEventType wxEVT_GRID_EDITOR_SHOWN;
+%constant wxEventType wxEVT_GRID_EDITOR_HIDDEN;
+%constant wxEventType wxEVT_GRID_EDITOR_CREATED;
+
+
+
+%pythoncode {
+EVT_GRID_CELL_LEFT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_CLICK )
+EVT_GRID_CELL_RIGHT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_CLICK )
+EVT_GRID_CELL_LEFT_DCLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_DCLICK )
+EVT_GRID_CELL_RIGHT_DCLICK = wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_DCLICK )
+EVT_GRID_LABEL_LEFT_CLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_LEFT_CLICK )
+EVT_GRID_LABEL_RIGHT_CLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_RIGHT_CLICK )
+EVT_GRID_LABEL_LEFT_DCLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_LEFT_DCLICK )
+EVT_GRID_LABEL_RIGHT_DCLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_RIGHT_DCLICK )
+EVT_GRID_ROW_SIZE = wx.PyEventBinder( wxEVT_GRID_ROW_SIZE )
+EVT_GRID_COL_SIZE = wx.PyEventBinder( wxEVT_GRID_COL_SIZE )
+EVT_GRID_RANGE_SELECT = wx.PyEventBinder( wxEVT_GRID_RANGE_SELECT )
+EVT_GRID_CELL_CHANGE = wx.PyEventBinder( wxEVT_GRID_CELL_CHANGE )
+EVT_GRID_SELECT_CELL = wx.PyEventBinder( wxEVT_GRID_SELECT_CELL )
+EVT_GRID_EDITOR_SHOWN = wx.PyEventBinder( wxEVT_GRID_EDITOR_SHOWN )
+EVT_GRID_EDITOR_HIDDEN = wx.PyEventBinder( wxEVT_GRID_EDITOR_HIDDEN )
+EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
+}

 
 //---------------------------------------------------------------------------
 
 %init %{
 
 //---------------------------------------------------------------------------
 
 %init %{

-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();

 %}
 
 //---------------------------------------------------------------------------
 %}
 
 //---------------------------------------------------------------------------

-
-%pragma(python) include="_gridextras.py";
-

 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 

-
-#endif