From e45d0fb4e4ab6c169f0543842fefe7be6818a862 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Mon, 11 Sep 2006 13:18:41 +0000 Subject: [PATCH] another compile fix I forgot git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14977 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/gtk/Alert_pimpl.C | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/frontends/gtk/Alert_pimpl.C b/src/frontends/gtk/Alert_pimpl.C index 5fd23bc8db..65b3ff5d7e 100644 --- a/src/frontends/gtk/Alert_pimpl.C +++ b/src/frontends/gtk/Alert_pimpl.C @@ -97,24 +97,24 @@ int prompt_pimpl(docstring const & title, docstring const & question, } -std::pair const askForText_pimpl(string const & msg, - string const & dflt) +std::pair const askForText_pimpl(docstring const & msg, + docstring const & dflt) { - Gtk::MessageDialog dlg(Glib::Markup::escape_text(Glib::locale_to_utf8(msg)), + Gtk::MessageDialog dlg(Glib::Markup::escape_text(lyx::to_utf8(msg)), true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL, true); Gtk::Entry entry; - entry.set_text(Glib::locale_to_utf8(dflt)); + entry.set_text(lyx::to_utf8(dflt)); entry.set_position(-1); entry.show(); dlg.get_vbox()->children().push_back( Gtk::Box_Helpers::Element(entry)); int response = dlg.run(); if (response == Gtk::RESPONSE_OK) { - string str = Glib::locale_from_utf8(entry.get_text()); - return std::make_pair(true, str); + docstring str = lyx::from_utf8(entry.get_text()); + return std::make_pair(true, str); } else - return std::make_pair(false, string()); + return std::make_pair(false, docstring()); } -- 2.39.2