fix doxygen operation ; stop #warning causing errors on Sun CC 6.0

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

diff --git a/ChangeLog b/ChangeLog
index 91ec01fa17f6bdf11d7b9bb29b4c6da98100eaba..545322f3e015a5737f984c4d6ff7d6fa03d29c3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-04-15  Allan Rae  <rae@lyx.org>
+
+       * Makefile.am (sourcedoc/Doxyfile): ensure modifications to doxygen
+       configuration file take effect.
+       (DISTCLEANFILES): clean out sourcedoc/
+
+       * sourcedoc/Doxyfile.in(FILE_PATTERNS): make sure we only filter
+       things that should be filtered.  Now you can run it after you started
+       compiling stuff as well.
+
 2001-03-29  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * configure.in: changed AC_INIT(src/lyx.C) to AC_INIT(src/main.C)

diff --git a/Makefile.am b/Makefile.am
index 4760fe08e37e1f89879826cae823c45085e28916..6b0b8278969e31ba0173581ea80d98041c04a588 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
+DISTCLEANFILES = -r *.orig *.rej *~ *.bak lyx.1 core $(srcdir)/sourcedoc/*~ \
+       $(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
+       $(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
        $(srcdir)/configure $(srcdir)/development/lyx.spec \
-       $(srcdir)/acinclude.m4
+       $(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile
 SUBDIRS = intl po sigc++ boost src lib
 
 EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
@@ -50,10 +52,14 @@ bindist:
        @echo "*** $(bindistfile) has been created."
 
 
-sourcedoc: 
+sourcedoc: sourcedoc/Doxyfile
        cd sourcedoc; \
        doxygen ./Doxyfile
 
+sourcedoc/Doxyfile: sourcedoc/Doxyfile.in config.status
+       cd $(top_builddir) \
+         && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 lgbtags:
        etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f2125c4e5f397e675b9c6e6d48ec316469234d52..f94c783564b13e70bf669fbae0e415d0623d4dba 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,8 +10,8 @@ src/CutAndPaste.C
 src/debug.C
 src/exporter.C
 src/ext_l10n.h
-src/figure_form.C
 src/figureForm.C
+src/figure_form.C
 src/FontLoader.C
 src/frontends/controllers/ButtonController.h
 src/frontends/controllers/character.C
@@ -90,67 +90,67 @@ src/frontends/qt2/paragraphdlgimpl.C
 src/frontends/qt2/tabularcreatedlgimpl.C
 src/frontends/xforms/combox.C
 src/frontends/xforms/FileDialog.C
-src/frontends/xforms/form_bibitem.C
 src/frontends/xforms/FormBibitem.C
-src/frontends/xforms/form_bibtex.C
+src/frontends/xforms/form_bibitem.C
 src/frontends/xforms/FormBibtex.C
+src/frontends/xforms/form_bibtex.C
 src/frontends/xforms/form_browser.C
-src/frontends/xforms/form_character.C
 src/frontends/xforms/FormCharacter.C
-src/frontends/xforms/form_citation.C
+src/frontends/xforms/form_character.C
 src/frontends/xforms/FormCitation.C
-src/frontends/xforms/form_copyright.C
+src/frontends/xforms/form_citation.C
 src/frontends/xforms/FormCopyright.C
-src/frontends/xforms/form_credits.C
+src/frontends/xforms/form_copyright.C
 src/frontends/xforms/FormCredits.C
-src/frontends/xforms/form_document.C
+src/frontends/xforms/form_credits.C
 src/frontends/xforms/FormDocument.C
-src/frontends/xforms/form_error.C
+src/frontends/xforms/form_document.C
 src/frontends/xforms/FormError.C
-src/frontends/xforms/form_external.C
+src/frontends/xforms/form_error.C
 src/frontends/xforms/FormExternal.C
-src/frontends/xforms/form_filedialog.C
+src/frontends/xforms/form_external.C
 src/frontends/xforms/FormFiledialog.C
-src/frontends/xforms/form_graphics.C
+src/frontends/xforms/form_filedialog.C
 src/frontends/xforms/FormGraphics.C
-src/frontends/xforms/form_include.C
+src/frontends/xforms/form_graphics.C
 src/frontends/xforms/FormInclude.C
-src/frontends/xforms/form_index.C
+src/frontends/xforms/form_include.C
 src/frontends/xforms/FormIndex.C
+src/frontends/xforms/form_index.C
 src/frontends/xforms/FormLog.C
 src/frontends/xforms/FormMathsBitmap.C
-src/frontends/xforms/form_maths_deco.C
 src/frontends/xforms/FormMathsDeco.C
-src/frontends/xforms/form_maths_delim.C
+src/frontends/xforms/form_maths_deco.C
 src/frontends/xforms/FormMathsDelim.C
-src/frontends/xforms/form_maths_matrix.C
+src/frontends/xforms/form_maths_delim.C
 src/frontends/xforms/FormMathsMatrix.C
-src/frontends/xforms/form_maths_panel.C
+src/frontends/xforms/form_maths_matrix.C
 src/frontends/xforms/FormMathsPanel.C
-src/frontends/xforms/form_maths_space.C
+src/frontends/xforms/form_maths_panel.C
 src/frontends/xforms/FormMathsSpace.C
-src/frontends/xforms/form_minipage.C
+src/frontends/xforms/form_maths_space.C
 src/frontends/xforms/FormMinipage.C
-src/frontends/xforms/form_paragraph.C
+src/frontends/xforms/form_minipage.C
 src/frontends/xforms/FormParagraph.C
-src/frontends/xforms/form_preamble.C
+src/frontends/xforms/form_paragraph.C
 src/frontends/xforms/FormPreamble.C
-src/frontends/xforms/form_preferences.C
+src/frontends/xforms/form_preamble.C
 src/frontends/xforms/FormPreferences.C
-src/frontends/xforms/form_print.C
+src/frontends/xforms/form_preferences.C
 src/frontends/xforms/FormPrint.C
-src/frontends/xforms/form_ref.C
+src/frontends/xforms/form_print.C
 src/frontends/xforms/FormRef.C
-src/frontends/xforms/form_search.C
+src/frontends/xforms/form_ref.C
 src/frontends/xforms/FormSearch.C
-src/frontends/xforms/form_tabular.C
+src/frontends/xforms/form_search.C
 src/frontends/xforms/FormTabular.C
-src/frontends/xforms/form_tabular_create.C
+src/frontends/xforms/form_tabular.C
 src/frontends/xforms/FormTabularCreate.C
-src/frontends/xforms/form_toc.C
+src/frontends/xforms/form_tabular_create.C
 src/frontends/xforms/FormToc.C
-src/frontends/xforms/form_url.C
+src/frontends/xforms/form_toc.C
 src/frontends/xforms/FormUrl.C
+src/frontends/xforms/form_url.C
 src/frontends/xforms/FormVCLog.C
 src/frontends/xforms/input_validators.C
 src/frontends/xforms/Menubar_pimpl.C

diff --git a/sourcedoc/Doxyfile.in b/sourcedoc/Doxyfile.in
index a58ee03cb4548e7662bdd2d73623e4912d975eb9..fa8789232560783fad257e09c4e49fe66e3be746 100644 (file)
--- a/sourcedoc/Doxyfile.in
+++ b/sourcedoc/Doxyfile.in
@@ -251,7 +251,7 @@ INPUT                  = @top_srcdir@/src
 # and *.h) to filter out the source-files in the directories. If left 
 # blank all files are included. 
 
-FILE_PATTERNS          = 
+FILE_PATTERNS          = *.C *.h *.c
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
 # should be searched for input files as well. Possible values are YES and NO. 

diff --git a/src/ChangeLog b/src/ChangeLog
index 71e6b555c07d497535f63824fa83c7417192b036..435f1e7af2f1358c58a45f25ec8a66825339b3fc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-16  Allan Rae  <rae@lyx.org>
+
+       * tabular-old.C (l_getline): 
+       * spellchecker.C (sc_check_word): 
+       * lyxfunc.C (Dispatch): #warning triggers an error on Sun CC 6.0 as
+       an unrecognised preprocessor directive.  So ensure they're wrapped. 
+
 2001-04-14  Dekel Tsur  <dekelts@tau.ac.il>
 
        * src/exporter.C (Export): Give an error message when path to file 

diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog
index d7869d677cc2f53fa5ddca0ed90e20338b8dd68a..b3415a712fc3a3c2ed7b3423e84d72874fb6cb25 100644 (file)
--- a/src/frontends/gnome/ChangeLog
+++ b/src/frontends/gnome/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-16  Allan Rae  <rae@lyx.org>
+
+       * gnomeBC.C (setButtonLabel): 
+       * Menubar_pimpl.C (updateAllLists): 
+       * GnomeBase.C (loadXML): #warning triggers an error on Sun CC 6.0 as
+       an unrecognised preprocessor directive.  So ensure they're wrapped. 
+
 2001-04-03  Baruch Even  <baruch@lyx.org>
 
        * FileDialog.C: Added file to provide the gnome file dialog.

diff --git a/src/frontends/gnome/GnomeBase.C b/src/frontends/gnome/GnomeBase.C
index 87ace2088f0d0b01d1c99f98b57e3901cdee263d..1872eb1250d28ef8db35764af2d6ee1bb1587673 100644 (file)
--- a/src/frontends/gnome/GnomeBase.C
+++ b/src/frontends/gnome/GnomeBase.C
@@ -37,7 +37,9 @@ GnomeBase::~GnomeBase()
        
 void GnomeBase::loadXML() const
 {
+#ifdef WITH_WARNINGS
 #warning Change this before declaring it production code! (be 20010325)
+#endif
        string const path("src/frontends/gnome/dialogs/;frontends/gnome/dialogs/;/home/baruch/prog/lyx/graphics/src/frontends/gnome/dialogs/");
        string const file = FileOpenSearch(path, file_, "glade");
 

diff --git a/src/frontends/gnome/Menubar_pimpl.C b/src/frontends/gnome/Menubar_pimpl.C
index ff30401f8a8d6c48c72e6aec5baa78c761e5999c..bba908771e19b9fba839ce32ad5d44d00b1dfc5d 100644 (file)
--- a/src/frontends/gnome/Menubar_pimpl.C
+++ b/src/frontends/gnome/Menubar_pimpl.C
@@ -92,7 +92,9 @@ void Menubar::Pimpl::set(string const & menu_name)
 
 void Menubar::Pimpl::updateAllLists()
 {
+#ifdef WITH_WARNINGS
 #warning Implement me! (be 20010324)
+#endif
 #if 0
   // update lists
   if (toc_.size() > 0)

diff --git a/src/frontends/gnome/gnomeBC.C b/src/frontends/gnome/gnomeBC.C
index 5d057bfaa8e0f9e4f835311e6591853400749701..e9f9f66178446ddbe5b397eec8697b161600489e 100644 (file)
--- a/src/frontends/gnome/gnomeBC.C
+++ b/src/frontends/gnome/gnomeBC.C
@@ -29,7 +29,9 @@ void gnomeBC::setButtonEnabled(Gtk::Button * btn, bool enabled)
 
 void gnomeBC::setButtonLabel(Gtk::Button * obj, string const & label)
 {
+#ifdef WITH_WARNINGS
 #warning Implement me! (be 20010329)
+#endif
        // There is no methods set_text!
        //obj->set_text(label);
 }

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 3d3b44cbc3a6aa1d1c7d304a003783f3db530861..dee32eaca848f41e55ebf287cc380352a184922c 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-16  Allan Rae  <rae@lyx.org>
+
+       * xforms_helpers.C (formatted): 
+       * Menubar_pimpl.C (add_toc): #warning triggers an error on Sun CC 6.0
+       as an unrecognised preprocessor directive.  So ensure they're wrapped. 
+
 2001-04-06  John Levon  <moz@compsoc.man.ac.uk>
 
        * FormTabularCreate.C: pass a pair of uints to the controller

diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index 87a9222f03107b75cc85fc7dc3382a4b2bfeda87..f06aaaee9247b8202400b13d153ef5553201ee2a 100644 (file)
--- a/src/frontends/xforms/Menubar_pimpl.C
+++ b/src/frontends/xforms/Menubar_pimpl.C
@@ -370,7 +370,9 @@ void Menubar::Pimpl::add_toc(int menu, string const & extra_label,
        add_toc2(menu, extra_label, smn, win,
                 toc_list[0], 0, toc_list[0].size(), 0);
 #else
+#ifdef WITH_WARNINGS
 #warning Fix Me! (Lgb)
+#endif
        Buffer::Lists toc_list = owner_->buffer()->getLists();
        Buffer::Lists::const_iterator cit = toc_list.begin();
        Buffer::Lists::const_iterator end = toc_list.end();

diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C
index acbc4ce6d00244690b36d1e23e1f46af6ed57248..ad545ce0428f4b3f19a5862f1e25a135e668c019 100644 (file)
--- a/src/frontends/xforms/xforms_helpers.C
+++ b/src/frontends/xforms/xforms_helpers.C
@@ -38,7 +38,9 @@ void setEnabled(FL_OBJECT * ob, bool enable)
 // Take a string and add breaks so that it fits into a desired label width, w
 string formatted(string const & sin, int w, int size, int style)
 {
+#ifdef WITH_WARNINGS
 #warning Why cant this be done by a one pass algo? (Lgb)
+#endif
        string sout;
        if (sin.empty()) return sout;
 

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index ba29f1ec7349381582c7b5934956a7940f17f337..3b8294e7961f4d5526b6b77cec85117fa3c62f26 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-16  Allan Rae  <rae@lyx.org>
+
+       * ImageLoaderXPM.C (runImageLoader): #warning triggers an error on Sun
+       CC 6.0 as an unrecognised preprocessor directive.  So ensure they're 
+       wrapped. 
+
 2001-04-02  Baruch Even  <baruch@lyx.org>
 
        * GraphicsCacheItem.[Ch]: Changed to used the Converter class instead

diff --git a/src/graphics/ImageLoaderXPM.C b/src/graphics/ImageLoaderXPM.C
index 87be5a1b1c3eacb593245eb1d371662b1169d8d3..1bef2d2a424b836d2415a7f2e4ef0068fb1daa08 100644 (file)
--- a/src/graphics/ImageLoaderXPM.C
+++ b/src/graphics/ImageLoaderXPM.C
@@ -62,7 +62,9 @@ ImageLoaderXPM::runImageLoader(string const & filename)
        Display * display = fl_get_display();
 
 //(BE 2000-08-05)
+#ifdef WITH_WARNINGS
 #warning This might be a dirty thing, but I dont know any other solution.
+#endif
        Screen * screen = ScreenOfDisplay(display, fl_screen);
 
        Pixmap pixmap;

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 86c9d14677bcf0ec43cb87abe35ebafed1ad1580..0df54bd375ba90a4f9b6bf06cff0a73c4e0c63a4 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,14 @@
+2001-04-16  Allan Rae  <rae@lyx.org>
+
+       * insettoc.C (Ascii): 
+       * insettext.C (draw): 
+       * insettabular.C (setPos): 
+       * insetminipage.C (Read): 
+       * insetfloat.C (placement): 
+       * insetcaption.C (Ascii, DocBook): 
+       * figinset.C (runqueue): #warning triggers an error on Sun CC 6.0 as
+       an unrecognised preprocessor directive.  So ensure they're wrapped. 
+
 2001-04-13  Juergen Vigna  <jug@sad.it>
 
        * insettext.C: tried to avoid unneeded redraws.

diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index d80165688c7c6cfe32821a65b88c70f0dac623b1..a2c20d44cb42999a3e53319ce8524f88c9e00029 100644 (file)
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -521,8 +521,10 @@ void runqueue()
                        t2 << "GHOSTVIEW=" << fl_get_canvas_id(figinset_canvas)
                           << ' ' << p->data->bitmap;
                        // now set up ghostview property on a window
+                       // #ifdef WITH_WARNINGS
                        // #warning BUG seems that the only bug here
                        // might be the hardcoded dpi.. Bummer!
+                       // #endif
                        ostringstream t1;
                        t1 << "0 0 0 0 " << p->data->wid << ' '
                           << p->data->hgh << " 72 72 0 0 0 0";

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 16c485077c890c9e62acf83f80003af596bf0c5e..bc8ee48a57055895e405b61aff70b6e346a64e86 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -114,13 +114,17 @@ int InsetCaption::Latex(Buffer const * buf, ostream & os,
 int InsetCaption::Ascii(Buffer const * /*buf*/,
                        ostream & /*os*/, int /*linelen*/) const
 {
+#ifdef WITH_WARNINGS
 #warning Implement me!
+#endif
        return 0;
 }
 
 
 int InsetCaption::DocBook(Buffer const * /*buf*/, ostream & /*os*/) const
 {
+#ifdef WITH_WARNINGS
 #warning Implement me!
+#endif
        return 0;
 }

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index e4f9803d484882f3a47c8d96e59ae5fca8cd728a..029e86c22dee4fdd7a39c778904b2a6a07f571db 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -230,7 +230,9 @@ void InsetFloat::placement(string const & p)
 {
        // Here we should only allow the placement to be set
        // if a valid value.
+#ifdef WITH_WARNINGS
 #warning FIX!
+#endif
        floatPlacement_ = p;
 }
 

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index 19a355b64dd81c9f65a1323eddca90676e34da21..bb154b42516bd9c0b6ff5fdba1a14a3d6f106b7e 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -149,7 +149,9 @@ void InsetMinipage::Read(Buffer const * buf, LyXLex & lex)
                       << endl;
        }
     }
+#ifdef WITH_WARNINGS
 #warning Remove me before final 1.2.0 (Jug)
+#endif
     // this is only for compatibility to the intermediate format and should
     // vanish till the final 1.2.0!
     if (lex.IsOK()) {

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 752e0d8565d2430c8d5a308930257dbab41df786..dc9f2bc45a7bfda5fa351339c901748ccf1b2ecc 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1236,7 +1236,9 @@ void InsetTabular::setPos(BufferView * bv, int x, int y) const
        int lx = tabular->GetWidthOfColumn(actcell) -
                tabular->GetAdditionalWidth(actcell);
 #if 0
+#ifdef WITH_WARNINGS
 #warning Jürgen, can you rewrite this to _not_ use the sequencing operator. (Lgb)
+#endif
        for (; !tabular->IsLastCellInRow(actcell) && (lx < x);
             ++actcell,lx += tabular->GetWidthOfColumn(actcell) +
                     tabular->GetAdditionalWidth(actcell - 1));

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 33ffcfa753f1de780fe19a34ed1e2dc1d2670c78..4484a9cca249b60c3701098b9230ddfe6df4fa56 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -384,8 +384,10 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
        }
        x += TEXT_TO_INSET_OFFSET;
 
+#ifdef WITH_WARNINGS
 #warning Jürgen, why is this a block of its own? (Lgb)
-#warning because you told me to define variables only in local contest (Jug)!
+#warning because you told me to define variables only in local context (Jug)!
+#endif
        {
        int y = 0;
        Row * row = TEXT(bv)->GetRowNearY(y);

diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index 4f03775ddbac78a8495f3803d374061d7c2a29ce..74be043cf647efa845caddcc25a3bae69ad83366 100644 (file)
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -71,7 +71,9 @@ int InsetTOC::Ascii(Buffer const * buffer, std::ostream & os, int) const
             it != toc.end(); ++it)
                os << string(4 * it->depth, ' ') << it->str << endl;
 #else
+#ifdef WITH_WARNINGS
 #warning Fix Me! (Lgb)
+#endif
        string type;
        string const cmdname = getCmdName();
        if (cmdname == "tableofcontents" )

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index c31da43748e3c64d1e4ad2194cd0d3768a58e167..285af55c54a751c5827fc87908c82da052804612 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -999,7 +999,9 @@ string const LyXFunc::Dispatch(int ac,
                        owner->view()->allFloats(0,1);
                break;
 #else
+#ifdef WITH_WARNINGS
 #warning Find another implementation here (or another lyxfunc)!
+#endif
 #endif
        case LFUN_HELP_COPYRIGHT:
                owner->getDialogs()->showCopyright();

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 069ec8e697dafd8031f536aa85ede6e8350ca647..c65f7aa00d9141d39128e9f6e407f43a5dbab2d1 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-16  Allan Rae  <rae@lyx.org>
+
+       * formula.C (Latex, getLabelList, LocalDispatch): 
+       * math_parser.C (mathed_parse): 
+       * math_parinset.C (Write): #warning triggers an error on Sun CC 6.0 as
+       an unrecognised preprocessor directive.  So ensure they're wrapped.
+
 2001-04-04  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * formula.C (draw): adjust for cursor_visible

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 2e54f1cb99662a658c309dd786b7761b2a3a3971..e4fc8957f99bee28ba1b59005e2347152aadf8fd 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -262,8 +262,10 @@ void InsetFormula::Write(Buffer const * buf, ostream & os) const
 
 int InsetFormula::Latex(Buffer const *, ostream & os, bool fragile, bool) const
 {
+       //#ifdef WITH_WARNINGS
        //#warning Alejandro, the number of lines is not returned in this case
        // This problem will disapear at 0.13.
+       //#endif
        return mathed_write(par, os, fragile, label_);
 }
 
@@ -556,8 +558,10 @@ void InsetFormula::display(bool dspf)
 
 vector<string> const InsetFormula::getLabelList() const
 {
+       //#ifdef WITH_WARNINGS
        //#warning This is dirty, I know. Ill clean it at 0.11
        // Correction, the only way to clean this is with a new kernel: 0.13.
+       //#endif
 
        vector<string> label_list;
 
@@ -895,7 +899,9 @@ InsetFormula::LocalDispatch(BufferView * bv, kb_action action,
                                //BUG
                                //         mt->SetNumbered(!mt->IsNumbered());
 
+#ifdef WITH_WARNINGS
 #warning This is a terrible hack! We should find a better solution.
+#endif
                        while (mathcursor->getLabel() == MathedXIter::error_label) {
                                if (LocalDispatch(bv, LFUN_LEFT, string()) == FINISHED)
                                        return DISPATCHED;
@@ -1023,7 +1029,9 @@ InsetFormula::LocalDispatch(BufferView * bv, kb_action action,
                string old_label = is_multiline(par->GetType())
                        ? mathcursor->getLabel() : label_;
 
+#ifdef WITH_WARNINGS
 #warning This is a terrible hack! We should find a better solution.
+#endif
                // This is needed because in some positions
                // mathcursor->cursor->crow is equal to 0, and therefore
                // the label cannot be inserted.

diff --git a/src/mathed/math_parinset.C b/src/mathed/math_parinset.C
index 20309ff6f28c767383406b962b551a75e974d269..6d7021a7295d7f574bd5d19278e47a5f6b50946d 100644 (file)
--- a/src/mathed/math_parinset.C
+++ b/src/mathed/math_parinset.C
@@ -296,7 +296,9 @@ void MathParInset::Write(ostream & os, bool fragile)
                                        if (l) {
                                                os << '\\' << l->name << ' ';
                                        } else {
+#ifdef WITH_WARNINGS
 #warning this does not compile on gcc 2.97
+#endif
                                                //lyxerr << "Illegal symbol code[" << c
                                                //   << " " << str.end() - s << " " << data.fcode() << "]";
                                        }

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index c3827dffbdf4038d8a2c5487be081c341abdaba0..f67700da4b7975d9eba9030de053d1bd2cad8a83 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -134,7 +134,9 @@ enum lexcode_enum {
 
 
 lexcode_enum lexcode[256];  
+#ifdef WITH_WARNINGS
 #warning Replace with string
+#endif
 //char yytext[256];
 array<char, 256> yytext;
 int yylineno;
@@ -626,7 +628,9 @@ void mathed_parse(MathedArray & array, unsigned flags = 0,
                                if (accent) {
                                        data.insertInset(doAccent(bg), LM_TC_INSET);
                                } else {
+#ifdef WITH_WARNINGS
 #warning This is suspisious! (Lgb)
+#endif
                                        // it should not take a bool as second arg (Lgb)
                                        data.insertInset(bg, true);
                                }

diff --git a/src/spellchecker.C b/src/spellchecker.C
index 609aa93502e7406cf83ca63ca8df60e15f60a9ec..989c1cd690bf48d3e4b6de0709470054002d5438 100644 (file)
--- a/src/spellchecker.C
+++ b/src/spellchecker.C
@@ -633,7 +633,9 @@ void sc_clean_up_after_error()
 isp_result * sc_check_word(string const & word)
 {
        isp_result * result = new isp_result;
+#ifdef WITH_WARNINGS
 #warning Why isnt word_ok a bool? (Lgb)
+#endif
        int word_ok = pspell_manager_check(sc, word.c_str());
        Assert(word_ok != -1);
 

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index b365c07c28f3fce9c40186759033d57aa7468bd8..500846e5e1d6e9f5fc9fa89d5c3fcef25735318d 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-16  Allan Rae  <rae@lyx.org>
+
+       * tempname.C (make_tempfile): #warning triggers an error on Sun CC 6.0
+       as an unrecognised preprocessor directive.  So ensure they're wrapped. 
+
 2001-03-15  Lars Gullik Bjønnes  <larsbj@trylle.birdstep.com>
 
        * several files: remove CXX_WORKING_NAMESPACES

diff --git a/src/support/tempname.C b/src/support/tempname.C
index 791e586bd9e0d1765043cac9bda5eb54bc5945ab..9c7f3824fcf9a499e51551c8aa2a306625a3a613 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -25,9 +25,11 @@ int make_tempfile(char * templ)
        ::mktemp(templ);
        return ::open(templ, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 #else
+#ifdef WITH_WARNINGS
 #warning FIX FIX FIX
 #endif
 #endif
+#endif
 }
 
 } // namespace anon

diff --git a/src/tabular-old.C b/src/tabular-old.C
index 9bdf96ccd653c30424acdc9397f087e4ff64f7a1..7ec6fbd2d0ce5d5b80b7d932025d35a5db55e5c6 100644 (file)
--- a/src/tabular-old.C
+++ b/src/tabular-old.C
@@ -125,7 +125,9 @@ bool getTokenValue(string const & str, const char * token, bool & flag)
 inline
 void l_getline(istream & is, string & str)
 {
+#ifdef WITH_WARNINGS
 #warning old l_getline
+#endif
     getline(is, str);
     while(str.empty())
        getline(is, str);