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 dc18cd6aa80154c53dcc4750743604bf074b8bbb..1bcaf8d021decef39f6bd8d27935b5e0fe5064b6 100644 (file)
--- 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 2b954399c5722ce3bb5777066add563a61c0e013..35eb5cc5569131deff0fb43b9324be5ed6e536f1 100644 (file)
--- 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 ecd5707efae9853b32cf3775e6e7a859fdcbadac..88e181af37c660863baf0611b9ca138697996a03 100644 (file)
--- 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 fd8e41a07bde083e941cf855299cd8da7f6f9c14..9c10d9fb0039f349c112673cb5a973dc7b981ac3 100644 (file)
--- 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 b2ab630764c01a9d26922d82acc33bde27d4f4fb..63bf57ddb6fc592441ac8f11b9ec1043180903a9 100644 (file)
--- 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 dc3179b30717e911aab80a9a6119b92150ad336b..4a5f34a61ccbfe5944bef719d0173806eb5717fc 100644 (file)
--- 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();