John's msg3.diff

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 0331fdf3849a19df60c2b88f62f0cf56bd12ae0f..216326c7f63575631619a65343a7352a3d3cd277 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -3,6 +3,14 @@
        * insetgraphics.C: Clean up Baruch's comments a little.
        (c-tor): remove code setting id_, as it's set in the Inset c-tor.
 
+2002-03-14  John Levon  <moz@compsoc.man.ac.uk>
+
+       * insettabular.C:
+       * insettheorem.C: wrap warnings
+
+       * insetgraphics.C: improve messages, move cached_status_
+         setting to safer place
+ 
 2002-03-18  Juergen Vigna  <jug@sad.it>
 
        * insettabular.C (unlockInsetInInset): removed unneeded showCursor

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 40cf80d0e71d82d8be5fecf8a275767b8e9f3bc7..69e300bf864abf4ebfe5280444451b6d7df77b56 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -198,7 +198,7 @@ string const InsetGraphics::statusMessage() const
                msg = _("Error scaling etc");
                break;
        case grfx::ErrorUnknown:
-               msg = _("No image associated with this inset is in the cache!");
+               msg = _("No image");
                break;
        case grfx::Loaded:
                msg = _("Loaded but not displaying");
@@ -278,6 +278,7 @@ void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
                          int baseline, float & x, bool) const
 {
        int oasc = old_asc;
+       grfx::ImageStatus old_status_ = cached_status_;
        
        int ldescent = descent(bv, font);
        int lascent  = ascent(bv, font);
@@ -306,7 +307,6 @@ void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
        // This will draw the graphics. If the graphics has not been loaded yet,
        // we draw just a rectangle.
        Painter & paint = bv->painter();
-       grfx::ImageStatus old_status_ = cached_status_;
        
        if (drawImage()) {
 //             lyxerr << "IG(" << this << "): " << old_x << endl;
@@ -690,7 +690,7 @@ int InsetGraphics::ascii(Buffer const *, ostream & os, int) const
        // 1. Convert file to ascii using gifscii
        // 2. Read ascii output file and add it to the output stream.
        // at least we send the filename
-       os << '<' << _("Graphicfile:") << params().filename << ">\n";
+       os << '<' << _("Graphic file:") << params().filename << ">\n";
        return 0;
 }
 

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 8dcea73ed23b0897e6781eb77dbb5d65fb810229..3c10ce891bb9a3f4006991bc112d28319f9f02e3 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1510,7 +1510,9 @@ int InsetTabular::getCellXPos(int cell) const
 
 void InsetTabular::resetPos(BufferView * bv) const
 {
+#ifdef WITH_WARNINGS
 #warning This should be fixed in the right manner (20011128 Jug)
+#endif
        // fast hack to fix infinite repaintings!
        if (in_reset_pos)
                return;

diff --git a/src/insets/insettheorem.C b/src/insets/insettheorem.C
index 9ea8506ba20409b33db65e96f6383bcd66e7ae01..b9efc2636e836108b452efdf3119170935b3c8df 100644 (file)
--- a/src/insets/insettheorem.C
+++ b/src/insets/insettheorem.C
@@ -58,7 +58,9 @@ void InsetTheorem::write(Buffer const * buf, ostream & os) const
 
 Inset * InsetTheorem::clone(Buffer const &, bool) const
 {
+#ifdef WITH_WARNINGS
 #warning Is this inset used? If YES this is WRONG!!! (Jug)
+#endif
        InsetTheorem * result = new InsetTheorem;
        
        result->collapsed_ = collapsed_;