#ifndef _WX_GENERIC_GRIDCTRL_H_
#define _WX_GENERIC_GRIDCTRL_H_
-#ifdef __GNUG__
- #pragma interface "gridctrl.h"
-#endif
-
#include "wx/grid.h"
-#include "wx/string.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 WXDLLEXPORT wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
+class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
{
public:
- wxGridCellDateTimeRenderer(wxString outformat = _T("%c"),
- wxString informat = _T("%c"));
+ wxGridCellDateTimeRenderer(const wxString& outformat = wxDefaultDateTimeFormat,
+ const wxString& informat = wxDefaultDateTimeFormat);
// draw the string right aligned
virtual void Draw(wxGrid& grid,
virtual void SetParameters(const wxString& params);
protected:
- wxString GetString(wxGrid& grid, int row, int col);
+ wxString GetString(const wxGrid& grid, int row, int col);
wxString m_iformat;
wxString m_oformat;
wxDateTime::TimeZone m_tz;
};
+#endif // wxUSE_DATETIME
// the default renderer for the cells containing Time and dates..
-class WXDLLEXPORT wxGridCellEnumRenderer : public wxGridCellStringRenderer
+class WXDLLIMPEXP_ADV wxGridCellEnumRenderer : public wxGridCellStringRenderer
{
public:
wxGridCellEnumRenderer( const wxString& choices = wxEmptyString );
virtual void SetParameters(const wxString& params);
protected:
- wxString GetString(wxGrid& grid, int row, int col);
+ wxString GetString(const wxGrid& grid, int row, int col);
wxArrayString m_choices;
};
-class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor
+#if wxUSE_COMBOBOX
+
+class WXDLLIMPEXP_ADV wxGridCellEnumEditor : public wxGridCellChoiceEditor
{
public:
wxGridCellEnumEditor( const wxString& choices = wxEmptyString );
- virtual ~wxGridCellEnumEditor() {};
+ virtual ~wxGridCellEnumEditor() {}
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)
};
+#endif // wxUSE_COMBOBOX
-class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
+class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
{
public:
wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }
virtual wxGridCellEditor *Clone() const
{ return new wxGridCellAutoWrapStringEditor; }
+
+ DECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor)
};
-class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
+class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
{
public:
wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }
private:
wxArrayString GetTextLines( wxGrid& grid,
wxDC& dc,
- wxGridCellAttr& attr,
+ const wxGridCellAttr& attr,
const wxRect& rect,
int row, int col);
};
-#endif //_WX_GENERIC_GRIDCTRL_H_
-
+#endif // wxUSE_GRID
+#endif // _WX_GENERIC_GRIDCTRL_H_