Merge branch 'master' into 'gtk3' to fix modal dialogs without a parent

This commit is contained in:
Adam Reichold
2016-03-28 13:49:56 +02:00
12 changed files with 446 additions and 243 deletions

View File

@@ -1834,7 +1834,7 @@ void Preferences::cancelPressed ()
void Preferences::selectStartupDir ()
{
Gtk::FileChooserDialog dialog(M("PREFERENCES_DIRSELECTDLG"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
Gtk::FileChooserDialog dialog (getToplevelWindow (this), M("PREFERENCES_DIRSELECTDLG"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
// dialog.set_transient_for(*this);
//Add response buttons the the dialog: