comblang.patch

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

diff --git a/configure.in b/configure.in
index bf1eaedef8e1b79e3b53f76789e3088d26b668da..c72fa3962eedcb51e3680b352ed14667d091e5fc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl AM_CONFIG_HEADER(src/config.h)
 AC_CONFIG_AUX_DIR(config)
 
 PACKAGE=lyx${program_suffix}
-VERSION="1.2.0cvs"
+VERSION="1.3.0cvs"
 LYX_CHECK_VERSION
 
 AC_CANONICAL_SYSTEM

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 1d41361648764acacf8df8c61f352e1e60f55b3f..e78a677d4468c4785b127d2bffb8ab747a8fb468 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-15  John Levon  <moz@compsoc.man.ac.uk>
+
+       * FormCharacter.C: avoid mis-treating Combox as FL_OBJECT
+         (bug 406) (from Angus)
+ 
 2002-05-10  Dekel Tsur  <dekelts@tau.ac.il>
 
        * FormDocument.C (language_apply): Fix language changing.

diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C
index ecd8add69ac820ff21f624852ef2fa045ecd49a0..2c6c2ae28abadf12a52ce43e6e9250a60da53178 100644 (file)
--- a/src/frontends/xforms/FormCharacter.C
+++ b/src/frontends/xforms/FormCharacter.C
@@ -42,7 +42,9 @@ FormCharacter::FormCharacter(ControlCharacter & c)
 void FormCharacter::ComboInputCB(int, void * v, Combox * combox)
 {
        FormCharacter * pre = static_cast<FormCharacter*>(v);
-       pre->InputCB(reinterpret_cast<FL_OBJECT *>(combox), 0);
+       // must use input() directly, to avoid treating the Combox
+       // as an FL_OBJECT, leading to a crash (bug 406)
+       pre->bc().input(pre->input(0, 0));
 }
 
 void FormCharacter::build()