Small fixes.

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

diff --git a/ChangeLog b/ChangeLog
index ebfb0d972154c111f61855f91b6312c1ae0a1702..9fb256b001c1fcd8142d3b91caeb7d97c6dda3fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-10-25  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/lyxfunc.C (Dispatch): Use _() instead of N_() fot minibuffer
+       messages. 
+
+       * src/support/lyxstring.h: declare struct Srep as friend of
+       lyxstring, since DEC cxx complains otherwise.
+
 1999-10-24  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/spellchecker.C (create_ispell_pipe): removed old #warning,

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 8ac1df0c703285a1cd3ae20c483a2a866c1c31c9..571df1d930a86eb912f949530785cd309c1b2bab 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -720,14 +720,14 @@ string LyXFunc::Dispatch(int ac,
                        int res = one.startscript(Systemcalls::System, tmp);
                        if (res == 0) {
                                setMessage(string(
-                                 N_("Document exported as HTML to file: ")) + result);
+                                 _("Document exported as HTML to file: ")) + result);
                        } else {
                                setErrorMessage(string(
-                                 N_("An unexpected error occured while converting document to HTML in file:")) + result);
+                                 _("An unexpected error occured while converting document to HTML in file:")) + result);
                        }
                }
                else {
-                       setErrorMessage(string(N_("Unknown export type: "))
+                       setErrorMessage(string(_("Unknown export type: "))
                                        + extyp);
                }
        }

diff --git a/src/support/lyxstring.h b/src/support/lyxstring.h
index 9c6df4bdef3babb89d94df967eb2b85139815cb8..068de3368bfaaea7d41b49671be514a8a4f1d7e1 100644 (file)
--- a/src/support/lyxstring.h
+++ b/src/support/lyxstring.h
@@ -524,7 +524,7 @@ public:
 private:
        // These three operators can be used to discover erronous use of
        // ints and strings. However a conforming C++ compiler will flag
-       // a lot of char operations as abmbigous when they are compiled
+       // a lot of char operations as ambigous when they are compiled
        // in. Use them for debugging only (or perhaps not even then.)
        // Lgb.
        //
@@ -536,6 +536,8 @@ private:
        
        /// Forward declaration of the string representation
        struct Srep;
+       // DEC cxx requires this.
+       friend struct Srep;
 
        /// A string is a pointer to it's representation
        Srep * rep;