Commit dcccaee2 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Replace WinEDAChoiceBox with wxComboBox.

parent cb3e36f0

common/drawframe.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -360,7 +360,7 @@ void EDA_DRAW_FRAME::OnSelectZoom( wxCommandEvent& event ) 
    if( m_SelZoomBox == NULL )

    if( m_SelZoomBox == NULL )

        return;                        // Should not happen!

        return;                        // Should not happen!





    int id = m_SelZoomBox->GetChoice();

    int id = m_SelZoomBox->GetCurrentSelection();





    if( id < 0 || !( id < (int)m_SelZoomBox->GetCount() ) )

    if( id < 0 || !( id < (int)m_SelZoomBox->GetCount() ) )

        return;

        return;

eeschema/libeditframe.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -101,8 +101,8 @@ BEGIN_EVENT_TABLE( LIB_EDIT_FRAME, EDA_DRAW_FRAME ) 
    EVT_TOOL( CreateNewLibAndSavePartId, LIB_EDIT_FRAME::OnExportPart )

    EVT_TOOL( CreateNewLibAndSavePartId, LIB_EDIT_FRAME::OnExportPart )

    EVT_TOOL( ImportPartId, LIB_EDIT_FRAME::OnImportPart )

    EVT_TOOL( ImportPartId, LIB_EDIT_FRAME::OnImportPart )





    EVT_KICAD_CHOICEBOX( ID_LIBEDIT_SELECT_PART_NUMBER, LIB_EDIT_FRAME::OnSelectPart )

    EVT_COMBOBOX( ID_LIBEDIT_SELECT_PART_NUMBER, LIB_EDIT_FRAME::OnSelectPart )

    EVT_KICAD_CHOICEBOX( ID_LIBEDIT_SELECT_ALIAS, LIB_EDIT_FRAME::OnSelectAlias )

    EVT_COMBOBOX( ID_LIBEDIT_SELECT_ALIAS, LIB_EDIT_FRAME::OnSelectAlias )





    /* Right vertical toolbar. */

    /* Right vertical toolbar. */

    EVT_TOOL( ID_NO_TOOL_SELECTED, LIB_EDIT_FRAME::OnSelectTool )

    EVT_TOOL( ID_NO_TOOL_SELECTED, LIB_EDIT_FRAME::OnSelectTool )

eeschema/libeditframe.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -28,8 +28,8 @@ class LIB_EDIT_FRAME : public EDA_DRAW_FRAME 
    LIB_COMPONENT* m_tempCopyComponent;  ///< Temporary copy of current component during edit.

    LIB_COMPONENT* m_tempCopyComponent;  ///< Temporary copy of current component during edit.





public:

public:

    WinEDAChoiceBox* m_SelpartBox;       // a Box to select a part to edit (if any)

    wxComboBox* m_SelpartBox;            // a Box to select a part to edit (if any)

    WinEDAChoiceBox* m_SelAliasBox;      // a box to select the alias to edit (if any)

    wxComboBox* m_SelAliasBox;           // a box to select the alias to edit (if any)





public:

public:

    LIB_EDIT_FRAME( SCH_EDIT_FRAME* aParent, const wxString& title,

    LIB_EDIT_FRAME( SCH_EDIT_FRAME* aParent, const wxString& title,

eeschema/tool_lib.cpp

+12 −6
Original line number Original line Diff line number Diff line
@@ -158,14 +158,20 @@ void LIB_EDIT_FRAME::ReCreateHToolbar() 
                         _( "Edit document file" ) );

                         _( "Edit document file" ) );





    m_HToolBar->AddSeparator();

    m_HToolBar->AddSeparator();

    m_SelpartBox = new WinEDAChoiceBox( m_HToolBar,

    m_SelpartBox = new wxComboBox( m_HToolBar,

                                   ID_LIBEDIT_SELECT_PART_NUMBER,

                                   ID_LIBEDIT_SELECT_PART_NUMBER,

                                   wxEmptyString,

                                   wxDefaultPosition,

                                   wxDefaultPosition,

                                        wxSize( LISTBOX_WIDTH, -1 ) );

                                   wxSize( LISTBOX_WIDTH, -1 ),

                                   0, NULL, wxCB_READONLY );

    m_HToolBar->AddControl( m_SelpartBox );

    m_HToolBar->AddControl( m_SelpartBox );





    m_SelAliasBox = new WinEDAChoiceBox( m_HToolBar, ID_LIBEDIT_SELECT_ALIAS, wxDefaultPosition,

    m_SelAliasBox = new wxComboBox( m_HToolBar,

                                         wxSize( LISTBOX_WIDTH, -1 ) );

                                    ID_LIBEDIT_SELECT_ALIAS,

                                    wxEmptyString,

                                    wxDefaultPosition,

                                    wxSize( LISTBOX_WIDTH, -1 ),

                                    0, NULL, wxCB_READONLY );

    m_HToolBar->AddControl( m_SelAliasBox );

    m_HToolBar->AddControl( m_SelAliasBox );





    m_HToolBar->AddSeparator();

    m_HToolBar->AddSeparator();

eeschema/tool_viewlib.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -82,9 +82,9 @@ void LIB_VIEW_FRAME::ReCreateHToolbar() 




        m_HToolBar->AddSeparator();

        m_HToolBar->AddSeparator();





        SelpartBox =

        SelpartBox = new wxComboBox( m_HToolBar, ID_LIBVIEW_SELECT_PART_NUMBER,

            new WinEDAChoiceBox( m_HToolBar, ID_LIBVIEW_SELECT_PART_NUMBER,

                                     wxEmptyString, wxDefaultPosition,

                                 wxDefaultPosition, wxSize( 150, -1 ) );

                                     wxSize( 150, -1 ), 0, NULL, wxCB_READONLY );

        m_HToolBar->AddControl( SelpartBox );

        m_HToolBar->AddControl( SelpartBox );





        m_HToolBar->AddSeparator();

        m_HToolBar->AddSeparator();