diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index eb811a10c0..f7889c3ed7 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,9 @@ +2001-04-17 Lars Gullik Bjønnes + + * Liason.[Ch] (setMinibuffer): change second arg to string + + * Dialogs.h: inherit privately from noncopyable + 2001-04-03 John Levon * Dialogs.h: s/popup/dialog/ diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h index a183a20657..f26139f23d 100644 --- a/src/frontends/Dialogs.h +++ b/src/frontends/Dialogs.h @@ -50,7 +50,7 @@ class InsetMinipage; The list of dialog signals isn't comprehensive but should be a good guide for any future additions. Remember don't go overboard -- think minimal. */ -class Dialogs : public boost::noncopyable +class Dialogs : boost::noncopyable { public: /// diff --git a/src/frontends/Liason.C b/src/frontends/Liason.C index 5b66b8a94d..85172e3cfe 100644 --- a/src/frontends/Liason.C +++ b/src/frontends/Liason.C @@ -26,8 +26,8 @@ #include "support/path.h" #include "exporter.h" #include "converter.h" -#include "minibuffer.h" #include "support/syscall.h" +#include "lyxfunc.h" using std::endl; @@ -155,9 +155,11 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp) return res == 0; } -void setMinibuffer(LyXView * lv, char const * msg) + +void setMinibuffer(LyXView * lv, string const & msg) { - lv->getMiniBuffer()->Set(msg); + Assert(lv); + lv->message(msg); } } // namespace Liason diff --git a/src/frontends/Liason.h b/src/frontends/Liason.h index c40b4277ae..6a067d8227 100644 --- a/src/frontends/Liason.h +++ b/src/frontends/Liason.h @@ -30,6 +30,8 @@ #pragma interface #endif +#include "LString.h" + class PrinterParams; class Buffer; class LyXView; @@ -52,7 +54,7 @@ namespace Liason { /// print the current buffer bool printBuffer(Buffer *, PrinterParams const &); /// set the minibuffer - void setMinibuffer(LyXView *, char const * msg); + void setMinibuffer(LyXView *, string const & msg); //@} } // namespace Liason