Fix compilation with xforms 0.88.

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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index b7702e4c40ef3ceaf5644ff3db5f1840d531c146..89988e33a6b27de2284bc5d1e7df1da9edafe416 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-07  Angus Leeming  <leeming@lyx.org>
+
+       * FormBase.C (hide):
+       * FormBaseDeprecated.C (hide): wrap that call to fl_hide_tooltip inside
+       #ifdef required xforms version.
+
 2002-10-04  Angus Leeming  <leeming@lyx.org>
 
        * form_graphics.fd: un-cripple dialog by reverting yesterday's change.

diff --git a/src/frontends/xforms/FormBase.C b/src/frontends/xforms/FormBase.C
index 980ac632cc0fd7241015e9088e69735499448cf8..892adcc4eae4bce427aad4d679eef7dbaa6819c6 100644 (file)
--- a/src/frontends/xforms/FormBase.C
+++ b/src/frontends/xforms/FormBase.C
@@ -28,8 +28,10 @@
 
 extern "C" {
 
+#if FL_VERSION > 0 || FL_REVISION >= 89
 // This should be in forms.h but isn't
 void fl_hide_tooltip();
+#endif
 
 // Callback function invoked by xforms when the dialog is closed by the
 // window manager
@@ -164,9 +166,11 @@ void FormBase::show()
 
 void FormBase::hide()
 {
+#if FL_VERSION > 0 || FL_REVISION >= 89
        // Does no harm if none is visible and ensures that the tooltip form
        // is hidden should the dialog be closed from the keyboard.
        fl_hide_tooltip();
+#endif
 
        // xforms sometimes tries to process a hint-type MotionNotify, and
        // use XQueryPointer, without verifying if the window still exists.

diff --git a/src/frontends/xforms/FormBaseDeprecated.C b/src/frontends/xforms/FormBaseDeprecated.C
index 7b2b0bd09f6b085d5e5f2b57cc0e5835beeb99b0..0d917285859362bc950eced2e7fb70439f0b7518 100644 (file)
--- a/src/frontends/xforms/FormBaseDeprecated.C
+++ b/src/frontends/xforms/FormBaseDeprecated.C
@@ -32,8 +32,10 @@
 
 extern "C" {
 
+#if FL_VERSION > 0 || FL_REVISION >= 89
 // This should be in forms.h but isn't
 void fl_hide_tooltip();
+#endif
 
 // Callback function invoked by xforms when the dialog is closed by the
 // window manager
@@ -173,9 +175,11 @@ void FormBaseDeprecated::show()
 
 void FormBaseDeprecated::hide()
 {
+#if FL_VERSION > 0 || FL_REVISION >= 89
        // Does no harm if none is visible and ensures that the tooltip form
        // is hidden should the dialog be closed from the keyboard.
        fl_hide_tooltip();
+#endif
 
        // xforms sometimes tries to process a hint-type MotionNotify, and
        // use XQueryPointer, without verifying if the window still exists.