X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fintl.C;h=0f33480ee6a6db0af4ee3610db7a0c6b5181e405;hb=ebfcf1c0e72288b7131607af0330500c8739cead;hp=a3b93fe55b06f7c1a5f613b87621fc2cd8e5b195;hpb=c00fe603385b4275c039c9bb35c2b241db93d021;p=lyx.git

diff --git a/src/intl.C b/src/intl.C
index a3b93fe55b..0f33480ee6 100644
--- a/src/intl.C
+++ b/src/intl.C
@@ -48,6 +48,11 @@ Intl::Intl()
 	otherkeymap = 0;
 }
 
+Intl::~Intl()
+{
+	delete trans;
+}
+
 
 int Intl::SetPrimary(string const & lang)
 {
@@ -268,28 +273,31 @@ void Intl::InitKeyMapper(bool on)
 	Language2->add(120, 110, 160, 30, 300);	// Secondary
 	fl_end_form();
 
-	int n = 1;
+	int n = 0;
 	// Default is not in the language map
+#ifdef DO_USE_DEFAULT_LANGUAGE
 	Language->addto("default");
 	Language2->addto("default");
+	++n;
+#endif
 	for (Languages::const_iterator cit = languages.begin();
 	     cit != languages.end(); ++cit) {
-		Language->addto((*cit).second.lang().c_str());
-		Language2->addto((*cit).second.lang().c_str());
+		Language->addto((*cit).second.lang());
+		Language2->addto((*cit).second.lang());
 		++n;
 	}
 
 	Language->addto(_("other..."));
 	Language2->addto(_("other..."));
 	otherkeymap = n + 1;
-	if (!Language->select_text(prim_lang.c_str())) {
+	if (!Language->select_text(prim_lang)) {
 		Language->select(n+1);
 		fl_set_input(fd_form_keymap->OtherKeymap, prim_lang.c_str());
 	}
 	else 
 		trans->SetPrimary(prim_lang);
 
-	if (!Language2->select_text(sec_lang.c_str())) {
+	if (!Language2->select_text(sec_lang)) {
 		Language2->select(n + 1);
 		fl_set_input(fd_form_keymap->OtherKeymap2, sec_lang.c_str());
 	}
@@ -300,7 +308,7 @@ void Intl::InitKeyMapper(bool on)
 	if (keymapon)
 		Keymap(23); // turn primary on
 
-	trans->setCharset(lyxrc.font_norm.c_str());
+	trans->setCharset(lyxrc.font_norm);
 }