reformatting and remove using delc

[lyx.git] / src / lyx_gui_misc.h

diff --git a/src/lyx_gui_misc.h b/src/lyx_gui_misc.h
index 9a3bc65d89b5353f30b7017aacd585a712903567..02df389a00d8980beffa01b65359ac0459fe3c41 100644 (file)
--- a/src/lyx_gui_misc.h
+++ b/src/lyx_gui_misc.h
@@ -14,32 +14,44 @@
 #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;
+
+class MiniBuffer;
 
 /// 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
 char const * flyx_shortcut_extract(char const * sc);
-/// Make a shortnamed version of the above func
+/// Shortcut for flyx_shortcut_extract
 #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
+/// Shortcut for flyx_ident_extract
 #define idex flyx_ident_extract
 
+/// Show status message
+void WriteStatus(MiniBuffer * minib, string const & s);
+
 /// Show message
 void WriteAlert(string const & s1, string const & s2 = string(), 
                string const & s3 = string());
@@ -49,25 +61,21 @@ 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());
+                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());
+                   string const & s3 = string(), int default_value = 1);
 
 /// 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> const
+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);
-}
+/// Get the dpi setting of the current screen
+float getScreenDPI();
 
 #endif