Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / intl.h

diff --git a/src/intl.h b/src/intl.h
index 8cf5bf36d5976c5340fb2687168fa010c926e407..e85036ceaba903745c6f95838c81fe06fd185008 100644 (file)
--- a/src/intl.h
+++ b/src/intl.h
@@ -6,6 +6,8 @@
 #ifndef INTL_H
 #define INTL_H
 
+#include FORMS_H_LOCATION
+
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -54,10 +56,12 @@ public:
        void InitKeyMapper(bool on);
 
        /// Get the Translation Manager
-       inline TransManager * getTrans();
+       TransManager * getTrans();
        ///
        bool keymapon;
        ///
+       bool primarykeymap;
+       ///
        char * chsetcode;
        ///
        static void DispatchCallback(FL_OBJECT *, long);
@@ -71,8 +75,6 @@ private:
        ///
        void Keymap(long code);
        ///
-       bool primarykeymap;
-       ///
        int curkeymap;
        ///
        int otherkeymap;
@@ -92,6 +94,7 @@ private:
 };
 
 
+inline
 TransManager * Intl::getTrans()
 {
        return trans;