fix some dispatch calls

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4712 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-07-19 17:15:56 +00:00
parent fb05e0df72
commit 1d0eda5d02
8 changed files with 31 additions and 12 deletions

View File

@ -601,7 +601,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
owner_->getLyXFunc()->dispatch(LFUN_PASTE); owner_->getLyXFunc()->dispatch(LFUN_PASTE);
else else
owner_->getLyXFunc()->dispatch(LFUN_PASTESELECTION, owner_->getLyXFunc()->dispatch(LFUN_PASTESELECTION,
"paragraph"); string("paragraph"));
selection_possible = false; selection_possible = false;
return; return;
} }
@ -3240,7 +3240,7 @@ void BufferView::Pimpl::smartQuote()
if (style->pass_thru || if (style->pass_thru ||
(!insertInset(new InsetQuotes(c, bv_->buffer()->params)))) (!insertInset(new InsetQuotes(c, bv_->buffer()->params))))
bv_->owner()->getLyXFunc()->dispatch(LFUN_SELFINSERT, "\""); bv_->owner()->getLyXFunc()->dispatch(LFUN_SELFINSERT, string("\""));
} }

View File

@ -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> 2002-07-19 Dekel Tsur <dekelts@tau.ac.il>
* text.C (drawChars): Fix Arabic text rendering. * text.C (drawChars): Fix Arabic text rendering.

View File

@ -197,7 +197,8 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
if (lfun) { if (lfun) {
ostringstream str; ostringstream str;
str << _("LaTeX run number") << ' ' << count; 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()(); this->operator()();
@ -233,7 +234,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
// no checks for now // no checks for now
lyxerr[Debug::LATEX] << "Running MakeIndex." << endl; lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
if (lfun) { if (lfun) {
lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex.")); lfun->dispatch(LFUN_MESSAGE, string(_("Running MakeIndex.")));
} }
rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx"))); rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
@ -248,7 +249,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
// no checks for now // no checks for now
lyxerr[Debug::LATEX] << "Running BibTeX." << endl; lyxerr[Debug::LATEX] << "Running BibTeX." << endl;
if (lfun) { if (lfun) {
lfun->dispatch(LFUN_MESSAGE, _("Running BibTeX.")); lfun->dispatch(LFUN_MESSAGE, string(_("Running BibTeX.")));
} }
updateBibtexDependencies(head, bibtex_info); updateBibtexDependencies(head, bibtex_info);
@ -282,7 +283,8 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
if (lfun) { if (lfun) {
ostringstream str; ostringstream str;
str << _("LaTeX run number") << ' ' << count; 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()(); this->operator()();
@ -312,7 +314,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
// no checks for now // no checks for now
lyxerr[Debug::LATEX] << "Running MakeIndex." << endl; lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
if (lfun) { if (lfun) {
lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex.")); lfun->dispatch(LFUN_MESSAGE, string(_("Running MakeIndex.")));
} }
rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx"))); rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
@ -338,7 +340,8 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
if (lfun) { if (lfun) {
ostringstream str; ostringstream str;
str << _("LaTeX run number") << ' ' << count; 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()(); this->operator()();

View File

@ -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> 2002-07-17 John Levon <moz@compsoc.man.ac.uk>
* ControlCharacter.C: use view_state_changed not setState * ControlCharacter.C: use view_state_changed not setState

View File

@ -44,14 +44,14 @@ vector<string> const ControlRef::getLabelList(string const & name) const
void ControlRef::gotoRef(string const & ref) 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); lv_.getLyXFunc()->dispatch(LFUN_REF_GOTO, ref);
} }
void ControlRef::gotoBookmark() const void ControlRef::gotoBookmark() const
{ {
lv_.getLyXFunc()->dispatch(LFUN_BOOKMARK_GOTO, "0"); lv_.getLyXFunc()->dispatch(LFUN_BOOKMARK_GOTO, string("0"));
} }

View File

@ -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> 2002-07-18 John Levon <moz@compsoc.man.ac.uk>
* Menubar_pimpl.C: * Menubar_pimpl.C:

View File

@ -91,7 +91,8 @@ void FormMathsDelim::apply()
ostringstream ost; ostringstream ost;
ost << delim_values[left] << ' ' << delim_values[right]; 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) bool FormMathsDelim::input(FL_OBJECT *, long)

View File

@ -99,7 +99,8 @@ void FormMathsMatrix::apply()
ostringstream ost; ostringstream ost;
ost << nx << ' ' << ny << ' ' << c << ' ' << sh; 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) bool FormMathsMatrix::input(FL_OBJECT * ob, long)