Commit f1b0ffd3 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Changed focus owner of LayerWidget to EDA_DRAW_PANEL_GAL to make keyboard... 

Changed focus owner of LayerWidget to EDA_DRAW_PANEL_GAL to make keyboard events work (apparently everything works fine, to be tested more extensively).
Removed unnecessary event hook from EDA_DRAW_PANEL_GAL.
parent c012554d

common/drawpanel_gal.cpp

+0 −8
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin 
	Connect( wxEVT_MIDDLE_UP,   wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );

	Connect( wxEVT_MIDDLE_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );

	Connect( wxEVT_MOUSEWHEEL,  wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );

	Connect( wxEVT_CHAR_HOOK,   wxEventHandler( EDA_DRAW_PANEL_GAL::skipEvent ), NULL, this );

	Connect( wxEVT_KEY_UP,      wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );

	Connect( wxEVT_KEY_DOWN,    wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );

}
@@ -208,10 +207,3 @@ void EDA_DRAW_PANEL_GAL::onEvent( wxEvent& aEvent ) 


	Refresh();

}
 




void EDA_DRAW_PANEL_GAL::skipEvent( wxEvent& aEvent )

{

    // This is necessary for CHAR_HOOK event to generate KEY_UP and KEY_DOWN events

    aEvent.Skip();

}

include/class_drawpanel_gal.h

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ protected: 
    void onPaint( wxPaintEvent& WXUNUSED( aEvent ) );

    void onSize( wxSizeEvent& aEvent );

	void onEvent( wxEvent& aEvent );

	void skipEvent( wxEvent& aEvent );



    KiGfx::GAL*              m_gal;              ///< Interface for drawing objects on a 2D-surface

    KiGfx::VIEW*             m_view;             ///< Stores view settings (scale, center, etc.)

pcbnew/pcbframe.cpp

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( wxWindow* parent, const wxString& title, 
    if( screenHeight <= 900 )

        pointSize = (pointSize * 8) / 10;



    m_Layers = new PCB_LAYER_WIDGET( this, m_canvas, pointSize );

    m_Layers = new PCB_LAYER_WIDGET( this, m_galCanvas, pointSize );



    m_drc = new DRC( this );        // these 2 objects point to each other