From a41020658668c3a11915ba658c95c0179c7ce989 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 8 Apr 2000 08:16:08 +0000 Subject: [PATCH] Changed wxGridCellChoiceEditor's constructor to take an array of wxStrings instead of wxChar*'s. This saved a lot of work for wxPython. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/grid.h | 2 +- samples/newgrid/griddemo.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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"),