X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetparent.C;h=7d79793adaae26389578dc78e9010bbae01220ad;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=fb06667f8ff868fe177b33fa763b7f8ddd0e7552;hpb=a9b448a027036c65c40b372bd19e02f243d1f1ab;p=lyx.git

diff --git a/src/insets/insetparent.C b/src/insets/insetparent.C
index fb06667f8f..7d79793ada 100644
--- a/src/insets/insetparent.C
+++ b/src/insets/insetparent.C
@@ -3,7 +3,7 @@
  *
  *           LyX, The Document Processor
  * 	 
- *           Copyright (C) 1997-1999 LyX Team
+ *           Copyright 1997-2001 The LyX Team.
  * 
  * ====================================================== */
 
@@ -21,42 +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(InsetCommandParams const & p, Buffer const & bf, bool)
+	: InsetCommand(p)
+{
+	string const fn = p.getContents();
+	setContents(MakeAbsPath(fn, bf.filePath()));
+}
 
 
-InsetParent::InsetParent(string const & fn, Buffer * owner)
-	: InsetCommand("lyxparent")
+string const InsetParent::getScreenLabel(Buffer const *) const 
 {
-	if (owner)
-		setContents(MakeAbsPath(fn, OnlyPath(owner->fileName())));
-	else
-		setContents(fn);
+	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());
 }
 
 
-// LaTeX must just ignore this command
-int InsetParent::Latex(ostream & os, signed char fragile) const
+void InsetParent::edit(BufferView * bv, bool)
 {
-	os << "%%#{lyx}";
-	InsetCommand::Latex(os, fragile);
-	return 0;
+	edit(bv, 0, 0, 0);
 }
 
 
-#ifndef USE_OSTREAM_ONLY
 // LaTeX must just ignore this command
-int InsetParent::Latex(string & file, signed char fragile) const
+int InsetParent::latex(Buffer const * buf, ostream & os,
+		       bool fragile, bool free_spc) const
 {
-	file += "%%#{lyx}";
-	InsetCommand::Latex(file, fragile);
+	os << "%%#{lyx}";
+	InsetCommand::latex(buf, os, fragile, free_spc);
 	return 0;
 }
-#endif