X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f190b09c5c1e25cfd8a6156d8d43f0b6647521..d44d0cbd7343e36ddd3657dd97cd5eb7018d2585:/include/wx/generic/gridctrl.h diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h index 5fa5720f03..a61a2f4592 100644 --- a/include/wx/generic/gridctrl.h +++ b/include/wx/generic/gridctrl.h @@ -12,7 +12,7 @@ #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 @@ -32,8 +32,8 @@ 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, @@ -101,7 +101,7 @@ class WXDLLIMPEXP_ADV wxGridCellEnumEditor : public wxGridCellChoiceEditor { public: wxGridCellEnumEditor( const wxString& choices = wxEmptyString ); - virtual ~wxGridCellEnumEditor() {}; + virtual ~wxGridCellEnumEditor() {} virtual wxGridCellEditor* Clone() const;