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 f370f8a4302d36887406e9f5904fa5c025640bf5..92525efcea12ef430aeb69a47344d60ba5cd70c0 100644 (file)
--- a/src/lyx_gui_misc.h
+++ b/src/lyx_gui_misc.h
@@ -1,21 +1,22 @@
 // -*- 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
 
-#ifndef _LYX_GUI_MISC_H
-#define _LYX_GUI_MISC_H
+#ifndef LYX_GUI_MISC_H
+#define LYX_GUI_MISC_H
 
 #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,52 +24,52 @@ 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(const char *sc);
+char const * flyx_ident_extract(char const * sc);
 /// Make a shortnamed versjon of the above func
 #define idex flyx_ident_extract
 
 /// Show message
-void WriteAlert(LString const & s1, LString const & s2=LString(), 
-               LString const & s3=LString());
+void WriteAlert(string const & s1, string const & s2 = string(), 
+               string const & s3 = string());
 
 /// Alarms user of something related to files
-void WriteFSAlert(LString const & s1, LString const & s2=LString());
+void WriteFSAlert(string const & s1, string const & s2 = string());
 
 /// Asks "Yes" or "No". Returns true for yes, false for no
-bool AskQuestion(LString const & s1, LString const & s2=LString(),
-                LString const & s3=LString());
+bool AskQuestion(string const & s1, string const & s2 = string(),
+                string const & s3 = string());
 
 /// Asks "Yes", "No" or "Cancel". Returns 1 for yes, 2 for no, 3 for cancel
-int AskConfirmation(LString const & s1, LString const & s2=LString(), 
-                   LString const & s3=LString());
+int AskConfirmation(string const & s1, string const & s2 = string(), 
+                   string const & s3 = string());
 
-/// returns a text
-LString askForText(LString const & msg, LString const & dflt=LString());
+/// 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