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 ad620e66d6f57d6b3d0b3eacca0b4fe158aad746..92525efcea12ef430aeb69a47344d60ba5cd70c0 100644 (file)
--- a/src/lyx_gui_misc.h
+++ b/src/lyx_gui_misc.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 1996 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team
+ *           Copyright 1995-2000 The LyX Team
  *
  * ====================================================== */
 
@@ -17,7 +17,6 @@
 #include FORMS_H_LOCATION
 #include "LString.h"
 #include <utility>  /* needed for pair<> definition */
-using std::pair;
 
 /// Prevents LyX from being killed when the close box is pressed in a popup.
 extern "C" int CancelCloseBoxCB(FL_FORM *, void *);
@@ -25,10 +24,10 @@ 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
 char const * flyx_shortcut_extract(char const * sc);
@@ -56,14 +55,17 @@ int AskConfirmation(string const & s1, string const & s2 = string(),
                    string const & s3 = string());
 
 /// returns a bool: false=cancelled, true=okay. string contains returned text
-pair<bool, string> askForText(string const & msg,
-                             string const & dflt = string());
+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(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