X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FApplication.h;h=b321052ddb7661255d7d76585dc75e468b8daf4b;hb=8fa0e539e52512b80c5c3eac965e3abb98ba484e;hp=0bba5cea55a94320e467c7c1f7a87d109c2e26a3;hpb=c324d6eae6231658803849d13320b14a96717234;p=lyx.git

diff --git a/src/frontends/Application.h b/src/frontends/Application.h
index 0bba5cea55..b321052ddb 100644
--- 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>
 
@@ -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;
 
 	/**
@@ -235,6 +235,8 @@ public:
 
 	/// \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);
 
 	/// Handle a accented char key sequence
 	/// FIXME: this is only needed for LFUN_ACCENT_* in Text::dispatch()
@@ -246,6 +248,8 @@ public:
 	virtual bool longOperationCancelled() = 0;
 	/// Stop the long operation mode (i.e., release the GUI)
 	virtual void stopLongOperation() = 0;
+	/// A started long operation is still in progress ?
+	virtual bool longOperationStarted() = 0;
 
 };
 
@@ -257,6 +261,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