Remove unused font variable which caused a warning.

[lyx.git] / src / figureForm.C

diff --git a/src/figureForm.C b/src/figureForm.C
index f51a9209d4885134712ffd617494cba075109a90..e572f3135110334e3d49d6e224f1665cbb37d72e 100644 (file)
--- a/src/figureForm.C
+++ b/src/figureForm.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich,
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -22,7 +22,7 @@
 #include "BufferView.h"
 #include "lyxtext.h"
 #include "LyXView.h"
-#include "lyxfunc.h"
+#include "undo_funcs.h"
 #include "gettext.h"
 
 extern FD_form_figure * fd_form_figure;
@@ -51,16 +51,12 @@ void FigureApplyCB(FL_OBJECT *, long)
        if (buffer->isReadonly()) // paranoia
                return;
 
-       current_view->owner()->getLyXFunc()
-               ->Dispatch(LFUN_MESSAGE,
-                          _("Inserting figure..."));
+       current_view->owner()->message(_("Inserting figure..."));
        if (fl_get_button(fd_form_figure->radio_inline)) {
                InsetFig * new_inset = new InsetFig(100, 20, *buffer);
                current_view->insertInset(new_inset);
-               current_view->owner()->getLyXFunc()
-                       ->Dispatch(LFUN_MESSAGE,
-                                  _("Figure inserted"));
-               new_inset->Edit(current_view, 0, 0, 0);
+               current_view->owner()->message(_("Figure inserted"));
+               new_inset->edit(current_view, 0, 0, 0);
                return;
        }
        
@@ -68,32 +64,24 @@ void FigureApplyCB(FL_OBJECT *, long)
        current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR);
        current_view->beforeChange(current_view->text);
       
-       current_view->text->SetCursorParUndo(current_view->buffer()); 
-       current_view->text->FreezeUndo();
+       setCursorParUndo(current_view); 
+       freezeUndo();
 
-       current_view->text->BreakParagraph(current_view);
+       current_view->text->breakParagraph(current_view);
        current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 
-#ifndef NEW_INSETS
-       if (current_view->text->cursor.par()->Last()) {
-#else
        if (current_view->text->cursor.par()->size()) {
-#endif
-               current_view->text->CursorLeft(current_view);
+               current_view->text->cursorLeft(current_view);
         
-               current_view->text->BreakParagraph(current_view);
+               current_view->text->breakParagraph(current_view);
                current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
        }
 
        // The standard layout should always be numer 0;
-       current_view->text->SetLayout(current_view, 0);
+       current_view->text->setLayout(current_view, 0);
 
-#ifndef NEW_INSETS
-       if (current_view->text->cursor.par()->footnoteflag == 
-           LyXParagraph::NO_FOOTNOTE) {
-#endif
                current_view->text->
-                       SetParagraph(current_view, 0, 0,
+                       setParagraph(current_view, 0, 0,
                                     0, 0,
                                     VSpace (0.3 * buffer->params.spacing.getValue(),
                                             LyXLength::CM),
@@ -101,27 +89,15 @@ void FigureApplyCB(FL_OBJECT *, long)
                                             buffer->params.spacing.getValue(),
                                             LyXLength::CM),
                                     LYX_ALIGN_CENTER, string(), 0);
-#ifndef NEW_INSETS
-       } else {
-               current_view->text->SetParagraph(current_view, 0, 0,
-                                                0, 0,
-                                                VSpace(VSpace::NONE),
-                                                VSpace(VSpace::NONE),
-                                                LYX_ALIGN_CENTER, 
-                                                string(),
-                                                0);
-       }
-#endif
        
        current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
       
        Inset * new_inset = new InsetFig(100, 100, *buffer);
        current_view->insertInset(new_inset);
-       new_inset->Edit(current_view, 0, 0, 0);
+       new_inset->edit(current_view, 0, 0, 0);
        current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR);
-       current_view->owner()->getLyXFunc()->Dispatch(LFUN_MESSAGE,
-                                                     _("Figure inserted"));
-       current_view->text->UnFreezeUndo();
+       current_view->owner()->message(_("Figure inserted"));
+       unFreezeUndo();
        current_view->setState();
 }