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

Fix issue with new layer box, mainly with wxWidgets 2.9.1

parent aeb6dd8c

include/class_layerchoicebox.h

+2 −2
Original line number Diff line number Diff line
@@ -10,12 +10,12 @@ 
class WinEDALayerChoiceBox : public wxBitmapComboBox

{

public:

    WinEDALayerChoiceBox( wxWindow* parent, wxWindowID id,

    WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,

                     const wxPoint& pos = wxDefaultPosition,

                     const wxSize& size = wxDefaultSize,

                     int n = 0, const wxString choices[] = NULL );



    WinEDALayerChoiceBox( wxWindow* parent, wxWindowID id,

    WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,

                     const wxPoint& pos, const wxSize& size,

                     const wxArrayString& choices );

pcbnew/class_layerchoicebox.cpp

+86 −81
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 *

 */



    WinEDALayerChoiceBox::WinEDALayerChoiceBox( wxWindow* parent, wxWindowID id,

WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,

                                            const wxPoint& pos, const wxSize& size,

                                            int n, const wxString choices[] ) :

    wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
@@ -30,7 +30,7 @@ 
}





    WinEDALayerChoiceBox::WinEDALayerChoiceBox( wxWindow* parent, wxWindowID id,

WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,

                                            const wxPoint& pos, const wxSize& size,

                                            const wxArrayString& choices ) :

    wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
@@ -38,25 +38,30 @@ 
{

}





// Get Current Item #

int WinEDALayerChoiceBox::GetChoice()

{

    return GetSelection();

}





// Get Current Layer

int WinEDALayerChoiceBox::GetLayerChoice()

{

    return (long) GetClientData( GetSelection() );

}





// Set Layer #

int WinEDALayerChoiceBox::SetLayerSelection( int layer )

{

    int elements = GetCount();



    for( int i = 0; i < elements; i++ )

    {

        if( GetClientData( i ) == (void*) layer )

        {

            if( GetSelection() != i )   // Element (i) is not selected

            {

                SetSelection( i );
@@ -64,16 +69,21 @@ 
            }

            else

                return i;               //If element already selected; do nothing

        }

    }



    // Not Found

    SetSelection( -1 );

    return -1;

}





// Reload the Layers

void WinEDALayerChoiceBox::Resync()

{

        BOARD* board = ((WinEDA_BasePcbFrame*)GetParent())->GetBoard();

    WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();

    BOARD* board = pcbFrame->GetBoard();



    wxASSERT( board != NULL );



    Clear();
@@ -83,12 +93,14 @@ 


    for( int i = 0; i < LAYER_COUNT; i++ )

    {

           wxBitmap    layerbmp (20,18);

        wxBitmap   layerbmp( 14, 14 );

        wxMemoryDC bmpDC;

        wxBrush    brush;

        wxString   layername;



        int        layerid = layertranscode[i];

        if( ! board->IsLayerEnabled( layerid ) )

            continue;



        // Prepare Bitmap

        bmpDC.SelectObject( layerbmp );
@@ -102,14 +114,7 @@ 
        bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );



        layername = board->GetLayerName( layerid );



           layername.Append( wxT( "\t" ) );

        layername = AddHotkeyName( layername, s_Board_Editor_Hokeys_Descr, layerhk[layerid], false );





           if(board->IsLayerEnabled(layerid))

        Append( layername, layerbmp, (void*) layerid );

    }



}

pcbnew/pcbframe.cpp

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father, 
    vert.TopDockable( false ).BottomDockable( false );

    horiz.LeftDockable( false ).RightDockable( false );



    // Create a template from the horiz wxAuiPaneInfo, specific for horizontal toolbars:

    // Create a template from the horiz wxAuiPaneInfo, specific to horizontal toolbars:

    wxAuiPaneInfo horiz_tb( horiz );

    horiz_tb.ToolbarPane().Gripper( false );

pcbnew/tool_pcb.cpp

+4 −5
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ void WinEDA_PcbFrame::ReCreateHToolbar() 
    m_HToolBar->AddSeparator();



    if(m_SelLayerBox == NULL)

        m_SelLayerBox = new WinEDALayerChoiceBox( this, ID_TOOLBARH_PCB_SELECT_LAYER);

        m_SelLayerBox = new WinEDALayerChoiceBox( m_HToolBar, ID_TOOLBARH_PCB_SELECT_LAYER);



    ReCreateLayerBox( m_HToolBar );

    m_HToolBar->AddControl( m_SelLayerBox );
@@ -683,7 +683,6 @@ an existing track use its width\notherwise, use current width setting" ), 


    m_TrackAndViasSizesList_Changed    = true;

    m_AuxiliaryToolBar->AddSeparator();

    ReCreateLayerBox( NULL );

}

pcbnew/toolbars_update_user_interface.cpp

+2 −4
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ void WinEDA_PcbFrame::SetToolbars() 


    state = GetScreen()->GetRedoCommandCount() > 0;

    m_HToolBar->EnableTool( wxID_REDO, state );

    syncLayerBox();

    PrepareLayerIndicator();

    m_HToolBar->Refresh();



    if( m_OptionsToolBar )
@@ -276,9 +278,5 @@ void WinEDA_PcbFrame::SetToolbars() 


    if( m_AuxiliaryToolBar )

        AuxiliaryToolBar_Update_UI();



    syncLayerBox();



    PrepareLayerIndicator();

    DisplayUnitsMsg();

}