fix in formcharacter ; remove extra tabular duplication

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

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 300a18a53dbc3f31c72a0295744ef0fd59ab2ed8..336d2f748ec1f159a7c2ea9e3d0dc2227e8a1a9c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,7 +9,6 @@ src/converter.C
 src/CutAndPaste.C
 src/debug.C
 src/exporter.C
-src/ext_l10n.h
 src/figure_form.C
 src/figureForm.C
 src/FontLoader.C

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index bad6357d3758219e62308e17e0c0dbbe8014bb1f..859b463922200955b7a9e5fe4c98d2408fa6135a 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-22  John Levon  <moz@compsoc.man.ac.uk>
+
+       * FormCharacter.C:
+       * form_character.C:
+       * forms/form_character.fd: hide the widget underneath language
+         combox hack.
+
 2001-06-27  John Levon  <moz@compsoc.man.ac.uk>
 
        * FormPreferences.h:

diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C
index 8862c4c0a35a06d4ed1e59bb1081d4f9ec9b899c..6fdf1851d1b4be817796367bab7f38f02afbcf5a 100644 (file)
--- a/src/frontends/xforms/FormCharacter.C
+++ b/src/frontends/xforms/FormCharacter.C
@@ -87,7 +87,7 @@ void FormCharacter::build()
        // insert default language box manually
        fl_addto_form(dialog_->form);
                FL_OBJECT * ob = dialog_->choice_language;
-               fl_deactivate_object(dialog_->choice_language);
+               fl_hide_object(dialog_->choice_language);
 
                combo_language2_.reset(new Combox(FL_COMBOX_DROPLIST));
                combo_language2_->add(ob->x, ob->y, ob->w, ob->h, 250);

diff --git a/src/frontends/xforms/form_character.C b/src/frontends/xforms/form_character.C
index 079f35e2c56a0003b35ec73165a870b5c01d8979..b620ce683d9875db3d767baa3238211159894f64 100644 (file)
--- a/src/frontends/xforms/form_character.C
+++ b/src/frontends/xforms/form_character.C
@@ -125,6 +125,9 @@ FD_form_character * FormCharacter::build_character()
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 325, 280, 45, _("These are always toggled"));
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
     fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
+  obj = fl_add_text(FL_NORMAL_TEXT, 25, 170, 70, 40, _("Language:"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
   fl_end_form();
 
   fdui->form->fdui = fdui;

diff --git a/src/frontends/xforms/forms/form_character.fd b/src/frontends/xforms/forms/form_character.fd
index fbc4bc394c661d1fa6056968216c8e3ebf403e22..468d1ea57e509a9ad154ad249546b68daa0f0a01 100644 (file)
--- a/src/frontends/xforms/forms/form_character.fd
+++ b/src/frontends/xforms/forms/form_character.fd
@@ -11,7 +11,7 @@ SnapGrid: 5
 Name: form_character
 Width: 300
 Height: 415
-Number of Objects: 14
+Number of Objects: 15
 
 --------------------
 class: FL_BOX
@@ -265,5 +265,23 @@ name:
 callback: 
 argument: 
 
+--------------------
+class: FL_TEXT
+type: NORMAL_TEXT
+box: 25 170 70 40
+boxtype: FL_FLAT_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Language:
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
 ==============================
 create_the_forms

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index cfea1872f75103b662a195bc1ef999a6d60fba9a..da16752172e604352db4872ef17815efa8f5ae92 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-29  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * insettabular.C (clone): do not copy the LyXTabular twice
+
 2001-06-29  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * insettext.h (TEXT): delete method

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index e74786dcf9dd8a38464beb299981ee7e66bdde23..d79dfc531e2f3be1ab7bcc8415ad963b75392ee5 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -159,9 +159,7 @@ InsetTabular::~InsetTabular()
 
 Inset * InsetTabular::clone(Buffer const & buf) const
 {
-       InsetTabular * t = new InsetTabular(*this, buf);
-       t->tabular.reset(tabular->clone(t));
-       return t;
+       return new InsetTabular(*this, buf);
 }