X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2da2f941bbd25599c2c1453204b5f1a4e116ae91..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/gridctrl.h diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h index 5df562eb3c..2ee1c10488 100644 --- a/include/wx/generic/gridctrl.h +++ b/include/wx/generic/gridctrl.h @@ -12,28 +12,23 @@ #ifndef _WX_GENERIC_GRIDCTRL_H_ #define _WX_GENERIC_GRIDCTRL_H_ -#if defined(__GNUG__) && !defined(__APPLE__) - #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") #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, @@ -54,7 +49,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; @@ -65,7 +60,7 @@ protected: #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 ); @@ -89,7 +84,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; }; @@ -97,11 +92,11 @@ protected: #if wxUSE_COMBOBOX -class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor +class WXDLLIMPEXP_ADV wxGridCellEnumEditor : public wxGridCellChoiceEditor { public: wxGridCellEnumEditor( const wxString& choices = wxEmptyString ); - virtual ~wxGridCellEnumEditor() {}; + virtual ~wxGridCellEnumEditor() {} virtual wxGridCellEditor* Clone() const; @@ -110,11 +105,13 @@ public: 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() { } @@ -124,9 +121,11 @@ public: 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() { } @@ -149,13 +148,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_