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-12 23:39:00 +02:00
parent 4d4ece53f1
commit 8e2f1b47aa
6 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/propgrid/manager.h
View File

@@ -352,8 +352,8 @@ public:
wxPropertyGridIterator GetIterator( int flags = wxPG_ITERATE_DEFAULT,
wxPGProperty* firstProp = NULL )
{
wxFAIL_MSG( "Please only iterate through individual pages "
"or use CreateVIterator()" );
wxFAIL_MSG( wxS("Please only iterate through individual pages ")
wxS("or use CreateVIterator()") );
return wxPropertyGridInterface::GetIterator( flags, firstProp );
}
@@ -361,8 +361,8 @@ public:
GetIterator(int flags = wxPG_ITERATE_DEFAULT,
wxPGProperty* firstProp = NULL) const
{
wxFAIL_MSG( "Please only iterate through individual pages "
" or use CreateVIterator()" );
wxFAIL_MSG( wxS("Please only iterate through individual pages ")
wxS("or use CreateVIterator()") );
return wxPropertyGridInterface::GetIterator( flags, firstProp );
}
@@ -374,16 +374,16 @@ public:
*/
wxPropertyGridIterator GetIterator( int flags, int startPos )
{
wxFAIL_MSG( "Please only iterate through individual pages "
"or use CreateVIterator()" );
wxFAIL_MSG( wxS("Please only iterate through individual pages ")
wxS("or use CreateVIterator()") );
return wxPropertyGridInterface::GetIterator( flags, startPos );
}
wxPropertyGridConstIterator GetIterator( int flags, int startPos ) const
{
wxFAIL_MSG( "Please only iterate through individual pages "
"or use CreateVIterator()" );
wxFAIL_MSG( wxS("Please only iterate through individual pages ")
wxS("or use CreateVIterator()") );
return wxPropertyGridInterface::GetIterator( flags, startPos );
}

4
include/wx/propgrid/property.h
View File

@@ -801,13 +801,13 @@ public:
const wxPGChoiceEntry& Item( unsigned int i ) const
{
wxASSERT_MSG( i < GetCount(), "invalid index" );
wxASSERT_MSG( i < GetCount(), wxS("invalid index") );
return m_items[i];
}
wxPGChoiceEntry& Item( unsigned int i )
{
wxASSERT_MSG( i < GetCount(), "invalid index" );
wxASSERT_MSG( i < GetCount(), wxS("invalid index") );
return m_items[i];
}

10
include/wx/propgrid/propgriddefs.h
View File

@@ -461,7 +461,7 @@ WX_PG_DECLARE_EDITOR_WITH_DECL(ChoiceAndButton,WXDLLIMPEXP_PROPGRID)
template<class T>
wxVariant WXVARIANT( const T& WXUNUSED(value) )
{
wxFAIL_MSG("Code should always call specializations of this template");
wxFAIL_MSG(wxS("Code should always call specializations of this template"));
return wxVariant();
}
@@ -559,8 +559,8 @@ expdecl wxVariant& operator << ( wxVariant &variant, const classname &value )\
expdecl classname& classname##RefFromVariant( wxVariant& variant ) \
{ \
wxASSERT_MSG( variant.GetType() == wxS(#classname), \
wxString::Format("Variant type should have been '%s'" \
"instead of '%s'", \
wxString::Format(wxS("Variant type should have been '%s'") \
wxS("instead of '%s'"), \
wxS(#classname), \
variant.GetType().c_str())); \
classname##VariantData *data = \
@@ -570,8 +570,8 @@ expdecl classname& classname##RefFromVariant( wxVariant& variant ) \
expdecl const classname& classname##RefFromVariant( const wxVariant& variant ) \
{ \
wxASSERT_MSG( variant.GetType() == wxS(#classname), \
wxString::Format("Variant type should have been '%s'" \
"instead of '%s'", \
wxString::Format(wxS("Variant type should have been '%s'") \
wxS("instead of '%s'"), \
wxS(#classname), \
variant.GetType().c_str())); \
classname##VariantData *data = \