diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 0ac729169d..34b0ed6ad9 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -504,7 +504,7 @@ class WXDLLEXPORT wxGridCellChoiceEditor : public wxGridCellEditor
 public:
     // if !allowOthers, user can't type a string not in choices array
     wxGridCellChoiceEditor(size_t count = 0,
-                           const wxChar* choices[] = NULL,
+                           const wxString choices[] = NULL,
                            bool allowOthers = FALSE);
 
     virtual void Create(wxWindow* parent,
diff --git a/samples/newgrid/griddemo.cpp b/samples/newgrid/griddemo.cpp
index c3f3fce77d..6384a4ab41 100644
--- a/samples/newgrid/griddemo.cpp
+++ b/samples/newgrid/griddemo.cpp
@@ -855,7 +855,7 @@ enum Severity
     Sev_Max
 };
 
-static const wxChar* severities[] =
+static const wxString severities[] =
 {
     _T("wishlist"),
     _T("minor"),