Dekels tabular/textinset patches

[lyx.git] / src / intl.h

diff --git a/src/intl.h b/src/intl.h
index 2d5fcb78c3abfa575dc4266fa0fcf42ec898fb4c..90317e85d32ccb265b9492648b1d144044da0890 100644 (file)
--- a/src/intl.h
+++ b/src/intl.h
@@ -12,16 +12,24 @@
 #pragma interface
 #endif
 
+#include <sigc++/signal_system.h>
 #include "LString.h"
 #include "form1.h"
-#include <sigc++/signal_system.h>
+
+#if 1
+#include "trans_mgr.h"
+#endif
 
 class LyXText;
 class Combox;
+
+#if 0
 class TransManager;
+#endif
 
 #ifdef SIGC_CXX_NAMESPACES
 using SigC::Object;
+using SigC::Connection;
 #endif
 
 /// default character set
@@ -60,8 +68,13 @@ public:
        /// initialize key mapper
        void InitKeyMapper(bool on);
 
+#if 0
        /// Get the Translation Manager
        TransManager * getTrans();
+#else
+       // Get the Translation Manager
+       TransManager & getTrans();
+#endif
        ///
        bool keymapon;
        ///
@@ -96,17 +109,30 @@ private:
        string & prim_lang;
        ///
        string & sec_lang;
+#if 0
        ///
        TransManager * trans;
+#else
+       ///
+       TransManager trans;
+#endif
        /// Redraw connection.
-       SigC::Connection r_;
+       Connection r_;
 };
 
 
+#if 0
 inline
 TransManager * Intl::getTrans()
 {
        return trans;
 }
+#else
+inline
+TransManager & Intl::getTrans()
+{
+       return trans;
+}
+#endif
 
 #endif