X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=1306b2bddf820c18679e0b00ff5d432af49597ff;hb=00d24ec87650e4ac7db77ad54cb4aa2f688100f3;hp=8390461d15083d16a52c1173f6e8fe6ce712a7d7;hpb=85a5ea7bfc80e179a61a99f2955455e84d3384cc;p=lyx.git

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 8390461d15..1306b2bddf 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -15,23 +15,25 @@
 #include <utility> 
 #include <iostream>
 
-#include FORMS_H_LOCATION
-
 #include "lyx_cb.h"
 #include "lyx_gui_misc.h"
 #include "lyx_main.h"
+#include "buffer.h"
 #include "bufferlist.h"
 #include "bufferview_funcs.h"
+#include "debug.h"
 #include "lastfiles.h"
 #include "LyXView.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
 #include "frontends/FileDialog.h"
+#include "frontends/GUIRunTime.h"
 #include "insets/insetlabel.h"
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/syscall.h"
+#include "support/lstrings.h"
 #include "gettext.h"
 #include "BufferView.h"
 
@@ -134,7 +136,7 @@ void ShowMessage(Buffer const * buf,
 bool MenuWrite(BufferView * bv, Buffer * buffer)
 {
 	// FIXME: needed ?
-	XFlush(fl_get_display());
+	XFlush(GUIRunTime::x11Display());
  
 	if (!buffer->save()) {
 		string const fname = buffer->fileName();
@@ -472,7 +474,7 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 void MenuInsertLabel(BufferView * bv, string const & arg)
 {
 	string label(arg);
-	ProhibitInput(bv);
+	bv->owner()->prohibitInput();
 	if (label.empty()) {
 		Paragraph * par = bv->text->cursor.par();
 		LyXLayout const * layout =
@@ -520,7 +522,7 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
 		InsetLabel * inset = new InsetLabel( p );
 		bv->insertInset( inset );
 	}
-	AllowInput(bv);
+	bv->owner()->allowInput();
 }