John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / lyx_gui_misc.h

diff --git a/src/lyx_gui_misc.h b/src/lyx_gui_misc.h
index 9a3bc65d89b5353f30b7017aacd585a712903567..661eb9c751391886a6805880c4c2d2b07a245269 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-2000 The LyX Team
+ *           Copyright 1995-2001 The LyX Team
  *
  * ====================================================== */
 
@@ -14,60 +14,24 @@
 #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 */
-using std::pair;
 
 /// 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 *);
+extern "C"
+int CancelCloseBoxCB(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();
-
-/// Extract shortcut from <ident>|<shortcut> string
-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
-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(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());
-
-/// Asks "Yes" or "No". Returns true for yes, false for no
-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(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());
-
-/// Informs the user that changes in the coming form will be ignored
-void WarnReadonly(string const & file);
-
-// inlined functions
-/// rings the audio bell.
-inline
-void LyXBell() {
-       // if (audio()) ON/OFF switch yet to be implemented
-       fl_ringbell(20);
-}
+void updateAllVisibleBufferRelatedDialogs(bool switched = false);
 
 #endif