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

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

diff --git a/src/frontends/qt4/QInclude.C b/src/frontends/qt4/QInclude.C
index eaac036c35862165a1b8eccb0cab752dd4509fc5..0a3243b946237878a7ac4921caf3e060b745a8d0 100644 (file)
--- a/src/frontends/qt4/QInclude.C
+++ b/src/frontends/qt4/QInclude.C
@@ -35,7 +35,7 @@ typedef QController<ControlInclude, QView<QIncludeDialog> > base_class;
 
 
 QInclude::QInclude(Dialog & parent)
-       : base_class(parent, _("Child Document"))
+       : base_class(parent, lyx::to_utf8(_("Child Document")))
 {}
 
 
@@ -76,20 +76,20 @@ void QInclude::update_contents()
                cmdname = "input";
 
        if (cmdname == "input") {
-               dialog_->typeCO->setCurrentItem(0);
+               dialog_->typeCO->setCurrentIndex(0);
                dialog_->previewCB->setEnabled(true);
                dialog_->previewCB->setChecked(params.preview());
 
        } else if (cmdname == "include") {
-               dialog_->typeCO->setCurrentItem(1);
+               dialog_->typeCO->setCurrentIndex(1);
 
        } else if (cmdname == "verbatiminput*") {
-               dialog_->typeCO->setCurrentItem(2);
+               dialog_->typeCO->setCurrentIndex(2);
                dialog_->visiblespaceCB->setEnabled(true);
                dialog_->visiblespaceCB->setChecked(true);
 
        } else if (cmdname == "verbatiminput") {
-               dialog_->typeCO->setCurrentItem(2);
+               dialog_->typeCO->setCurrentIndex(2);
                dialog_->visiblespaceCB->setEnabled(true);
        }
 }
@@ -102,7 +102,7 @@ void QInclude::apply()
        params.setContents(fromqstr(dialog_->filenameED->text()));
        params.preview(dialog_->previewCB->isChecked());
 
-       int const item = dialog_->typeCO->currentItem();
+       int const item = dialog_->typeCO->currentIndex();
        if (item == 0)
                params.setCmdName("input");
        else if (item == 1)
@@ -121,7 +121,7 @@ void QInclude::browse()
 {
        ControlInclude::Type type;
 
-       int const item = dialog_->typeCO->currentItem();
+       int const item = dialog_->typeCO->currentIndex();
        if (item == 0)
                type = ControlInclude::INPUT;
        else if (item == 1)