comblang.patch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4168 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-05-15 23:33:40 +00:00
parent 00addb46c3
commit 9a6816ef0a
3 changed files with 9 additions and 2 deletions

View File

@ -8,7 +8,7 @@ dnl AM_CONFIG_HEADER(src/config.h)
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
PACKAGE=lyx${program_suffix} PACKAGE=lyx${program_suffix}
VERSION="1.2.0cvs" VERSION="1.3.0cvs"
LYX_CHECK_VERSION LYX_CHECK_VERSION
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM

View File

@ -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> 2002-05-10 Dekel Tsur <dekelts@tau.ac.il>
* FormDocument.C (language_apply): Fix language changing. * FormDocument.C (language_apply): Fix language changing.

View File

@ -42,7 +42,9 @@ FormCharacter::FormCharacter(ControlCharacter & c)
void FormCharacter::ComboInputCB(int, void * v, Combox * combox) void FormCharacter::ComboInputCB(int, void * v, Combox * combox)
{ {
FormCharacter * pre = static_cast<FormCharacter*>(v); 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() void FormCharacter::build()