X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19a97bd6f98edc899ee0c3b2f2c4fe4ee8a0082b..08da19d737fcb12a19a2746b438b3a3610214e6d:/wxPython/src/grid.i?ds=sidebyside

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index f8332e5e23..aea3014584 100644
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -573,8 +573,8 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters)
 class wxPyGridCellRenderer : public wxGridCellRenderer {
 public:
     wxPyGridCellRenderer();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridCellRenderer)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellRenderer)"
 
     void base_SetParameters(const wxString& params);
 };
@@ -796,8 +796,8 @@ IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, Destroy);
 class wxPyGridCellEditor : public wxGridCellEditor {
 public:
     wxPyGridCellEditor();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridCellEditor)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellEditor)"
 
     void base_SetSize(const wxRect& rect);
     void base_Show(bool show, wxGridCellAttr *attr = NULL);
@@ -957,8 +957,8 @@ class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
 {
 public:
     wxPyGridCellAttrProvider();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, 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);
@@ -1165,8 +1165,8 @@ class wxPyGridTableBase : public wxGridTableBase
 {
 public:
     wxPyGridTableBase();
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridTableBase)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridTableBase)"
 
     %addmethods { void Destroy() { delete self; } }
 
@@ -1326,6 +1326,7 @@ public:
             long style = wxWANTS_CHARS,
             const char* name = wxPanelNameStr );
 
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
     enum wxGridSelectionModes {wxGridSelectCells,
                                wxGridSelectRows,
@@ -1370,10 +1371,10 @@ public:
                             int horizontalAlignment = wxLEFT,
                             int verticalAlignment = wxTOP );
 
-    // Split a string containing newline chararcters into an array of
-    // strings and return the number of lines
-    //
-    void StringToLines( const wxString& value, wxArrayString& lines );
+//      // Split a string containing newline chararcters into an array of
+//      // strings and return the number of lines
+//      //
+//      void StringToLines( const wxString& value, wxArrayString& lines );
 
     void GetTextBoxSize( wxDC& dc,
                          wxArrayString& lines,