Reenabled deleteallitems events, marked

[wxWidgets.git] / utils / wxPython / src / windows2.i

diff --git a/utils/wxPython/src/windows2.i b/utils/wxPython/src/windows2.i
index fdc11e48a7c5dc4081693ec8e3ce13b148934ccf..0e8d7a7200306c63fe451d3d4ac9fb8e4498321d 100644 (file)
--- a/utils/wxPython/src/windows2.i
+++ b/utils/wxPython/src/windows2.i
@@ -90,8 +90,8 @@ public:
 
 
     void AdjustScrollbars();
-    bool AppendCols(int n=1, bool updateLabels=TRUE);
-    bool AppendRows(int n=1, bool updateLabels=TRUE);
+    bool AppendCols(int n=1, int updateLabels=TRUE);
+    bool AppendRows(int n=1, int updateLabels=TRUE);
     void BeginBatch();
     bool CellHitTest(int x, int y, int *OUTPUT, int *OUTPUT);
 
@@ -131,15 +131,9 @@ public:
                 for (col=0; col < self->GetCols(); col++) {
                     wxGridCell* cell = self->GetCell(row, col);
 
-#ifdef WXP_WITH_THREAD
-                    PyEval_RestoreThread(wxPyEventThreadState);
-                    wxPyInEvent = true;
-#endif
+                    bool doSave = wxPyRestoreThread();
                     PyObject* pyCell = wxPyConstructObject(cell, "wxGridCell");
-#ifdef WXP_WITH_THREAD
-                    PyEval_SaveThread();
-                    wxPyInEvent = false;
-#endif
+                    wxPySaveThread(doSave);
 
                     if (PyList_Append(rowList, pyCell) == -1)
                         return NULL;
@@ -219,6 +213,13 @@ public:
     bool        m_control;
     bool        m_shift;
     wxGridCell* m_cell;
+
+    int GetRow();
+    int GetCol();
+    wxPoint GetPosition();
+    bool ControlDown();
+    bool ShiftDown();
+    wxGridCell* GetCell();
 };
 
 
@@ -332,7 +333,7 @@ public:
     void Initialize(wxWindow* window);
     bool IsSplit();
 
-
+    bool ReplaceWindow(wxWindow * winOld, wxWindow * winNew);
     void SetBorderSize(int width);
     void SetSashPosition(int position, int redraw = TRUE);
     void SetSashSize(int width);