fix crash with "save as"

[lyx.git] / src / frontends / xforms / FormTabularCreate.C

diff --git a/src/frontends/xforms/FormTabularCreate.C b/src/frontends/xforms/FormTabularCreate.C
index 3789fb21affe2dc1846db5c1dbac763768eb7fb9..629e204ca7871facd9fd58ab6d3e8f7361e70782 100644 (file)
--- a/src/frontends/xforms/FormTabularCreate.C
+++ b/src/frontends/xforms/FormTabularCreate.C
@@ -1,68 +1,41 @@
-// -*- C++ -*-
-/* This file is part of
- * ====================================================== 
+/**
+ * \file xforms/FormTabularCreate.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Jürgen Vigna
  *
- *           Copyright 2000 The LyX Team.
- *
- * ======================================================
- */
-/* FormTabularCreate.C
- * FormTabularCreate Interface Class Implementation
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
+#include <utility>
 
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
+#include "xformsBC.h"
+#include "ControlTabularCreate.h"
 #include "FormTabularCreate.h"
-#include "form_tabular_create.h"
-#include "BufferView.h"
-#include "Dialogs.h"
-#include "LyXView.h"
-#include "insets/insettabular.h"
+#include "forms/form_tabular_create.h"
+#include "support/lstrings.h"
+#include FORMS_H_LOCATION
 
-FormTabularCreate::FormTabularCreate(LyXView * lv, Dialogs * d)
-       : FormBaseBD(lv, d, _("Insert Tabular")),
-         dialog_(0)
-{
-       // let the dialog be shown
-       // This is a permanent connection so we won't bother
-       // storing a copy because we won't be disconnecting.
-       d->showTabularCreate.connect(slot(this, &FormTabularCreate::show));
-}
 
+using std::make_pair;
 
-FormTabularCreate::~FormTabularCreate()
-{
-       delete dialog_;
-}
 
+typedef FormCB<ControlTabularCreate, FormDB<FD_tabular_create> > base_class;
 
-FL_FORM * FormTabularCreate::form() const
-{
-       if (dialog_ ) return dialog_->form;
-       return 0;
-}
-
-
-void FormTabularCreate::connect()
-{
-       bc_.valid(true);
-       FormBaseBD::connect();
-}
+FormTabularCreate::FormTabularCreate()
+       : base_class(_("Insert Tabular"))
+{}
 
 
 void FormTabularCreate::build()
 {
-       dialog_ = build_tabular_create();
-
-       // Workaround dumb xforms sizing bug
-       minw_ = form()->w;
-       minh_ = form()->h;
+       dialog_.reset(build_tabular_create(this));
 
        fl_set_slider_bounds(dialog_->slider_rows, 1, 50);
        fl_set_slider_bounds(dialog_->slider_columns, 1, 50);
@@ -71,21 +44,17 @@ void FormTabularCreate::build()
        fl_set_slider_precision(dialog_->slider_rows, 0);
        fl_set_slider_precision(dialog_->slider_columns, 0);
 
-        // manage the ok, apply and cancel/close buttons
-       bc_.setOK(dialog_->button_ok);
-       bc_.setApply(dialog_->button_apply);
-       bc_.setCancel(dialog_->button_cancel);
-       bc_.refresh();
+       // Manage the ok, apply and cancel/close buttons
+       bc().setOK(dialog_->button_ok);
+       bc().setApply(dialog_->button_apply);
+       bc().setCancel(dialog_->button_close);
 }
 
 
 void FormTabularCreate::apply()
 {
-       int ysize = int(fl_get_slider_value(dialog_->slider_columns) + 0.5);
-       int xsize = int(fl_get_slider_value(dialog_->slider_rows) + 0.5);
+       unsigned int ysize = (unsigned int)(fl_get_slider_value(dialog_->slider_columns) + 0.5);
+       unsigned int xsize = (unsigned int)(fl_get_slider_value(dialog_->slider_rows) + 0.5);
 
-       InsetTabular * in = new InsetTabular( *lv_->buffer(), xsize, ysize );
-       if (!lv_->view()->open_new_inset(in)) {
-               delete in;
-       }
+       controller().params() = make_pair(xsize, ysize);
 }