Fix wxCalendarEvent and wxTextUrlEvent event classes implementing Clone() correctly...

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

diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 31849d7d39b02b58596933119cd1e51a6d4844f6..748713f87b764dbd8cfedf325789df5893718cfc 100644 (file)
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -12,18 +12,17 @@
 #ifndef _WX_GENERIC_GRIDCTRL_H_
 #define _WX_GENERIC_GRIDCTRL_H_
 
-#if wxUSE_GRID
-
 #include "wx/grid.h"
-#include "wx/string.h"
-#include "wx/arrstr.h"
-#include "wx/datetime.h"
+
+#if wxUSE_GRID
 
 #define wxGRID_VALUE_CHOICEINT    _T("choiceint")
 #define wxGRID_VALUE_DATETIME     _T("datetime")
 
 #if wxUSE_DATETIME
 
+#include "wx/datetime.h"
+
 // the default renderer for the cells containing Time and dates..
 class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
 {
@@ -101,11 +100,12 @@ public:
 
     virtual wxGridCellEditor*  Clone() const;
 
-    virtual bool EndEdit(int row, int col, wxGrid* grid);
     virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual bool EndEdit(const wxString& oldval, wxString *newval);
+    virtual void ApplyEdit(int row, int col, wxGrid* grid);
 
 private:
-    long int   m_startint;
+    long m_index;
 
     DECLARE_NO_COPY_CLASS(wxGridCellEnumEditor)
 };
@@ -155,7 +155,5 @@ private:
 
 };
 
-#endif  // #if wxUSE_GRID
-
-#endif //_WX_GENERIC_GRIDCTRL_H_
-
+#endif  // wxUSE_GRID
+#endif // _WX_GENERIC_GRIDCTRL_H_