Use LyXLookup when xforms version < 0.89.5

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

diff --git a/ChangeLog b/ChangeLog
index c9fab9c3b8c27132a5bd7197ca1f1e22bf8d8bf1..8554b5110be85ba568686f155ea5024bdb54cce6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * config/lyxinclude.m4 (LYX_PATH_XFORMS): display also the
+       fixlevel along with xforms version.
+
+       * src/WorkArea.C (work_area_handler): use stuff in lyxlookup.h when
+       xforms version is strictly less than 0.89.5.
+       * src/lyx_gui.C (LyXGUI): ditto.
+       * src/LyXView.C (show): ditto.
+
 2000-12-02  Dekel Tsur  <dekelts@tau.ac.il>
 
        * src/BufferView_pimpl.C (workAreaMotionNotify): Fixed mouse

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index de99f8b4ef6382c7b1638a00d83edf8f35ca3fb5..5b156d0111c39efe43003b2f4696ce2c5781d520 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -609,7 +609,7 @@ if test $ac_cv_header_forms_h = yes; then
 #if ! defined(FL_INCLUDE_VERSION)
 "%%%"(unknown)"%%%"
 #else
-"%%%"FL_VERSION.FL_REVISION"%%%"
+"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
 #endif
 EOF
 lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
@@ -617,12 +617,12 @@ lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
   sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
 rm -f conftest*])
 case "$lyx_cv_xfversion" in 
-  "(unknown)"|0.8[1-7]) 
+  "(unknown)"|0.8[1-7]*) 
          LYX_ERROR(dnl
 Version $lyx_cv_xfversion of xforms is not compatible with LyX. 
    This version of LyX works best with versions 0.88 (recommended) and later.) ;;
-    0.88) ;;
-    0.89) LYX_WARNING(dnl
+    0.88*) ;;
+    0.89*) LYX_WARNING(dnl
 LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
 it is an unproven version and might still have some bugs. If you
 have problems[,] please use version 0.88 instead.) ;;

diff --git a/src/LyXView.C b/src/LyXView.C
index b50eedee8146147ea24b14b0fd09b8c4da9e4039..c4fdd8c98929dae302c1640774ef300e6b614549 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -19,7 +19,7 @@
 
 #include "LyXView.h"
 #include "lyx_main.h"
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
 #endif
 #include "minibuffer.h"
@@ -214,7 +214,7 @@ void LyXView::show(int place, int border, string const & title)
 {
        fl_show_form(form_, place, border, title.c_str());
        minibuffer->Init();
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
        InitLyXLookup(fl_get_display(), form_->window);
 #endif
 }

diff --git a/src/WorkArea.C b/src/WorkArea.C
index 9cd39516a69d512afa27ee9652e110189ab27832..e4eb592b01ba33ca6cb228f2aaa65c06b1ae5261 100644 (file)
--- a/src/WorkArea.C
+++ b/src/WorkArea.C
@@ -22,7 +22,7 @@
 #include "LyXView.h"
 #include "lyxfunc.h"
 
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
 #endif
 
@@ -336,8 +336,8 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                KeySym keysym = 0;
                char dummy[1];
                XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev);
-#if FL_REVISION < 89
-               // XForms < 0.89 does not have compose support
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
+               // XForms < 0.89.5 does not have compose support
                // so we are using our own compose support
                LyXLookupString(ev, dummy, 1, &keysym);
 #else

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 6171fe7e9172e560b1d74dfff13bc0604c92e0ca..ddff923cc32a444315ea5371ce0752dbb980bb91 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -35,7 +35,7 @@
 #include "lyxrc.h"
 #include "gettext.h"
 #include "lyx_gui_misc.h"
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
 #endif
 #include "bufferlist.h"
@@ -167,7 +167,7 @@ LyXGUI::~LyXGUI()
        delete lyxserver;
        lyxserver = 0;
        delete lyxViews;
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
        CloseLyXLookup();
 #endif
 }