X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_gui_misc.h;h=5726d11baa66ac56b48a6d681c21899eb09f7e56;hb=00d24ec87650e4ac7db77ad54cb4aa2f688100f3;hp=2ad413d558781a800bc8ce69d91cc7cf36d90f5a;hpb=0eccdd1c3613e5170deb77b22174dd0afde833e9;p=lyx.git

diff --git a/src/lyx_gui_misc.h b/src/lyx_gui_misc.h
index 2ad413d558..5726d11baa 100644
--- a/src/lyx_gui_misc.h
+++ b/src/lyx_gui_misc.h
@@ -1,74 +1,76 @@
 // -*- 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-2001 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
+
+#ifdef __GNUG__
+#pragma interface
+#endif
 
 #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 *);
-/// Prevents LyX from being killed when the close box is pressed in a popup.
-extern "C" int IgnoreCloseBoxCB(FL_FORM *, void *);
+
+/** Redraw the form (on receipt of a Signal indicating, for example,
+    that the xform colors have been re-mapped). */
+void RedrawAllBufferRelatedDialogs();
 
 /// Prevents LyX from crashing when no buffers available
-void CloseAllBufferRelatedPopups();
+void CloseAllBufferRelatedDialogs();
 
 /// Ensures info in visible popups are always correct.
-void updateAllVisibleBufferRelatedPopups();
+void updateAllVisibleBufferRelatedDialogs(bool switched = false);
+
+/* These shortcut extractors should be shifted to frontends/xforms/ eventually */
 
 /// Extract shortcut from <ident>|<shortcut> string
-const char* flyx_shortcut_extract(const char*sc);
-/// Make a shortnamed version of the above func
+char const * flyx_shortcut_extract(char const * sc);
+/// Shortcut for flyx_shortcut_extract
 #define scex flyx_shortcut_extract
 
 /// Extract shortcut from <ident>|<shortcut> string
-const char* flyx_ident_extract(const char *sc);
-/// Make a shortnamed versjon of the above func
+char const * flyx_ident_extract(char const * sc);
+/// Shortcut for flyx_ident_extract
 #define idex flyx_ident_extract
 
 /// Show message
-void WriteAlert(string const & s1, string const & s2=string(), 
-		string const & s3=string());
+void WriteAlert(string const & s1, string const & s2 = string(), 
+		string const & s3 = string());
 
 /// Alarms user of something related to files
-void WriteFSAlert(string const & s1, string const & s2=string());
+void WriteFSAlert(string const & s1, string const & s2 = string());
 
 /// Asks "Yes" or "No". Returns true for yes, false for no
-bool AskQuestion(string const & s1, string const & s2=string(),
-		 string const & s3=string());
+bool AskQuestion(string const & s1, string const & s2 = string(),
+		 string const & s3 = string(), bool default_value = true);
 
 /// Asks "Yes", "No" or "Cancel". Returns 1 for yes, 2 for no, 3 for cancel
-int AskConfirmation(string const & s1, string const & s2=string(), 
-		    string const & s3=string());
+int AskConfirmation(string const & s1, string const & s2 = string(), 
+		    string const & s3 = string(), int default_value = 1);
 
-/// 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> const
+askForText(string const & msg,
+	   string const & dflt = string());
 
 /// Informs the user that changes in the coming form will be ignored
-void WarnReadonly();
-
-// inlined functions
-/// 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
-}
+void WarnReadonly(string const & file);
+
+/// Get the dpi setting of the current screen
+float getScreenDPI();
 
 #endif