merge controllers/Makefile.am and controllers/tests/Makefile.am

[lyx.git] / src / frontends / WorkArea.h

diff --git a/src/frontends/WorkArea.h b/src/frontends/WorkArea.h
index bca23d19f98943ae86b3c53c6efc732bdb23c399..f45e2eefd671de49049ef9a8668bfa833abef85c 100644 (file)
--- a/src/frontends/WorkArea.h
+++ b/src/frontends/WorkArea.h
@@ -15,7 +15,7 @@
 #define BASE_WORKAREA_H
 
 #include "frontends/key_state.h"
-#include "frontends/LyXKeySym.h"
+#include "frontends/KeySymbol.h"
 #include "frontends/Timeout.h"
 
 #include "support/docstring.h"
@@ -67,7 +67,7 @@ public:
 
        /// \return true if has the keyboard input focus.
        virtual bool hasFocus() const = 0;
-       
+
        /// return the width of the work area in pixels
        virtual int width() const = 0;
 
@@ -93,12 +93,13 @@ public:
 
        /// Process Key pressed event.
        /// This needs to be public because it is accessed externally by GuiView.
-       void processKeySym(LyXKeySymPtr key, key_modifier::state state);
+       void processKeySym(KeySymbolPtr key, key_modifier::state state);
 protected:
        /// cause the display of the given area of the work area
        virtual void expose(int x, int y, int w, int h) = 0;
        ///
-       void dispatch(FuncRequest const & cmd0);
+       void dispatch(FuncRequest const & cmd0,
+               key_modifier::state = key_modifier::none);
        ///
        void resizeBufferView();
        ///