please apply
thanks
john
--
I am a complete moron for forgetting about endianness. May I be
forever marked as such.
Index: src/insets/insettheorem.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettheorem.C,v
retrieving revision 1.10
diff -u -r1.10 insettheorem.C
--- src/insets/insettheorem.C 24 Jul 2001 22:08:49 -0000 1.10
+++ src/insets/insettheorem.C 18 Mar 2002 21:03:44 -0000
@@ -58,7 +58,9 @@
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_;
Index: src/insets/insetgraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphics.C,v
retrieving revision 1.88
diff -u -r1.88 insetgraphics.C
--- src/insets/insetgraphics.C 11 Mar 2002 14:04:41 -0000 1.88
+++ src/insets/insetgraphics.C 18 Mar 2002 21:03:46 -0000
@@ -214,7 +214,7 @@
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");
@@ -294,6 +294,7 @@
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);
@@ -322,7 +323,6 @@
// 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;
@@ -706,7 +706,7 @@
// 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;
}
Index: src/insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.351
diff -u -r1.351 ChangeLog
--- src/insets/ChangeLog 18 Mar 2002 14:53:21 -0000 1.351
+++ src/insets/ChangeLog 18 Mar 2002 21:03:53 -0000
@@ -1,3 +1,11 @@
+2002-03-14 John Levon <[EMAIL PROTECTED]>
+
+ * insettabular.C:
+ * insettheorem.C: wrap warnings
+
+ * insetgraphics.C: improve messages, move cached_status_
+ setting to safer place
+
2002-03-18 Juergen Vigna <[EMAIL PROTECTED]>
* insettabular.C (unlockInsetInInset): removed unneeded showCursor
Index: src/insets/insettabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.C,v
retrieving revision 1.187
diff -u -r1.187 insettabular.C
--- src/insets/insettabular.C 18 Mar 2002 14:53:21 -0000 1.187
+++ src/insets/insettabular.C 18 Mar 2002 21:04:42 -0000
@@ -1510,7 +1510,9 @@
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;
