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

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index 5ab6948143d0ff69c8d5195c14182b9dfacbaa52..22c5089f77f4f21dda3a4ed87d36e38735648de7 100644 (file)
--- 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"
 
 #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[] = {
 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
 };
 
     (const wxChar*) NULL
 };