#ifndef _WX_GENERIC_GRIDCTRL_H_
#define _WX_GENERIC_GRIDCTRL_H_
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "gridctrl.h"
#endif
-#if wxUSE_GRID || wxUSE_NEW_GRID
+#if wxUSE_GRID
#include "wx/grid.h"
#include "wx/string.h"
+#include "wx/arrstr.h"
#include "wx/datetime.h"
#define wxGRID_VALUE_CHOICEINT _T("choiceint")
#if wxUSE_DATETIME
// 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"),
#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 );
#if wxUSE_COMBOBOX
-class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor
+class WXDLLIMPEXP_ADV wxGridCellEnumEditor : public wxGridCellChoiceEditor
{
public:
wxGridCellEnumEditor( const wxString& choices = wxEmptyString );
private:
long int m_startint;
+
+ DECLARE_NO_COPY_CLASS(wxGridCellEnumEditor)
};
#endif // wxUSE_COMBOBOX
-class WXDLLEXPORT 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 WXDLLEXPORT wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
+class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
{
public:
wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }
};
-#endif // #if wxUSE_GRID || wxUSE_NEW_GRID
+#endif // #if wxUSE_GRID
#endif //_WX_GENERIC_GRIDCTRL_H_