NEW_INSETS changes, + some small things in insettabular.C

[lyx.git] / src / lyx_gui_misc.h

diff --git a/src/lyx_gui_misc.h b/src/lyx_gui_misc.h
index c7291eb142efe9e645d752eeea9b09d9211eb7d1..92525efcea12ef430aeb69a47344d60ba5cd70c0 100644 (file)
--- a/src/lyx_gui_misc.h
+++ b/src/lyx_gui_misc.h
@@ -1,13 +1,13 @@
 // -*- C++ -*-
 /* This file is part of
-* ======================================================
-* 
-*           LyX, The Document Processor
-*        
-*           Copyright (C) 1995 1996 Matthias Ettrich
-*           and the LyX Team.
-*
-* ====================================================== */
+ * ======================================================
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 1996 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team
+ *
+ * ====================================================== */
 
 // Misc. GUI specific routines
 
@@ -16,6 +16,7 @@
 
 #include FORMS_H_LOCATION
 #include "LString.h"
+#include <utility>  /* needed for pair<> definition */
 
 /// Prevents LyX from being killed when the close box is pressed in a popup.
 extern "C" int CancelCloseBoxCB(FL_FORM *, void *);
@@ -23,18 +24,18 @@ extern "C" int CancelCloseBoxCB(FL_FORM *, void *);
 extern "C" int IgnoreCloseBoxCB(FL_FORM *, void *);
 
 /// Prevents LyX from crashing when no buffers available
-void CloseAllBufferRelatedPopups();
+void CloseAllBufferRelatedDialogs();
 
 /// Ensures info in visible popups are always correct.
-void updateAllVisibleBufferRelatedPopups();
+void updateAllVisibleBufferRelatedDialogs();
 
 /// Extract shortcut from <ident>|<shortcut> string
-const char* flyx_shortcut_extract(const char*sc);
+char const * flyx_shortcut_extract(char const * sc);
 /// Make a shortnamed version of the above func
 #define scex flyx_shortcut_extract
 
 /// Extract shortcut from <ident>|<shortcut> string
-const char* flyx_ident_extract(char const *sc);
+char const * flyx_ident_extract(char const * sc);
 /// Make a shortnamed versjon of the above func
 #define idex flyx_ident_extract
 
@@ -53,22 +54,22 @@ bool AskQuestion(string const & s1, string const & s2 = string(),
 int AskConfirmation(string const & s1, string const & s2 = string(), 
                    string const & s3 = string());
 
-/// returns a text
-string askForText(string const & msg, string const & dflt = string());
+/// returns a bool: false=cancelled, true=okay. string contains returned text
+std::pair<bool, string> askForText(string const & msg,
+                                  string const & dflt = string());
 
 /// Informs the user that changes in the coming form will be ignored
-void WarnReadonly();
+void WarnReadonly(string const & file);
+
+/// Get the dpi setting of the current screen
+float getScreenDPI();
 
 // inlined functions
-/// rings the audio bell.
+// rings the audio bell.
 inline
 void LyXBell() {
        // if (audio()) ON/OFF switch yet to be implemented
-#if FL_REVISION > 85
        fl_ringbell(20);
-#else
-       ringbell();
-#endif
 }
 
 #endif