Commit 89a138c0 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Added handling keyboard events for the Tool framework.

parent 5adba827

common/drawframe.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1017,5 +1017,6 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable ) 
    m_auimgr.GetPane( wxT( "DrawFrameGal" ) ).Show( aEnable );

    m_auimgr.Update();



    m_galCanvas->SetFocus();

    m_galCanvasActive = aEnable;

}

common/drawpanel.cpp

+0 −1
Original line number Diff line number Diff line
@@ -1334,7 +1334,6 @@ void EDA_DRAW_PANEL::OnKeyEvent( wxKeyEvent& event ) 
    Screen->SetMousePosition( pos );



    GetParent()->GeneralControl( &DC, pos, localkey );



}

common/drawpanel_gal.cpp

+19 −11
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ 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 );

}
@@ -209,3 +210,10 @@ void EDA_DRAW_PANEL_GAL::onEvent( wxEvent& aEvent ) 
        m_eventDispatcher->DispatchWxEvent( aEvent );

    }

}





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();

}

common/gal/cairo/cairo_gal.cpp

+7 −8
Original line number Diff line number Diff line
@@ -56,13 +56,12 @@ CAIRO_GAL::CAIRO_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener, 


    // Mouse events are skipped to the parent

    Connect( wxEVT_MOTION,      wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );

    Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );

    Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );

    Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );

    Connect( wxEVT_LEFT_DOWN,   wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );

    Connect( wxEVT_LEFT_UP,     wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );

    Connect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );

    Connect( wxEVT_MIDDLE_UP,   wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );

    Connect( wxEVT_RIGHT_DOWN,  wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );

    Connect( wxEVT_RIGHT_UP,    wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );

#if defined _WIN32 || defined _WIN64

    Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );

#endif

common/gal/opengl/opengl_gal.cpp

+7 −8
Original line number Diff line number Diff line
@@ -70,13 +70,12 @@ OPENGL_GAL::OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener, 


    // Mouse events are skipped to the parent

    Connect( wxEVT_MOTION,      wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );

    Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );

    Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );

    Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );

    Connect( wxEVT_LEFT_DOWN,   wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );

    Connect( wxEVT_LEFT_UP,     wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );

    Connect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );

    Connect( wxEVT_MIDDLE_UP,   wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );

    Connect( wxEVT_RIGHT_DOWN,  wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );

    Connect( wxEVT_RIGHT_UP,    wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );

#if defined _WIN32 || defined _WIN64

    Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );

#endif