Commit 44014b21 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Minor fixes.

parent ea755a10

pcbnew/class_track.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -624,7 +624,7 @@ void TRACK::Draw( EDA_DRAW_PANEL* panel, wxDC* aDC, GR_DRAWMODE aDrawMode, 




#ifdef USE_WX_OVERLAY

#ifdef USE_WX_OVERLAY

    // If dragged not draw in OnPaint otherwise remains impressed in wxOverlay

    // If dragged not draw in OnPaint otherwise remains impressed in wxOverlay

    if( (m_Flags && IS_DRAGGED) && aDC->IsKindOf(wxCLASSINFO(wxPaintDC)))

    if( (m_Flags & IS_DRAGGED) && aDC->IsKindOf(wxCLASSINFO(wxPaintDC)))

      return;

      return;

#endif

#endif
@@ -691,7 +691,7 @@ void SEGZONE::Draw( EDA_DRAW_PANEL* panel, wxDC* aDC, GR_DRAWMODE aDrawMode, 




#ifdef USE_WX_OVERLAY

#ifdef USE_WX_OVERLAY

    // If dragged not draw in OnPaint otherwise remains impressed in wxOverlay

    // If dragged not draw in OnPaint otherwise remains impressed in wxOverlay

    if( (m_Flags && IS_DRAGGED) && aDC->IsKindOf(wxCLASSINFO(wxPaintDC)))

    if( (m_Flags & IS_DRAGGED) && aDC->IsKindOf(wxCLASSINFO(wxPaintDC)))

      return;

      return;

#endif

#endif

pcbnew/dialogs/dialog_plot_base.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -347,7 +347,6 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	sbSizerMsg = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxVERTICAL );

	sbSizerMsg = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxVERTICAL );

	

	

	m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );

	m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );

	m_messagesBox->SetMaxLength( 0 ); 

	m_messagesBox->SetMinSize( wxSize( -1,70 ) );

	m_messagesBox->SetMinSize( wxSize( -1,70 ) );

	

	

	sbSizerMsg->Add( m_messagesBox, 1, wxEXPAND, 5 );

	sbSizerMsg->Add( m_messagesBox, 1, wxEXPAND, 5 );

pcbnew/dialogs/dialog_plot_base.fbp

+1 −1
Original line number Original line Diff line number Diff line
@@ -3982,7 +3982,7 @@ 
                                        <property name="max_size"></property>

                                        <property name="max_size"></property>

                                        <property name="maximize_button">0</property>

                                        <property name="maximize_button">0</property>

                                        <property name="maximum_size"></property>

                                        <property name="maximum_size"></property>

                                        <property name="maxlength">0</property>

                                        <property name="maxlength"></property>

                                        <property name="min_size"></property>

                                        <property name="min_size"></property>

                                        <property name="minimize_button">0</property>

                                        <property name="minimize_button">0</property>

                                        <property name="minimum_size">-1,70</property>

                                        <property name="minimum_size">-1,70</property>

pcbnew/pcbframe.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -605,7 +605,7 @@ void PCB_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event ) 
{

{

    m_canvas->SetAbortRequest( true );

    m_canvas->SetAbortRequest( true );





    if( GetScreen()->IsModify() )

    if( GetScreen()->IsModify() && !GetBoard()->IsEmpty() )

    {

    {

        wxString msg;

        wxString msg;

        msg.Printf( _("Save the changes in\n<%s>\nbefore closing?"),

        msg.Printf( _("Save the changes in\n<%s>\nbefore closing?"),