Fix for VA 4.0

[wxWidgets.git] / include / wx / generic / grid.h

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index c82e4bc6b04c23cf9c6302a907bfd1d85de3892c..438f9cd5ce813c4849e3a11971e33e79e231ed0f 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -31,7 +31,7 @@
 #include "wx/textctrl.h"
 #include "wx/combobox.h"
 #include "wx/dynarray.h"
-
+#include "wx/timer.h"
 
 // Default parameters for wxGrid
 //
@@ -571,6 +571,20 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
+//-----------------------------------------------------------------------------
+// wxGridEditTimer (internal)
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGridEditTimer: public wxTimer
+{
+ private:
+   wxGrid  *m_owner;
+
+ public:
+   wxGridEditTimer( wxGrid *owner );
+   void Notify();
+};
+
 // ----------------------------------------------------------------------------
 // wxGrid
 // ----------------------------------------------------------------------------
@@ -679,9 +693,7 @@ public:
     bool IsEditable() { return m_editable; }
     void EnableEditing( bool edit );
 
-#if 0  // at the moment the cell edit control is always active
     void     EnableCellEditControl( bool enable );
-#endif
 
     bool     IsCellEditControlEnabled()
              { return (m_cellEditCtrl && m_cellEditCtrlEnabled); }
@@ -1186,6 +1198,8 @@ protected:
     int  m_dragRowOrCol;
     bool m_isDragging;
 
+    wxTimer        *m_editTimer;
+
     wxGridCellCoords m_selectionStart;
 
     wxCursor m_rowResizeCursor;