anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes from Dekel and John

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1057 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-09-29 12:14:15 +00:00
parent c22b132ede
commit 7dd8b59447
4 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2000-09-27 John Levon <moz@compsoc.man.ac.uk>
* config/kde.m4: make Qt fail immediately if Qt2 is picked up
2000-09-28 Dekel Tsur <dekelts@tau.ac.il>
* src/intl.C (InitKeyMapper): Correct the value of n due to the
removal of the "default" language.
* src/combox.h (getline): Check that sel > 0
2000-09-29 José Abílio Matos <jamatos@fep.up.pt> 2000-09-29 José Abílio Matos <jamatos@fep.up.pt>
* lib/examples/docbook_example.lyx * lib/examples/docbook_example.lyx

18
config/kde.m4
View File

@ -629,6 +629,24 @@ if test ! "$kde_qt_libs_given" = "yes"; then
KDE_CHECK_QT_DIRECT(qt_libraries= ,[]) KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
fi fi
dnl should check it's not Qt2, so it will fail now, rather than in KDE check
SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -I$qt_includes -L$qt_libraries"
AC_TRY_COMPILE([
#include <qglobal.h>
],
[
#if (QT_VERSION >= 200)
break_me_(\\\);
#endif
],
ac_qt_ok=yes,
ac_qt_ok=no
)
test "$ac_qt_ok" = no && AC_MSG_ERROR([Found Qt 2 - you must specify the path to the Qt 1 headers and libraries])
CXXFLAGS="$SAVE_CXXFLAGS"
AC_SUBST(qt_libraries) AC_SUBST(qt_libraries)
AC_SUBST(qt_includes) AC_SUBST(qt_includes)

2
src/combox.h
View File

@ -221,7 +221,7 @@ string const Combox::getline()
if (type == FL_COMBOX_INPUT) if (type == FL_COMBOX_INPUT)
return fl_get_input(label); return fl_get_input(label);
else else
return browser ? fl_get_browser_line(browser, sel) : 0; return (browser && sel > 0) ? fl_get_browser_line(browser, sel) : string();
} }
#endif #endif

3
src/intl.C
View File

@ -273,11 +273,12 @@ void Intl::InitKeyMapper(bool on)
Language2->add(120, 110, 160, 30, 300); // Secondary Language2->add(120, 110, 160, 30, 300); // Secondary
fl_end_form(); fl_end_form();
int n = 1; int n = 0;
// Default is not in the language map // Default is not in the language map
#ifdef DO_USE_DEFAULT_LANGUAGE #ifdef DO_USE_DEFAULT_LANGUAGE
Language->addto("default"); Language->addto("default");
Language2->addto("default"); Language2->addto("default");
++n;
#endif #endif
for (Languages::const_iterator cit = languages.begin(); for (Languages::const_iterator cit = languages.begin();
cit != languages.end(); ++cit) { cit != languages.end(); ++cit) {