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

Use wxS macro with string literals.

Browse Source 
To make string literals notation consistent.
This commit is contained in:
Artur Wieczorek
2015-06-25 21:22:45 +02:00
parent 2ade160882
commit 7c0b52671d
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/propgrid/props.cpp
View File

@@ -546,7 +546,7 @@ bool wxIntProperty::DoValidation( const wxPGProperty* property,
value, value,
pValidationInfo, pValidationInfo,
mode, LLONG_MIN, LLONG_MAX, mode, LLONG_MIN, LLONG_MAX,
"%" wxLongLongFmtSpec "d"); wxS("%") wxS(wxLongLongFmtSpec) wxS("d"));
} }
#endif #endif
@@ -607,22 +607,24 @@ enum
wxPG_UINT_TEMPLATE_MAX wxPG_UINT_TEMPLATE_MAX
}; };
static const wxChar* const gs_uintTemplates32[wxPG_UINT_TEMPLATE_MAX] = { static const wxStringCharType* const gs_uintTemplates32[wxPG_UINT_TEMPLATE_MAX] = {
wxT("%lx"),wxT("0x%lx"),wxT("$%lx"), wxS("%lx"),wxS("0x%lx"),wxS("$%lx"),
wxT("%lX"),wxT("0x%lX"),wxT("$%lX"), wxS("%lX"),wxS("0x%lX"),wxS("$%lX"),
wxT("%lu"),wxT("%lo") wxS("%lu"),wxS("%lo")
}; };
static const char* const gs_uintTemplates64[wxPG_UINT_TEMPLATE_MAX] = { #if wxUSE_LONGLONG
"%" wxLongLongFmtSpec "x", static const wxStringCharType* const gs_uintTemplates64[wxPG_UINT_TEMPLATE_MAX] = {
"0x%" wxLongLongFmtSpec "x", wxS("%") wxS(wxLongLongFmtSpec) wxS("x"),
"$%" wxLongLongFmtSpec "x", wxS("0x%") wxS(wxLongLongFmtSpec) wxS("x"),
"%" wxLongLongFmtSpec "X", wxS("$%") wxS(wxLongLongFmtSpec) wxS("x"),
"0x%" wxLongLongFmtSpec "X", wxS("%") wxS(wxLongLongFmtSpec) wxS("X"),
"$%" wxLongLongFmtSpec "X", wxS("0x%") wxS(wxLongLongFmtSpec) wxS("X"),
"%" wxLongLongFmtSpec "u", wxS("$%") wxS(wxLongLongFmtSpec) wxS("X"),
"%" wxLongLongFmtSpec "o" wxS("%") wxS(wxLongLongFmtSpec) wxS("u"),
wxS("%") wxS(wxLongLongFmtSpec) wxS("o")
}; };
#endif // wxUSE_LONGLONG
wxPG_IMPLEMENT_PROPERTY_CLASS(wxUIntProperty,wxPGProperty,TextCtrl) wxPG_IMPLEMENT_PROPERTY_CLASS(wxUIntProperty,wxPGProperty,TextCtrl)
@@ -749,7 +751,7 @@ bool wxUIntProperty::DoValidation(const wxPGProperty* property,
{ {
return NumericValidation<wxULongLong_t>(property, value, pValidationInfo, return NumericValidation<wxULongLong_t>(property, value, pValidationInfo,
mode, 0, ULLONG_MAX, mode, 0, ULLONG_MAX,
"%" wxLongLongFmtSpec "u"); wxS("%") wxS(wxLongLongFmtSpec) wxS("u"));
} }
#endif #endif