From 30fad74e44b2118795fc070e0e599ae474f0ad1d Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Mon, 28 Sep 2009 06:40:26 +0000 Subject: [PATCH] Do not use wxS in array of const wxChar* git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/propgrid/advprops.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp index 5ab6948143..22c5089f77 100644 --- a/src/propgrid/advprops.cpp +++ b/src/propgrid/advprops.cpp @@ -555,11 +555,15 @@ void wxPGDatePickerCtrlEditor::SetValueToUnspecified( wxPGProperty* property, #include "wx/fontdlg.h" #include "wx/fontenum.h" +// +// NB: Do not use wxS here since unlike wxT it doesn't translate to wxChar* +// + static const wxChar* gs_fp_es_family_labels[] = { - wxS("Default"), wxS("Decorative"), - wxS("Roman"), wxS("Script"), - wxS("Swiss"), wxS("Modern"), - wxS("Teletype"), wxS("Unknown"), + wxT("Default"), wxT("Decorative"), + wxT("Roman"), wxT("Script"), + wxT("Swiss"), wxT("Modern"), + wxT("Teletype"), wxT("Unknown"), (const wxChar*) NULL }; -- 2.47.2