fix compilation on F13 and binutils/gold by rewriting specialized X11 code

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index e9843eb39937050b3c47873c0d1808cf2480f3f7..57f5f515fe734acc859bae76fe41a4416246b556 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -34,11 +34,17 @@ class ServerSocket;
 class Session;
 class SpellChecker;
 
+enum OverwriteFiles {
+       NO_FILES,
+       MAIN_FILE,
+       ALL_FILES
+};
+
 extern bool use_gui;
+extern OverwriteFiles force_overwrite;
 
 namespace frontend {
 class Application;
-class LyXView;
 }
 
 namespace graphics {
@@ -55,9 +61,6 @@ public:
        /// Execute LyX.
        int exec(int & argc, char * argv[]);
 
-       ///
-       frontend::LyXView * newLyXView();
-
 private:
        /// noncopyable
        LyX(LyX const &);
@@ -127,8 +130,8 @@ private:
        friend ServerSocket & theServerSocket();
        friend Converters & theConverters();
        friend Converters & theSystemConverters();
-       friend Messages & getMessages(std::string const & language);
-       friend Messages & getGuiMessages();
+       friend Messages const & getMessages(std::string const & language);
+       friend Messages const & getGuiMessages();
        friend KeyMap & theTopLevelKeymap();
        friend Movers & theMovers();
        friend Mover const & getMover(std::string  const & fmt);
@@ -164,6 +167,9 @@ FuncStatus getStatus(FuncRequest const & action);
 ///
 void dispatch(FuncRequest const & action);
 
+///
+void dispatch(FuncRequest const & action, DispatchResult & dr);
+
 } // namespace lyx
 
 #endif // LYX_H