*/
#include <config.h>
-#include <gtkmm.h>
-#include <libglademm.h>
-#include <sstream>
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
#include "ControlAboutlyx.h"
#include "GAboutlyx.h"
-#include "support/filetools.h"
+#include "ghelpers.h"
#include "version.h"
+#include <libglademm.h>
+
+#include <sstream>
+
using std::ostringstream;
+using std::string;
+namespace lyx {
+namespace frontend {
namespace {
void GAboutlyx::doBuild()
{
- string const gladeName =
- lyx::support::LibFileSearch("glade", "aboutlyx", "glade");
+ string const gladeName = findGladeFile("aboutlyx");
xml_ = Gnome::Glade::Xml::create(gladeName);
Gtk::Label * version;
Gtk::Label * credits;
version->set_text(Glib::locale_to_utf8(vs.str()));
std::ostringstream crs;
controller().getCredits(crs);
- credits->set_markup(translateMarkup(Glib::locale_to_utf8(crs.str())));
+ credits->set_markup(
+ translateMarkup(Glib::convert(crs.str(),
+ "UTF-8",
+ "ISO8859-1")));
std::ostringstream ls;
ls << controller().getCopyright() << "\n\n"
<< controller().getLicense() << "\n\n"
license->set_text(Glib::locale_to_utf8(ls.str()));
Gtk::Button * btn;
xml_->get_widget("close_button", btn);
- btn->signal_clicked().connect(SigC::slot(*this, &GViewBase::onCancel));
+ setCancel(btn);
+ //btn->signal_clicked().connect(sigc::mem_fun(*this, &GViewBase::onCancel));
}
+
+} // namespace frontend
+} // namespace lyx