two small fixes from John

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2316 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index c5f44a7e40856d0fb4b40f2d6d29280462086e1e..f16bf18ff5bcc285c2d13fd039d57f2e3657d442 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-23  John Levon  <moz@compsoc.man.ac.uk>
+
+       * FormCharacter.C: disable resizing as it doesn't work
+
+       * FormPreamble.C: allow to copy-paste from RO preamble by
+         enabling editing.
+
 2001-07-20  Jürgen Spitzmüller  <juergen.sp@t-online.de>
 
        * forms/form_citation.fd: resized form to fit on a 800x600 screen.

diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C
index 6fdf1851d1b4be817796367bab7f38f02afbcf5a..3b5765ae7a2966ba06e0fe52fcf07386a5ee3a61 100644 (file)
--- a/src/frontends/xforms/FormCharacter.C
+++ b/src/frontends/xforms/FormCharacter.C
@@ -45,6 +45,8 @@ void FormCharacter::build()
 {
        dialog_.reset(build_character());
 
+       fl_set_form_maxsize(dialog_->form, minw_, minh_);
+ 
        vector<FamilyPair> const family = getFamilyData();
        vector<SeriesPair> const series = getSeriesData();
        vector<ShapePair>  const shape  = getShapeData();

diff --git a/src/frontends/xforms/FormPreamble.C b/src/frontends/xforms/FormPreamble.C
index 6e9a13b679ef39456381d1e5e617d18b76cc3f0f..eed32d8163b276d9a68bce7aa084f4effa6bfddd 100644 (file)
--- a/src/frontends/xforms/FormPreamble.C
+++ b/src/frontends/xforms/FormPreamble.C
@@ -35,7 +35,6 @@ void FormPreamble::build()
        bc().setOK(dialog_->button_ok);
        bc().setApply(dialog_->button_apply);
        bc().setCancel(dialog_->button_cancel);
-       bc().addReadOnly(dialog_->input_preamble);
 }
 
 
@@ -48,11 +47,4 @@ void FormPreamble::apply()
 void FormPreamble::update()
 {
        fl_set_input(dialog_->input_preamble, controller().params().c_str());
-
-       bool const enable = (!controller().isReadonly());
-       setEnabled(dialog_->input_preamble, enable);
-       setEnabled(dialog_->button_ok,      enable);
-       setEnabled(dialog_->button_apply,   enable);
 }
-
-