The bell is dead

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1344 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index c0108b9ed6852f0d9a502ce2f3b39849dab49ce5..4b67542186f651888cd5bc6e8d4716f9a34e6b8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-15  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * INSTALL (Problems): add tip about using --with-included-string
+       on solaris 2.6 with gcc 2.95.2 (ld does not like long symbol
+       names). 
+
 2001-01-12  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * ChangeLog: store old and begin new

diff --git a/INSTALL b/INSTALL
index ad7aeb2d7a4509f877a9f4c79ac99b93cab70963..b316df938577784cf3e777e3921147c876e884e8 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -317,7 +317,8 @@ notify us.
 
   o On Tru64 Unix, you may have to compile with
     --with-included-string to work around a Tru64 linker limitation
-    (the STL string template creates names which may be too long).
+    (the STL string template creates names which may be too long). We
+    also had reports that it helps with gcc 2.95.2 on solaris 2.6. 
 
   o On Tru64 Unix with cxx, you may have a compilation error in
     lyx_main.C if you have GNU gettext installed. This is due to a bug

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 734d7c1fbd911b1ec1dc030b55a3184a49f3f389..24258b3dfa7cf1e260aceae5930f32d4470e40a6 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -644,11 +644,9 @@ void BufferView::gotoInset(std::vector<Inset::Code> const & codes,
                                if (!text->GotoNextInset(this, codes, contents)) {
                                        text->cursor = tmp;
                                        owner()->getMiniBuffer()->Set(_("No more insets"));
-                                       LyXBell();
                                }
                        } else {
                                owner()->getMiniBuffer()->Set(_("No more insets"));
-                               LyXBell();
                        }
        }
        update(BufferView::SELECT|BufferView::FITCUR);

diff --git a/src/ChangeLog b/src/ChangeLog
index e73f5b1ccb40686d2d44e71d0c32c898dd190e8b..542768129e8a9f79738934e123051bb671922f0b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2000-01-17  John Levon  <moz@compsoc.man.ac.uk>
+
+       * BufferView2.C:
+       * lyx_gui_misc.h:
+       * lyxfr1.C:
+       * lyxfunc.C: kill LyXBell.
+
 2001-01-17  Dekel Tsur  <dekelts@tau.ac.il>
 
        * WorkArea.C (work_area_handler): Decrease keyboard purge thershold.

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0506c89cebf889acba20a85d9b7149bd2bcaad35 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -0,0 +1,3 @@
+2001-01-17  John Levon  <moz@compsoc.man.ac.uk>
+
+       * insettext.C: kill LyXBell.

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index a1f98b51634c6bc2a35215c4e8b531167776bfec..8dadb19924160b42eabb865d6f2a91cb1cc5caaf 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -783,7 +783,6 @@ InsetText::LocalDispatch(BufferView * bv,
        // Normal chars
     case LFUN_UNKNOWN_ACTION:
        if (bv->buffer()->isReadonly()) {
-           LyXBell();
 //         setErrorMessage(N_("Document is read only"));
            break;
        }

diff --git a/src/lyx_gui_misc.h b/src/lyx_gui_misc.h
index e12fff1b61af4ae4c72ae0b8978f68e26e8aef04..02df389a00d8980beffa01b65359ac0459fe3c41 100644 (file)
--- a/src/lyx_gui_misc.h
+++ b/src/lyx_gui_misc.h
@@ -78,11 +78,4 @@ void WarnReadonly(string const & file);
 /// Get the dpi setting of the current screen
 float getScreenDPI();
 
-/// rings the audio bell.
-inline
-void LyXBell() {
-       // if (audio()) ON/OFF switch yet to be implemented
-       //fl_ringbell(20);
-}
-
 #endif

diff --git a/src/lyxfr1.C b/src/lyxfr1.C
index 76a99e9cca994d5f5eee732329c6b65c132c7e04..20734ff10c82aa90dc7841d20ba5b65ca90051e0 100644 (file)
--- a/src/lyxfr1.C
+++ b/src/lyxfr1.C
@@ -187,7 +187,6 @@ void LyXFindReplace::SearchReplaceAllCB()
                }
        } while (SearchCB(true));
        if (replace_count == 0) {
-               LyXBell();      
                bv->owner()->getMiniBuffer()->Set(
                        _("String not found!"));
        } else {
@@ -235,7 +234,6 @@ bool LyXFindReplace::SearchCB(bool fForward)
                bv->owner()->getMiniBuffer()->Set(_("Found."));
                result = true;
        } else {
-               LyXBell();
                bv->owner()->getMiniBuffer()->Set(_("String not found!"));
                result = false;
        }

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 0d97f80e2011e30d73d3c15572686c5ea3150980..3f9461e6ecb7c8fbee0296e17924983abd35311c 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -252,7 +252,6 @@ int LyXFunc::processKeySym(KeySym keysym, unsigned int state)
        if (action == -1) {
                if (keyseq.length < -1) { // unknown key sequence...
                        string buf;
-                       LyXBell();
                        keyseq.print(buf);
                        owner->getMiniBuffer()->Set(_("Unknown sequence:"), buf);
                        return 0;
@@ -711,8 +710,7 @@ string const LyXFunc::Dispatch(int ac,
                        // set the new selection 
                        // SetSelectionOverLenChars(owner->view()->currentBuffer()->text, iLenSelected);
                        owner->view()->toggleSelection(false);
-               } else 
-                       LyXBell();      
+               }
         
                // REMOVED : if (owner->view()->getWorkArea()->focus)
                owner->view()->showCursor();
@@ -2915,7 +2913,6 @@ string const LyXFunc::Dispatch(int ac,
                string lyx_name;
                string const x11_name = split(argument, lyx_name, ' ');
                if (lyx_name.empty() || x11_name.empty()) {
-                       LyXBell();
                        setErrorMessage(N_("Syntax: set-color <lyx_name>"
                                                " <x11_name>"));
                        break;
@@ -2926,7 +2923,6 @@ string const LyXFunc::Dispatch(int ac,
                        static string const err2 (
                                N_("\" failed - color is undefined "
                                   "or may not be redefined"));
-                       LyXBell();
                        setErrorMessage(_(err1) + lyx_name + _(err2));
                        break;
                }
@@ -2938,13 +2934,11 @@ string const LyXFunc::Dispatch(int ac,
        case LFUN_UNKNOWN_ACTION:
        {
                if (!owner->buffer()) {
-                       LyXBell();
                        setErrorMessage(N_("No document open"));
                        break;
                }
 
                if (owner->buffer()->isReadonly()) {
-                       LyXBell();
                        setErrorMessage(N_("Document is read only"));
                        break;
                }
@@ -2999,7 +2993,6 @@ string const LyXFunc::Dispatch(int ac,
                        // why is an "Unknown action" with empty
                        // argument even dispatched in the first
                        // place? I`ll probably change that. (Lgb)
-                       LyXBell();
                        setErrorMessage(N_("Unknown action"));
                }
                break;