Fix crash in selection manager

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

diff --git a/src/frontends/Application.h b/src/frontends/Application.h
index 0609f90396fab18d232b31af8ab6ce150cf71714..af7663de3719d42c50973cdeccbf6350d9d7049b 100644 (file)
--- a/src/frontends/Application.h
+++ b/src/frontends/Application.h
@@ -18,7 +18,7 @@
 
 #include "support/strfwd.h"
 
-#include <boost/function.hpp>
+#include <functional>
 
 #include <vector>
 
@@ -46,7 +46,7 @@ class Selection;
 There should be only one instance of this class. No Qt object
 initialisation should be done before the instanciation of this class.
 
- Model/View/Controller separation at frontend level in LyX-qt4:
+ Model/View/Controller separation at frontend level in qt frontend:
 
  BufferList (N Buffers)
    |
@@ -59,7 +59,7 @@ initialisation should be done before the instanciation of this class.
    |
    GuiView-1 (one or more in case of split-view mode).
    |  |
-   |  <tab-widget-1-1> 
+   |  <tab-widget-1-1>
    |  |  |
    |  |  WorkArea-1-1-1 (M1-1 WorkAreas, M1-1 <= N)
    |  |  | |
@@ -73,7 +73,7 @@ initialisation should be done before the instanciation of this class.
    |  |  |   |
    |  |  |   Cursor
    |  |
-   |  <tab-widget-1-2> 
+   |  <tab-widget-1-2>
    |
    GuiView-2 (one or more in case of split-view mode).
    |  |
@@ -117,7 +117,7 @@ initialisation should be done before the instanciation of this class.
  where the next Buffer insertion/deletion is going to take place.
 
 
- 3) The View: \c WorkArea (and it's qt4 specialisation GuiWorkArea)
+ 3) The View: \c WorkArea (and its qt specialisation GuiWorkArea)
 
  This contains the real screen area where the drawing is done by the
  Painter. One WorkArea holds one unique \c BufferView. While it could
@@ -139,9 +139,9 @@ initialisation should be done before the instanciation of this class.
  This is a full window containing a menubar, toolbars and a central
  widget. A GuiView is in charge of creating and closing a View for a
  given Buffer.
- In the qt4 specialisation, \c GuiView, the central widget is a tab
+ In the qt specialisation, \c GuiView, the central widget is a tab
  widget. Each tab is reverved to the visualisation of one Buffer and
- contains one WorkArea. In the qt4 frontend, one GuiView thus contains
+ contains one WorkArea. In the qt frontend, one GuiView thus contains
  multiple WorkAreas but this number can limited to one for another
  frontend. The idea is that the kernel should not know how a Buffer
  is displayed on screen; it's the frontend business.
@@ -177,7 +177,7 @@ public:
        /// Every user command is processed here, either invocated from
        /// keyboard or from the GUI. All GUI objects, including buttons and
        /// menus should use this class and never call kernel functions directly.
-       virtual void dispatch(FuncRequest const &) = 0;
+       virtual DispatchResult const & dispatch(FuncRequest const &) = 0;
 
        /// LyX dispatcher: executes lyx actions and returns result.
        virtual void dispatch(FuncRequest const &, DispatchResult & dr) = 0;
@@ -216,12 +216,12 @@ public:
        *      passing Color_white returns "ffffff".
        */
        virtual std::string const hexName(ColorCode col) = 0;
-       
+
        /**
        * add a callback for socket read notification
        * @param fd socket descriptor (file/socket/etc)
        */
-       typedef boost::function<void()> SocketCallback;
+       typedef std::function<void()> SocketCallback;
        virtual void registerSocketCallback(int fd, SocketCallback func) = 0;
 
        /**
@@ -233,9 +233,15 @@ public:
        virtual bool searchMenu(FuncRequest const & func,
                docstring_list & names) const = 0;
 
+       virtual bool hasBufferView() const = 0;
+
        /// \return the icon file name for the given action.
        static docstring iconName(FuncRequest const & f, bool unknown);
+       /// \return the math icon name for the given command.
+       static docstring mathIcon(docstring const & c);
 
+       /// The language associated to current keyboard
+       virtual std::string inputLanguageCode() const = 0;
        /// Handle a accented char key sequence
        /// FIXME: this is only needed for LFUN_ACCENT_* in Text::dispatch()
        virtual void handleKeyFunc(FuncCode action) = 0;
@@ -249,6 +255,8 @@ public:
        /// A started long operation is still in progress ?
        virtual bool longOperationStarted() = 0;
 
+       // Add a buffer to the current view, do not switch to it.
+       virtual bool unhide(Buffer * buf) = 0;
 };
 
 /// Return the list of loadable formats.
@@ -259,6 +267,8 @@ std::vector<std::string> loadableImageFormats();
 frontend::Application * theApp();
 frontend::Application * createApplication(int & argc, char * argv[]);
 void hideDialogs(std::string const & name, Inset * inset);
+/// Set locale correctly using LyXRC::gui_language
+void setLocale();
 
 } // namespace lyx