X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetparent.C;h=7d79793adaae26389578dc78e9010bbae01220ad;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=14efd2a5a6daefd724b9c73da083c2911f06230f;hpb=76938908d7da15b92bad3908e71eb969c9449c0e;p=lyx.git diff --git a/src/insets/insetparent.C b/src/insets/insetparent.C index 14efd2a5a6..7d79793ada 100644 --- a/src/insets/insetparent.C +++ b/src/insets/insetparent.C @@ -3,7 +3,7 @@ * * LyX, The Document Processor * - * Copyright 1997-2000 The LyX Team. + * Copyright 1997-2001 The LyX Team. * * ====================================================== */ @@ -21,40 +21,47 @@ #include "support/filetools.h" #include "BufferView.h" #include "LyXView.h" -#include "lyxfunc.h" +#include "support/LOstream.h" #include "commandtags.h" #include "buffer.h" +#include "gettext.h" +#include "lyxfunc.h" using std::ostream; -InsetParent::InsetParent(string const & fn, Buffer * owner) - : InsetCommand("lyxparent") + +InsetParent::InsetParent(InsetCommandParams const & p, Buffer const & bf, bool) + : InsetCommand(p) { - if (owner) - setContents(MakeAbsPath(fn, OnlyPath(owner->fileName()))); - else - setContents(fn); + string const fn = p.getContents(); + setContents(MakeAbsPath(fn, bf.filePath())); } -string InsetParent::getScreenLabel() const +string const InsetParent::getScreenLabel(Buffer const *) const { return string(_("Parent:")) + getContents(); } -void InsetParent::Edit(BufferView * bv, int, int, unsigned int) +void InsetParent::edit(BufferView * bv, int, int, unsigned int) { bv->owner()->getLyXFunc()-> - Dispatch(LFUN_CHILDOPEN, getContents().c_str()); + dispatch(LFUN_CHILDOPEN, getContents()); +} + + +void InsetParent::edit(BufferView * bv, bool) +{ + edit(bv, 0, 0, 0); } // LaTeX must just ignore this command -int InsetParent::Latex(ostream & os, - signed char fragile, bool free_spc) const +int InsetParent::latex(Buffer const * buf, ostream & os, + bool fragile, bool free_spc) const { os << "%%#{lyx}"; - InsetCommand::Latex(os, fragile, free_spc); + InsetCommand::latex(buf, os, fragile, free_spc); return 0; }