Merge remote-tracking branch 'features/properpaint' into 2.3.2-staging

[lyx.git] / src / frontends / qt4 / FileDialog.cpp

diff --git a/src/frontends/qt4/FileDialog.cpp b/src/frontends/qt4/FileDialog.cpp
index 0d6abdc5b6a6e5220a5d5a5c45abc722c054781b..f1156348d4497349ea5fe8710c09f4cf7c0b6c1e 100644 (file)
--- a/src/frontends/qt4/FileDialog.cpp
+++ b/src/frontends/qt4/FileDialog.cpp
@@ -35,7 +35,7 @@
  *
  * Therefore there is a tradeoff in enabling or disabling this (JMarc)
  */
-#if defined(Q_WS_MACX) || (defined(Q_WS_WIN) && !defined(Q_OS_CYGWIN))
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
 #define USE_NATIVE_FILEDIALOG 1
 #endif
 
@@ -55,8 +55,8 @@ public:
 };
 
 
-FileDialog::FileDialog(QString const & t, FuncCode s)
-       : private_(new FileDialog::Private), title_(t), success_(s)
+FileDialog::FileDialog(QString const & t)
+       : private_(new FileDialog::Private), title_(t)
 {}
 
 
@@ -93,7 +93,7 @@ FileDialog::Result FileDialog::save(QString const & path,
 
 #ifdef USE_NATIVE_FILEDIALOG
        QString const startsWith = makeAbsPath(suggested, path);
-       QString const name = 
+       QString const name =
                QFileDialog::getSaveFileName(qApp->focusWidget(),
                title_, startsWith, filters.join(";;"),
                selectedFilter, QFileDialog::DontConfirmOverwrite);
@@ -106,6 +106,8 @@ FileDialog::Result FileDialog::save(QString const & path,
        dlg.setFileMode(QFileDialog::AnyFile);
        dlg.setAcceptMode(QFileDialog::AcceptSave);
        dlg.setConfirmOverwrite(false);
+       if (selectedFilter != 0 && !selectedFilter->isEmpty())
+               dlg.selectNameFilter(*selectedFilter);
 
        if (!suggested.isEmpty())
                dlg.selectFile(suggested);