Create a grfx::Loader class and so move large chunks of code out of

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 7d52cadc5d5f7f2f9f615ba98439adab4f16e225..6548ea1edb4e9b619eb375f0e5a1e4a71e7369b6 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -28,7 +28,6 @@
 
 #include "frontends/Alert.h"
 #include "frontends/FileDialog.h"
-#include "frontends/GUIRunTime.h"
 
 #include "support/FileInfo.h"
 #include "support/filetools.h"
@@ -81,9 +80,6 @@ void ShowMessage(Buffer const * buf,
 // should be moved to lyxfunc.C
 bool MenuWrite(BufferView * bv, Buffer * buffer)
 {
-       // FIXME: needed ?
-       XFlush(GUIRunTime::x11Display());
-
        if (!buffer->save()) {
                if (Alert::askQuestion(_("Save failed. Rename and try again?"),
                                MakeDisplayPath(buffer->fileName(), 50),
@@ -437,13 +433,12 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
        bv->owner()->prohibitInput();
        if (label.empty()) {
                Paragraph * par = bv->getLyXText()->cursor.par();
-               LyXTextClass const & tclass =
-                       textclasslist[bv->buffer()->params.textclass];
-               LyXLayout const * layout = &tclass[par->layout()];
-
+               LyXLayout_ptr layout = par->layout();
                if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
                        Paragraph * par2 = par->previous();
-                       LyXLayout const * layout2 = &tclass[par2->layout()];
+
+                       LyXLayout_ptr const & layout2 = par2->layout();
+
                        if (layout2->latextype != LATEX_PARAGRAPH) {
                                par = par2;
                                layout = layout2;