← Back to branch summary

~kicad-gost-committers/kicad/kicad

« back to all changes in this revision

Viewing changes to pagelayout_editor/properties_frame.cpp

  • Committer: Alexander Lunev
  • Date: 2013-07-26 19:08:10 UTC
  • mfrom: (4090.1.164 kicad)
  • Revision ID: al.lunev@yahoo.com-20130726190810-l70601hqg4v2swxg
merge with revision 4254 of lp:kicad branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
pagelayout_editor/properties_frame.cpp
194
194
        m_SizerTextIncrementLabel->Show( true );
195
195
 
196
196
        WORKSHEET_DATAITEM_TEXT* item = (WORKSHEET_DATAITEM_TEXT*) aItem;
197
 
        m_textCtrlText->SetValue( item->m_TextBase );
 
197
        wxString text = item->m_TextBase;
 
198
        text.Replace(wxT("\\n"), wxT("\n") );
 
199
        m_textCtrlText->SetValue( text );
198
200
 
199
201
        msg.Printf( wxT("%d"), item->m_IncrementLabel );
200
202
        m_textCtrlTextIncrement->SetValue( msg );
279
281
// Event function called by clicking on the OK button
280
282
void PROPERTIES_FRAME::OnAcceptPrms( wxCommandEvent& event )
281
283
{
 
284
    m_parent->SaveCopyInUndoList();
 
285
 
282
286
    WORKSHEET_DATAITEM* item = m_parent->GetSelectedItem();
283
287
    if( item )
284
288
        CopyPrmsFromPanelToItem( item );
388
392
        WORKSHEET_DATAITEM_TEXT* item = (WORKSHEET_DATAITEM_TEXT*) aItem;
389
393
 
390
394
        item->m_TextBase = m_textCtrlText->GetValue();
 
395
        item->m_TextBase.Replace( wxT("\n"), wxT("\\n") );
391
396
 
392
397
        msg = m_textCtrlTextIncrement->GetValue();
393
398
        msg.ToLong( &itmp );