X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1aaf88d2208793f6a05f02c3e23ade668555d31e..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/generic/gridctrl.h diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h index a61a2f4592..a5833090c4 100644 --- a/include/wx/generic/gridctrl.h +++ b/include/wx/generic/gridctrl.h @@ -12,17 +12,10 @@ #ifndef _WX_GENERIC_GRIDCTRL_H_ #define _WX_GENERIC_GRIDCTRL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "gridctrl.h" -#endif +#include "wx/grid.h" #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") @@ -32,8 +25,8 @@ class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellStringRenderer { public: - wxGridCellDateTimeRenderer(wxString outformat = wxDefaultDateTimeFormat, - wxString informat = wxDefaultDateTimeFormat); + wxGridCellDateTimeRenderer(const wxString& outformat = wxDefaultDateTimeFormat, + const wxString& informat = wxDefaultDateTimeFormat); // draw the string right aligned virtual void Draw(wxGrid& grid, @@ -54,7 +47,7 @@ public: 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; @@ -89,7 +82,7 @@ public: 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; }; @@ -153,13 +146,11 @@ public: private: wxArrayString GetTextLines( wxGrid& grid, wxDC& dc, - wxGridCellAttr& attr, + const wxGridCellAttr& attr, const wxRect& rect, int row, int col); }; -#endif // #if wxUSE_GRID - -#endif //_WX_GENERIC_GRIDCTRL_H_ - +#endif // wxUSE_GRID +#endif // _WX_GENERIC_GRIDCTRL_H_