]> git.lyx.org Git - features.git/commitdiff
another compile fix I forgot
authorGeorg Baum <Georg.Baum@post.rwth-aachen.de>
Mon, 11 Sep 2006 13:18:41 +0000 (13:18 +0000)
committerGeorg Baum <Georg.Baum@post.rwth-aachen.de>
Mon, 11 Sep 2006 13:18:41 +0000 (13:18 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14977 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/gtk/Alert_pimpl.C

index 5fd23bc8db4912d5faff119bd328bea9e4a21cf3..65b3ff5d7e1fe6479c80811c1c07eb12c909ef7b 100644 (file)
@@ -97,24 +97,24 @@ int prompt_pimpl(docstring const & title, docstring const & question,
 }
 
 
-std::pair<bool, string> const askForText_pimpl(string const & msg,
-                                              string const & dflt)
+std::pair<bool, docstring> 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<bool, string>(true, str);
+               docstring str = lyx::from_utf8(entry.get_text());
+               return std::make_pair<bool, docstring>(true, str);
        }
        else
-               return std::make_pair<bool, string>(false, string());
+               return std::make_pair<bool, docstring>(false, docstring());
 }