Subversion Repositories spk

Rev

Rev 242 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 242 Rev 294
Line 317... Line 317...
317 
			m_pLcd->SetText(m_hDebug[0], _T("No errors found!"));
 317 
			m_pLcd->SetText(m_hDebug[0], _T("No errors found!"));
318 
		else
 318 
		else
319 
		{
 319 
		{
320 
			size_t max = _lDebugLog.size() > 5 ? 5 : _lDebugLog.size();
 320 
			size_t max = _lDebugLog.size() > 5 ? 5 : _lDebugLog.size();
321 
			for (size_t i = 0; i < max; i++)
 321 
			for (size_t i = 0; i < max; i++)
322 
				m_pLcd->SetText(m_hDebug[i], _lDebugLog[i]->str);
 322 
				m_pLcd->SetText(m_hDebug[i], _lDebugLog[i]->str.c_str());
323 
		}
 323 
		}
324 
 
 324 
 
325 
	}
 325 
	}
326 
	else
 326 
	else
327 
	{
 327 
	{
Line 331... Line 331...
331 
		for ( SText *text = m_pText; text; text = text->pNext )
 331 
		for ( SText *text = m_pText; text; text = text->pNext )
332 
		{
 332 
		{
333 
			Utils::WString newtext = text->sText;
 333 
			Utils::WString newtext = text->sText;
334 
			for(auto itr = _lVaribles.begin(); itr != _lVaribles.end(); itr++)
 334 
			for(auto itr = _lVaribles.begin(); itr != _lVaribles.end(); itr++)
335 
				newtext = newtext.findReplace(L"$" + (*itr)->str, (*itr)->data );
 335 
				newtext = newtext.findReplace(L"$" + (*itr)->str, (*itr)->data );
336 
			m_pLcd->SetText ( text->hObject, newtext);
 336 
			m_pLcd->SetText ( text->hObject, newtext.c_str());
337 
		}
 337 
		}
338 
 
 338 
 
339 
		// now do moving objects
 339 
		// now do moving objects
340 
		for ( SMoveObject *o = m_pMoveObject; o; o = o->pNext )
 340 
		for ( SMoveObject *o = m_pMoveObject; o; o = o->pNext )
341 
		{
 341 
		{