enable Font cache only for MacOSX and inline width() for other platform.

[lyx.git] / src / frontends / qt4 / QWrap.C

diff --git a/src/frontends/qt4/QWrap.C b/src/frontends/qt4/QWrap.C
index aa3469fa7b81dd189affdf56266690fe351a1b49..f54c668bdf9a4d40211df00fb256382ce033a0da 100644 (file)
--- a/src/frontends/qt4/QWrap.C
+++ b/src/frontends/qt4/QWrap.C
@@ -36,7 +36,7 @@ namespace frontend {
 typedef QController<ControlWrap, QView<QWrapDialog> > base_class;
 
 QWrap::QWrap(Dialog & parent)
-       : base_class(parent, _("Text Wrap Settings"))
+       : base_class(parent, lyx::to_utf8(_("Text Wrap Settings")))
 {
 }
 
@@ -67,7 +67,7 @@ void QWrap::apply()
 
        params.width = LyXLength(value, unit);
 
-       switch (dialog_->valignCO->currentItem()) {
+       switch (dialog_->valignCO->currentIndex()) {
        case 0:
                params.placement.erase();
                break;
@@ -115,7 +115,7 @@ void QWrap::update_contents()
        else if (params.placement == "p")
                item = 3;
 
-       dialog_->valignCO->setCurrentItem(item);
+       dialog_->valignCO->setCurrentIndex(item);
 }
 
 } // namespace frontend