Commit 75d2dc73 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Pcbnew: Hight contrast mode: commit last patch from Miguel Angel Ajo Pelayo,...

Pcbnew: Hight contrast mode: commit last patch from Miguel Angel Ajo Pelayo, which also  fixes an old bug.
All: prepare better compatibility with wxWidgets 2.9.4. Works fine with 2.8.x (I hope...)
parent 4a739403
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -330,5 +330,5 @@ void AbortBlockCurrentCommand( EDA_DRAW_PANEL* Panel, wxDC* DC )


    screen->m_BlockLocate.m_Command = BLOCK_IDLE;
    screen->m_BlockLocate.m_Command = BLOCK_IDLE;
    Panel->GetParent()->DisplayToolMsg( wxEmptyString );
    Panel->GetParent()->DisplayToolMsg( wxEmptyString );
    Panel->SetCursor( Panel->GetCurrentCursor() );
    Panel->SetCursor( (wxStockCursor) Panel->GetCurrentCursor() );
}
}
+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ void EDA_DRAW_FRAME::CopyToClipboard( wxCommandEvent& event )
    if( event.GetId() == ID_GEN_COPY_BLOCK_TO_CLIPBOARD )
    if( event.GetId() == ID_GEN_COPY_BLOCK_TO_CLIPBOARD )
    {
    {
        if( GetScreen()->IsBlockActive() )
        if( GetScreen()->IsBlockActive() )
            m_canvas->SetCursor( wxCursor( m_canvas->GetDefaultCursor() ) );
            m_canvas->SetCursor( wxCursor( (wxStockCursor) m_canvas->GetDefaultCursor() ) );


        m_canvas->EndMouseCapture();
        m_canvas->EndMouseCapture();
    }
    }
+1 −1
Original line number Original line Diff line number Diff line
@@ -399,7 +399,7 @@ void SCH_EDIT_FRAME::HandleBlockEndByPopUp( int Command, wxDC* DC )


    case BLOCK_ZOOM:     /* Window Zoom */
    case BLOCK_ZOOM:     /* Window Zoom */
        m_canvas->CallEndMouseCapture( DC );
        m_canvas->CallEndMouseCapture( DC );
        m_canvas->SetCursor( m_canvas->GetDefaultCursor() );
        m_canvas->SetCursor( (wxStockCursor) m_canvas->GetDefaultCursor() );
        Window_Zoom( GetScreen()->m_BlockLocate );
        Window_Zoom( GetScreen()->m_BlockLocate );
        break;
        break;


+3 −3
Original line number Original line Diff line number Diff line
@@ -299,7 +299,7 @@ void NETLIST_DIALOG::InstallPageSpice()
    page->m_LeftBoxSizer->Add( page->m_NetOption, 0, wxGROW | wxALL, 5 );
    page->m_LeftBoxSizer->Add( page->m_NetOption, 0, wxGROW | wxALL, 5 );


    page->m_LowBoxSizer->Add( new wxStaticText( page, -1, _( "Simulator command:" ) ), 0,
    page->m_LowBoxSizer->Add( new wxStaticText( page, -1, _( "Simulator command:" ) ), 0,
                              wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE, 5 );
                              wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );


    page->m_CommandStringCtrl = new wxTextCtrl( page, -1, m_Parent->GetSimulatorCommand(),
    page->m_CommandStringCtrl = new wxTextCtrl( page, -1, m_Parent->GetSimulatorCommand(),
                                                wxDefaultPosition, wxDefaultSize );
                                                wxDefaultPosition, wxDefaultSize );
@@ -374,7 +374,7 @@ void NETLIST_DIALOG::InstallCustomPages()


        CurrPage->m_LowBoxSizer->Add( new wxStaticText( CurrPage,
        CurrPage->m_LowBoxSizer->Add( new wxStaticText( CurrPage,
                                                        -1, _( "Netlist command:" ) ), 0,
                                                        -1, _( "Netlist command:" ) ), 0,
                                      wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE, 5 );
                                      wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );


        CurrPage->m_CommandStringCtrl = new wxTextCtrl( CurrPage, -1, Command,
        CurrPage->m_CommandStringCtrl = new wxTextCtrl( CurrPage, -1, Command,
                                                        wxDefaultPosition, wxDefaultSize );
                                                        wxDefaultPosition, wxDefaultSize );
@@ -387,7 +387,7 @@ void NETLIST_DIALOG::InstallCustomPages()


        CurrPage->m_LowBoxSizer->Add( new wxStaticText( CurrPage,
        CurrPage->m_LowBoxSizer->Add( new wxStaticText( CurrPage,
                                                        -1, _( "Title:" ) ), 0,
                                                        -1, _( "Title:" ) ), 0,
                                      wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE, 5 );
                                      wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );


        CurrPage->m_TitleStringCtrl = new wxTextCtrl( CurrPage, -1, title,
        CurrPage->m_TitleStringCtrl = new wxTextCtrl( CurrPage, -1, title,
                                                      wxDefaultPosition, wxDefaultSize );
                                                      wxDefaultPosition, wxDefaultSize );
+1 −1
Original line number Original line Diff line number Diff line
@@ -437,7 +437,7 @@ void SCH_EDIT_FRAME::OnCancelCurrentCommand( wxCommandEvent& aEvent )


    if( screen->IsBlockActive() )
    if( screen->IsBlockActive() )
    {
    {
        m_canvas->SetCursor( wxCursor( m_canvas->GetDefaultCursor() ) );
        m_canvas->SetCursor( (wxStockCursor) m_canvas->GetDefaultCursor() );
        screen->ClearBlockCommand();
        screen->ClearBlockCommand();


        // Stop the current command (if any) but keep the current tool
        // Stop the current command (if any) but keep the current tool
Loading