From 0810492a2c17ffd423217d88f996e01ab22c7ea9 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Wed, 29 May 2013 20:00:40 +0200 Subject: [PATCH] Fix issue created by the template selector change, on Linux. --- kicad/dialogs/dialog_template_selector.cpp | 3 ++- pcbnew/edit_pcb_text.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kicad/dialogs/dialog_template_selector.cpp b/kicad/dialogs/dialog_template_selector.cpp index 857387c2d5..cb040c7d01 100644 --- a/kicad/dialogs/dialog_template_selector.cpp +++ b/kicad/dialogs/dialog_template_selector.cpp @@ -132,7 +132,8 @@ void DIALOG_TEMPLATE_SELECTOR::onNotebookResize(wxSizeEvent& event) void DIALOG_TEMPLATE_SELECTOR::OnPageChange( wxNotebookEvent& event ) { int page = m_notebook->GetSelection(); - if( page != wxNOT_FOUND ) + + if( page != wxNOT_FOUND && (unsigned)page < m_panels.size() ) m_textCtrlTemplatePath->SetValue( m_panels[page]->GetPath() ); } diff --git a/pcbnew/edit_pcb_text.cpp b/pcbnew/edit_pcb_text.cpp index 3037184890..c7a62aaa01 100644 --- a/pcbnew/edit_pcb_text.cpp +++ b/pcbnew/edit_pcb_text.cpp @@ -208,7 +208,7 @@ TEXTE_PCB* PCB_EDIT_FRAME::CreateTextePcb( wxDC* aDC, TEXTE_PCB* aText ) // Set the mirrored option for layers on the BACK side of the board if( layer == LAYER_N_BACK || layer == SILKSCREEN_N_BACK || - layer == SOLDERPASTE_N_BACK || layer == SOLDERMASK_N_FRONT || + layer == SOLDERPASTE_N_BACK || layer == SOLDERMASK_N_BACK || layer == ADHESIVE_N_BACK ) textePcb->SetMirrored( true ); @@ -241,12 +241,12 @@ void PCB_EDIT_FRAME::Rotate_Texte_Pcb( TEXTE_PCB* TextePcb, wxDC* DC ) if( TextePcb == NULL ) return; - /* Erase previous text. */ + // Erase previous text: TextePcb->Draw( m_canvas, DC, GR_XOR ); TextePcb->SetOrientation( TextePcb->GetOrientation() + angle ); - /* Redraw text in new position. */ + // Redraw text in new position: TextePcb->Draw( m_canvas, DC, GR_XOR ); SetMsgPanel( TextePcb ); @@ -276,7 +276,7 @@ void PCB_EDIT_FRAME::FlipTextePcb( TEXTE_PCB* aTextePcb, wxDC* aDC ) if( aTextePcb->GetFlags() == 0 ) // i.e. not edited, or moved SaveCopyInUndoList( aTextePcb, UR_FLIPPED, aTextePcb->GetTextPosition() ); - else // set flag edit, to show it was a complex command + else // set edit flag, for the current command aTextePcb->SetFlags( IN_EDIT ); OnModify();