reduce #include requirements

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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index c6152ed30bed65b64fe2900ee4339a1bdbaa11be..34bfff30e6eec3914acc6dfefca479ccbd5fad12 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,10 @@
+
+2002-07-04  André Pönitz <poenitz@gmx.net>
+
+       * FormInset.[Ch]: reduce #include depencies
+       
+       * guiapi.C: suppress compiler warning
+
 2002-06-27  Juergen Spitzmueller <j.spitzmueller@gmx.de>
 
        * FormInclude.C: Comment out unneeded and wrong update mechanism 

diff --git a/src/frontends/xforms/FormInset.C b/src/frontends/xforms/FormInset.C
index a211f957ffc4df013f8e49b9f136955f150f8c0e..1bec120314e64aaef0e283e0ca6bb20ac39a5c98 100644 (file)
--- a/src/frontends/xforms/FormInset.C
+++ b/src/frontends/xforms/FormInset.C
@@ -18,6 +18,7 @@
 #include "frontends/LyXView.h"
 #include "FormInset.h"
 #include "xformsBC.h"
+#include "insets/insetcommand.h"
 
 #include <boost/bind.hpp>
 

diff --git a/src/frontends/xforms/FormInset.h b/src/frontends/xforms/FormInset.h
index ad2aa2729b16d85a88c083f7b4c39e99d003589e..c5d4604f38e243aca3e1a57f5b4f66e3c83e89f2 100644 (file)
--- a/src/frontends/xforms/FormInset.h
+++ b/src/frontends/xforms/FormInset.h
@@ -15,8 +15,7 @@
 #define FORMCOMMAND_H
 
 #include "FormBaseDeprecated.h"
-
-#include "insets/insetcommand.h"
+#include "insets/insetcommandparams.h"
 
 #include <boost/signals/connection.hpp>
 
@@ -24,6 +23,7 @@
 #pragma interface
 #endif
 
+class InsetCommand;
 
 /** This class is an XForms GUI base class to insets
  */

diff --git a/src/frontends/xforms/guiapi.C b/src/frontends/xforms/guiapi.C
index 8e4515f16462a01c8348693f896e51054f653d61..97e3d1af9dcfc8834a21f0cb7d554d69b328d35b 100644 (file)
--- a/src/frontends/xforms/guiapi.C
+++ b/src/frontends/xforms/guiapi.C
@@ -495,15 +495,22 @@ extern "C" {
        }
 
 
+#ifdef HAVE_LIBAIKSAURUS
+
        void gui_ShowThesaurus(string const & s, LyXView & lv, Dialogs & d)
        {
-#ifdef HAVE_LIBAIKSAURUS
                static GUI<ControlThesaurus, FormThesaurus,
                        OkApplyCancelReadOnlyPolicy, xformsBC> ct(lv, d);
                ct.showEntry(s);
-#endif
        }
 
+#else
+
+       void gui_ShowThesaurus(string const &, LyXView &, Dialogs &)
+       {}
+
+#endif
+
 
        void gui_ShowTOC(InsetCommand * ic, LyXView & lv, Dialogs & d)
        {