fix some dispatch calls

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

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index da02d8a2fb63daff8f32517f02f077fcaa3d6be5..6362e88c7925c08f0ab484079e742be1847f971a 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -601,7 +601,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
                        owner_->getLyXFunc()->dispatch(LFUN_PASTE);
                else
                        owner_->getLyXFunc()->dispatch(LFUN_PASTESELECTION,
-                                                      "paragraph");
+                                                      string("paragraph"));
                selection_possible = false;
                return;
        }
@@ -3240,7 +3240,7 @@ void BufferView::Pimpl::smartQuote()
 
        if (style->pass_thru ||
                (!insertInset(new InsetQuotes(c, bv_->buffer()->params))))
-               bv_->owner()->getLyXFunc()->dispatch(LFUN_SELFINSERT, "\"");
+               bv_->owner()->getLyXFunc()->dispatch(LFUN_SELFINSERT, string("\""));
 }
 
 

diff --git a/src/ChangeLog b/src/ChangeLog
index bc8207dc140936254ecaa8674c9a9e6ea1c6dbdf..bf8c6b26aa605b6f3936b2e4d185096ed04d3b31 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-19  John Levon  <moz@compsoc.man.ac.uk>
+
+       * BufferView_pimpl.C:
+       * LaTeX.C: fix dispatch calls
+ 
 2002-07-19  Dekel Tsur  <dekelts@tau.ac.il>
 
        * text.C (drawChars): Fix Arabic text rendering.

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 830834ebd697f46891f0d36d9bbe144febcb6abb..664486e801187ce649ce55d8b12fc7cc34244a19 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -197,7 +197,8 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
        if (lfun) {
                ostringstream str;
                str << _("LaTeX run number") << ' ' << count;
-               lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+               // check lyxstring string stream and gcc 3.1 before fixing
+               lfun->dispatch(LFUN_MESSAGE, string(str.str().c_str()));
        }
 
        this->operator()();
@@ -233,7 +234,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                // no checks for now
                lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
                if (lfun) {
-                       lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
+                       lfun->dispatch(LFUN_MESSAGE, string(_("Running MakeIndex.")));
                }
 
                rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
@@ -248,7 +249,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                // no checks for now
                lyxerr[Debug::LATEX] << "Running BibTeX." << endl;
                if (lfun) {
-                       lfun->dispatch(LFUN_MESSAGE, _("Running BibTeX."));
+                       lfun->dispatch(LFUN_MESSAGE, string(_("Running BibTeX.")));
                }
 
                updateBibtexDependencies(head, bibtex_info);
@@ -282,7 +283,8 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                if (lfun) {
                        ostringstream str;
                        str << _("LaTeX run number") << ' ' << count;
-                       lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+                       // check lyxstring string stream and gcc 3.1 before fixing
+                       lfun->dispatch(LFUN_MESSAGE, string(str.str().c_str()));
                }
 
                this->operator()();
@@ -312,7 +314,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                // no checks for now
                lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
                if (lfun) {
-                       lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
+                       lfun->dispatch(LFUN_MESSAGE, string(_("Running MakeIndex.")));
                }
 
                rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
@@ -338,7 +340,8 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                if (lfun) {
                        ostringstream str;
                        str << _("LaTeX run number") << ' ' << count;
-                       lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+                       // check lyxstring string stream and gcc 3.1 before fixing
+                       lfun->dispatch(LFUN_MESSAGE, string(str.str().c_str()));
                }
 
                this->operator()();

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 985c6246e3c39a688c12dd2821c86806e2df6d6d..cb9d00401bff54b5417a573c7a85af0c443cc2a5 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-19  John Levon  <moz@compsoc.man.ac.uk>
+
+       * ControlRef.C: fix dispatch call
+ 
 2002-07-17  John Levon  <moz@compsoc.man.ac.uk>
 
        * ControlCharacter.C: use view_state_changed not setState

diff --git a/src/frontends/controllers/ControlRef.C b/src/frontends/controllers/ControlRef.C
index 98e6cbc7953ddfb269582ca42c1b7333be68dfcc..6c0f6a604b41fae6aff6f55a668b272645e07f29 100644 (file)
--- a/src/frontends/controllers/ControlRef.C
+++ b/src/frontends/controllers/ControlRef.C
@@ -44,14 +44,14 @@ vector<string> const ControlRef::getLabelList(string const & name) const
 
 void ControlRef::gotoRef(string const & ref) const
 {
-       lv_.getLyXFunc()->dispatch(LFUN_BOOKMARK_SAVE, "0");
+       lv_.getLyXFunc()->dispatch(LFUN_BOOKMARK_SAVE, string("0"));
        lv_.getLyXFunc()->dispatch(LFUN_REF_GOTO, ref);
 }
 
 
 void ControlRef::gotoBookmark() const
 {
-       lv_.getLyXFunc()->dispatch(LFUN_BOOKMARK_GOTO, "0");
+       lv_.getLyXFunc()->dispatch(LFUN_BOOKMARK_GOTO, string("0"));
 }
 
 

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 425b91cc78b42c1037552ff6e96704cab0b2f77a..10645e7831586925b1a3f2895e401bf760beb168 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-19  John Levon  <moz@compsoc.man.ac.uk>
+
+       * FormMathsDelim.C: 
+       * FormMathsMatrix.C: fix dispatch calls
+ 
 2002-07-18  John Levon  <moz@compsoc.man.ac.uk>
 
        * Menubar_pimpl.C: 

diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C
index 81e86ed08413b3621f0c313cf45cf8981475dd23..6908337cd3b73b0ae4c30d9a36b9c2e63fb8a17c 100644 (file)
--- a/src/frontends/xforms/FormMathsDelim.C
+++ b/src/frontends/xforms/FormMathsDelim.C
@@ -91,7 +91,8 @@ void FormMathsDelim::apply()
        ostringstream ost;
        ost << delim_values[left] << ' ' << delim_values[right];
 
-       lv_->getLyXFunc()->dispatch(LFUN_MATH_DELIM, ost.str().c_str());
+       // the unusual formulation here is necessary for lyxstring stringstream 
+       lv_->getLyXFunc()->dispatch(LFUN_MATH_DELIM, string(ost.str().c_str()));
 }
 
 bool FormMathsDelim::input(FL_OBJECT *, long)

diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index c6d0fd46749cf4607c05800a96d7e9b6f5b5162b..05c9b9246621fdd0924b8cfef31b78e43ae88ad5 100644 (file)
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -99,7 +99,8 @@ void FormMathsMatrix::apply()
        ostringstream ost;
        ost << nx << ' ' << ny << ' ' << c << ' ' << sh;
 
-       lv_->getLyXFunc()->dispatch(LFUN_INSERT_MATRIX, ost.str().c_str());
+       // remeber gcc 3.1 and lyxstring stringstream before "fixing"
+       lv_->getLyXFunc()->dispatch(LFUN_INSERT_MATRIX, string(ost.str().c_str()));
 }
 
 bool FormMathsMatrix::input(FL_OBJECT * ob, long)