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

Fix some minor issues in hotkey dialogs

parent 3053d45b

common/dialogs/dialog_hotkeys_editor.cpp

+4 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ HOTKEYS_EDITOR_DIALOG::HOTKEYS_EDITOR_DIALOG( EDA_DRAW_FRAME* parent, 
    m_hotkeys = hotkeys;

    m_curEditingRow = -1;



    m_table = new HotkeyGridTable( hotkeys );

    m_table = new HOTKEY_EDITOR_GRID_TABLE( hotkeys );

    m_hotkeyGrid->SetTable( m_table, true );



    m_hotkeyGrid->AutoSizeColumn( 0 );
@@ -76,7 +76,7 @@ HOTKEYS_EDITOR_DIALOG::HOTKEYS_EDITOR_DIALOG( EDA_DRAW_FRAME* parent, 
void HOTKEYS_EDITOR_DIALOG::OnOKClicked( wxCommandEvent& event )

{

    /* edit the live hotkey table */

    HotkeyGridTable::hotkey_spec_vector& hotkey_vec = m_table->getHotkeys();

    HOTKEY_EDITOR_GRID_TABLE::hotkey_spec_vector& hotkey_vec = m_table->getHotkeys();



    EDA_HOTKEY_CONFIG*      section;
@@ -91,7 +91,7 @@ void HOTKEYS_EDITOR_DIALOG::OnOKClicked( wxCommandEvent& event ) 
            EDA_HOTKEY* info = *info_ptr;



            /* find the corresponding hotkey */

            HotkeyGridTable::hotkey_spec_vector::iterator i;

            HOTKEY_EDITOR_GRID_TABLE::hotkey_spec_vector::iterator i;



            for( i = hotkey_vec.begin(); i != hotkey_vec.end(); ++i )

            {
@@ -158,7 +158,7 @@ void HOTKEYS_EDITOR_DIALOG::OnClickOnCell( wxGridEvent& event ) 


    int newRow = event.GetRow();



    if( ( event.GetCol() != 1 ) || ( m_table->isHeader( newRow ) ) )

    if( ( event.GetCol() != 1 ) || ( m_table->IsHeader( newRow ) ) )

    {

        m_curEditingRow = -1;

    }

common/dialogs/dialog_hotkeys_editor_base.cpp

+4 −2
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Sep  8 2010)

// C++ code generated with wxFormBuilder (version Oct  8 2012)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -9,7 +9,7 @@ 


///////////////////////////////////////////////////////////////////////////



HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )

HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )

{

	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
@@ -55,8 +55,10 @@ HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWind 
	m_undoButton = new wxButton( this, wxID_CANCEL, _("Undo"), wxDefaultPosition, wxDefaultSize, 0 );

	b_buttonsSizer->Add( m_undoButton, 0, wxALL|wxEXPAND, 5 );

	

	

	bMainSizer->Add( b_buttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );

	

	

	this->SetSizer( bMainSizer );

	this->Layout();