From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Tue, 17 Oct 2006 21:15:07 +0000 (+0000)
Subject: more compile fixes
X-Git-Tag: 1.6.10~12363
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=dc76f5859041f16bec8cc6981c1552a8d703ba87;p=lyx.git

more compile fixes


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15358 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/gtk/GPrint.C b/src/frontends/gtk/GPrint.C
index dc18cd6aa8..1bcaf8d021 100644
--- a/src/frontends/gtk/GPrint.C
+++ b/src/frontends/gtk/GPrint.C
@@ -29,13 +29,15 @@
 
 #include <libglademm.h>
 
+using lyx::docstring;
+
 using std::string;
 using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-GPrint::GPrint(Dialog & parent, string const & title)
+GPrint::GPrint(Dialog & parent, docstring const & title)
 	: GViewCB<ControlPrint, GViewGladeB>(parent, title, false)
 {
 }
@@ -110,7 +112,7 @@ void GPrint::updateUI()
 void GPrint::onBrowse()
 {
 	string const inName = fileEntry_->get_text();
-	string const outName = Glib::locale_to_utf8(controller().browse(Glib::locale_from_utf8(inName)));
+	string const outName = lyx::to_utf8(controller().browse(lyx::from_utf8(inName)));
 	if (outName != inName && !outName.empty())
 		fileEntry_->set_text(outName);
 	if (!outName.empty())
diff --git a/src/frontends/gtk/GPrint.h b/src/frontends/gtk/GPrint.h
index 2b954399c5..35eb5cc556 100644
--- a/src/frontends/gtk/GPrint.h
+++ b/src/frontends/gtk/GPrint.h
@@ -21,7 +21,7 @@ class ControlPrint;
 
 class GPrint : public GViewCB<ControlPrint, GViewGladeB> {
 public:
-	GPrint(Dialog & parent, std::string const & title = "Print Document");
+	GPrint(Dialog & parent, lyx::docstring const & title = lyx::from_ascii("Print Document"));
 private:
 	virtual void apply();
 	virtual void update();
diff --git a/src/frontends/gtk/GScreen.C b/src/frontends/gtk/GScreen.C
index ecd5707efa..88e181af37 100644
--- a/src/frontends/gtk/GScreen.C
+++ b/src/frontends/gtk/GScreen.C
@@ -30,7 +30,6 @@
 #include "lyxtext.h"
 #include "lyxrow.h"
 
-#include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
 
 #include "insets/insettext.h"
diff --git a/src/frontends/gtk/GText.C b/src/frontends/gtk/GText.C
index fd8e41a07b..9c10d9fb00 100644
--- a/src/frontends/gtk/GText.C
+++ b/src/frontends/gtk/GText.C
@@ -28,22 +28,23 @@
 #include <gtkmm.h>
 #include <libglademm.h>
 
+using lyx::docstring;
+
 using std::string;
 
 namespace lyx {
 namespace frontend {
 
-GText::GText(Dialog & parent, string const & title, string const & label)
+GText::GText(Dialog & parent, docstring const & title, docstring const & label)
 	: GViewCB<ControlCommand, GViewGladeB>(parent, title),
-	  label_(label), entry_(0)
+	  label_(lyx::to_utf8(label)), entry_(0)
 {
 }
 
 
 void GText::apply()
 {
-	string const contents = Glib::locale_from_utf8(entry_->get_text());
-	controller().params().setContents(contents);
+	controller().params().setContents(entry_->get_text());
 }
 
 
@@ -51,7 +52,7 @@ void GText::update()
 {
 	string const contents = support::trim(
 		controller().params().getContents());
-	entry_->set_text(Glib::locale_to_utf8(contents));
+	entry_->set_text(contents);
 }
 
 
diff --git a/src/frontends/gtk/GText.h b/src/frontends/gtk/GText.h
index b2ab630764..63bf57ddb6 100644
--- a/src/frontends/gtk/GText.h
+++ b/src/frontends/gtk/GText.h
@@ -21,7 +21,7 @@ class ControlCommand;
 
 class GText : public GViewCB<ControlCommand, GViewGladeB> {
 public:
-	GText(Dialog & parent, std::string const & title, std::string const & label);
+	GText(Dialog & parent, lyx::docstring const & title, lyx::docstring const & label);
 private:
 	virtual void apply();
 	virtual void update();
diff --git a/src/frontends/gtk/GView.h b/src/frontends/gtk/GView.h
index dc3179b307..4a5f34a61c 100644
--- a/src/frontends/gtk/GView.h
+++ b/src/frontends/gtk/GView.h
@@ -67,7 +67,7 @@ public:
 	/// clear any temporary message and replace with current status
 	virtual void clearMessage();
 
-	// returns true if this view has the focus.
+	/// returns true if this view has the focus.
 	virtual bool hasFocus() const;
 	///
 	void updateStatusBar();