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

32
src/propgrid/propgrid.cpp
View File

@@ -535,10 +535,10 @@ wxPropertyGrid::~wxPropertyGrid()
// Let's use wxMessageBox to make the message appear more
// reliably (and *before* the crash can happen).
::wxMessageBox("wxPropertyGrid was being destroyed in an event "
"generated by it. This usually leads to a crash "
"so it is recommended to destroy the control "
"at idle time instead.");
::wxMessageBox(wxS("wxPropertyGrid was being destroyed in an event ")
wxS("generated by it. This usually leads to a crash ")
wxS("so it is recommended to destroy the control ")
wxS("at idle time instead."));
}
DoSelectProperty(NULL, wxPG_SEL_NOVALIDATE|wxPG_SEL_DONT_SEND_EVENT);
@@ -2084,7 +2084,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
return itemsRect->y;
wxCHECK_MSG( !m_pState->m_itemsAdded, itemsRect->y,
"no items added" );
wxS("no items added") );
wxASSERT( m_pState->DoGetRoot()->GetChildCount() );
int lh = m_lineHeight;
@@ -2107,11 +2107,11 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
wxCHECK_MSG( firstItemTopY < lastItemBottomY,
itemsRect->y,
"invalid y values" );
wxS("invalid y values") );
/*
wxLogDebug(" -> DoDrawItems(\"%s\" -> \"%s\""
" %i -> %i height=%i (ch=%i), itemsRect = 0x%lX %i,%i %ix%i)",
wxLogDebug(wxS(" -> DoDrawItems(\"%s\" -> \"%s\"")
wxS(" %i -> %i height=%i (ch=%i), itemsRect = 0x%lX %i,%i %ix%i)"),
firstItem->GetLabel().c_str(),
lastItem->GetLabel().c_str(),
firstItemTopY, lastItemBottomY,
@@ -4238,9 +4238,9 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
if ( m_wndEditor )
{
wxASSERT_MSG( m_wndEditor->GetParent() == GetPanel(),
"CreateControls must use result of "
"wxPropertyGrid::GetPanel() as parent "
"of controls." );
wxS("CreateControls must use result of ")
wxS("wxPropertyGrid::GetPanel() as parent ")
wxS("of controls.") );
// Set validator, if any
#if wxUSE_VALIDATORS
@@ -4290,9 +4290,9 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
if ( m_wndEditor2 )
{
wxASSERT_MSG( m_wndEditor2->GetParent() == GetPanel(),
"CreateControls must use result of "
"wxPropertyGrid::GetPanel() as parent "
"of controls." );
wxS("CreateControls must use result of ")
wxS("wxPropertyGrid::GetPanel() as parent ")
wxS("of controls.") );
// Get proper id for wndSecondary
m_wndSecId = m_wndEditor2->GetId();
@@ -4587,7 +4587,7 @@ void wxPropertyGrid::RecalculateVirtualSize( int forceXPos )
wxASSERT_LEVEL_2_MSG(
m_pState->GetVirtualHeight() == m_pState->GetActualVirtualHeight(),
"VirtualHeight and ActualVirtualHeight should match"
wxS("VirtualHeight and ActualVirtualHeight should match")
);
m_iFlags |= wxPG_FL_RECALCULATING_VIRTUAL_SIZE;
@@ -6122,7 +6122,7 @@ wxPGEditor* wxPropertyGrid::DoRegisterEditorClass( wxPGEditor* editorClass,
wxCHECK_MSG( vt_it == wxPGGlobalVars->m_mapEditorClasses.end(),
(wxPGEditor*) vt_it->second,
"Editor with given name was already registered" );
wxS("Editor with given name was already registered") );
wxPGGlobalVars->m_mapEditorClasses[name] = (void*)editorClass;