From 9a6816ef0a1540c5661c07d0278053655aeb30d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 15 May 2002 23:33:40 +0000 Subject: [PATCH] comblang.patch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4168 a592a061-630c-0410-9148-cb99ea01b6c8 --- configure.in | 2 +- src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/FormCharacter.C | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index bf1eaedef8..c72fa3962e 100644 --- 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 1d41361648..e78a677d44 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2002-05-15 John Levon + + * FormCharacter.C: avoid mis-treating Combox as FL_OBJECT + (bug 406) (from Angus) + 2002-05-10 Dekel Tsur * FormDocument.C (language_apply): Fix language changing. diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C index ecd8add69a..2c6c2ae28a 100644 --- 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(v); - pre->InputCB(reinterpret_cast(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()