X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b53dc7d661f662f0ed09c938ae4c32a0accd6350..c8e1af672f46e93ae2fe6d7f9d5b35a3d8d49c16:/include/wx/generic/gridctrl.h diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h index 1295d5d10b..a61a2f4592 100644 --- a/include/wx/generic/gridctrl.h +++ b/include/wx/generic/gridctrl.h @@ -12,25 +12,28 @@ #ifndef _WX_GENERIC_GRIDCTRL_H_ #define _WX_GENERIC_GRIDCTRL_H_ -#ifdef __GNUG__ +#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") #define wxGRID_VALUE_DATETIME _T("datetime") +#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"), - wxString informat = _T("%c")); + wxGridCellDateTimeRenderer(wxString outformat = wxDefaultDateTimeFormat, + wxString informat = wxDefaultDateTimeFormat); // draw the string right aligned virtual void Draw(wxGrid& grid, @@ -59,9 +62,10 @@ protected: 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 ); @@ -91,11 +95,13 @@ protected: }; -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; @@ -104,10 +110,13 @@ public: private: long int m_startint; + + DECLARE_NO_COPY_CLASS(wxGridCellEnumEditor) }; +#endif // wxUSE_COMBOBOX -class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor +class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor { public: wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { } @@ -117,9 +126,11 @@ public: 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() { } @@ -148,7 +159,7 @@ private: }; -#endif // #if wxUSE_GRID || wxUSE_NEW_GRID +#endif // #if wxUSE_GRID #endif //_WX_GENERIC_GRIDCTRL_H_