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
This commit is contained in:
@@ -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
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user