Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use wxS in array of const wxChar*

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-09-28 06:40:26 +00:00
parent 9370ec6a3b
commit 30fad74e44
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/propgrid/advprops.cpp
View File

@@ -555,11 +555,15 @@ void wxPGDatePickerCtrlEditor::SetValueToUnspecified( wxPGProperty* property,
#include "wx/fontdlg.h" #include "wx/fontdlg.h"
#include "wx/fontenum.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"), wxT("Default"), wxT("Decorative"),
wxS("Roman"), wxS("Script"), wxT("Roman"), wxT("Script"),
wxS("Swiss"), wxS("Modern"), wxT("Swiss"), wxT("Modern"),
wxS("Teletype"), wxS("Unknown"), wxT("Teletype"), wxT("Unknown"),
(const wxChar*) NULL (const wxChar*) NULL
}; };