X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b014db05bb062ddacf19e22b4c638d8ac5429d95..d935b42145c01cb82a0b74a5f9b1c34f40e0d711:/src/gtk/filedlg.cpp

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 40085781d9..ce722561ac 100644
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -28,12 +28,6 @@
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
@@ -56,7 +50,7 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 
             msg.Printf(
                 _("File '%s' already exists, do you really want to overwrite it?"),
-                wxString(wxConvFileName->cMB2WX(filename)).c_str());
+                wxString(filename, *wxConvFileName));
 
             wxMessageDialog dlg(dialog, msg, _("Confirm"),
                                wxYES_NO | wxICON_QUESTION);
@@ -65,6 +59,17 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
         }
     }
 
+    if (style & wxFD_FILE_MUST_EXIST)
+    {
+        if ( !g_file_test(filename, G_FILE_TEST_EXISTS) )
+        {
+            wxMessageDialog dlg( dialog, _("Please choose an existing file."), 
+                                 _("Error"), wxOK| wxICON_ERROR);
+            dlg.ShowModal();
+            return;
+        }
+    }
+    
     // change to the directory where the user went if asked
     if (style & wxFD_CHANGE_DIR)
     {
@@ -97,8 +102,6 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
                                              gint response,
                                              wxFileDialog *dialog)
 {
-    wxapp_install_idle_handler();
-
     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);
     else    // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
@@ -160,7 +163,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         return;
     }
 
-    m_needParent = false;
+    parent = GetParentForModalDialog(parent);
 
     if (!PreCreation(parent, pos, wxDefaultSize) ||
         !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
@@ -195,24 +198,28 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                    ok_btn_stock, GTK_RESPONSE_ACCEPT,
                    NULL);
 
+    m_fc.SetWidget( GTK_FILE_CHOOSER(m_widget) );
+
     gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
 
     if ( style & wxFD_MULTIPLE )
         gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);
 
-    // gtk_widget_hide_on_delete is used here to avoid that Gtk automatically destroys
-    // the dialog when the user press ESC on the dialog: in that case a second call to
-    // ShowModal() would result in a bunch of Gtk-CRITICAL errors...
+    // gtk_widget_hide_on_delete is used here to avoid that Gtk automatically
+    // destroys the dialog when the user press ESC on the dialog: in that case
+    // a second call to ShowModal() would result in a bunch of Gtk-CRITICAL
+    // errors...
     g_signal_connect (G_OBJECT(m_widget),
                     "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete),
                     (gpointer)this);
 
-    // local-only property could be set to false to allow non-local files to be loaded.
-    // In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere
-    // and the GtkFileChooserDialog should probably also be created with a backend,
-    // e.g "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend).
-    // Currently local-only is kept as the default - true:
+    // local-only property could be set to false to allow non-local files to be
+    // loaded. In that case get/set_uri(s) should be used instead of
+    // get/set_filename(s) everywhere and the GtkFileChooserDialog should
+    // probably also be created with a backend, e.g "gnome-vfs", "default", ...
+    // (gtk_file_chooser_dialog_new_with_backend). Currently local-only is kept
+    // as the default - true:
     // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true);
 
     g_signal_connect (m_widget, "response",
@@ -220,14 +227,34 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 
     SetWildcard(wildCard);
 
-    if ( style & wxFD_SAVE )
+    // if defaultDir is specified it should contain the directory and
+    // defaultFileName should contain the default name of the file, however if
+    // directory is not given, defaultFileName contains both
+    wxFileName fn;
+    if ( defaultDir.empty() )
+        fn.Assign(defaultFileName);
+    else if ( !defaultFileName.empty() )
+        fn.Assign(defaultDir, defaultFileName);
+    else
+        fn.AssignDir(defaultDir);
+
+    // set the initial file name and/or directory
+    fn.MakeAbsolute(); // GTK+ needs absolute path
+    const wxString dir = fn.GetPath();
+    if ( !dir.empty() )
     {
-        if ( !defaultDir.empty() )
-            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
-            wxConvFileName->cWX2MB(defaultDir));
+        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
+                                            dir.fn_str());
+    }
 
-        gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
-            wxGTK_CONV(defaultFileName));
+    const wxString fname = fn.GetFullName();
+    if ( style & wxFD_SAVE )
+    {
+        if ( !fname.empty() )
+        {
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
+                                              fname.fn_str());
+        }
 
 #if GTK_CHECK_VERSION(2,7,3)
         if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
@@ -236,22 +263,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     }
     else // wxFD_OPEN
     {
-        if ( !defaultFileName.empty() )
+        if ( !fname.empty() )
         {
-            wxString dir;
-            if ( defaultDir.empty() )
-                dir = ::wxGetCwd();
-            else
-                dir = defaultDir;
-
-            gtk_file_chooser_set_filename(
-                GTK_FILE_CHOOSER(m_widget),
-                wxConvFileName->cWX2MB( wxFileName(dir, defaultFileName).GetFullPath() ) );
-        }
-        else if ( !defaultDir.empty() )
-        {
-            gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
-                wxConvFileName->cWX2MB(defaultDir) );
+            gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
+                                          fn.GetFullPath().fn_str());
         }
     }
 
@@ -274,7 +289,7 @@ void wxFileDialog::OnFakeOk( wxCommandEvent &event )
     if (!gtk_check_version(2,4,0))
         EndDialog(wxID_OK);
     else
-        wxGenericFileDialog::OnListOk( event );
+        wxGenericFileDialog::OnOk( event );
 }
 
 int wxFileDialog::ShowModal()
@@ -305,8 +320,7 @@ wxString wxFileDialog::GetPath() const
 {
     if (!gtk_check_version(2,4,0))
     {
-        wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
-        return wxConvFileName->cMB2WX(str);
+        return m_fc.GetPath();
     }
 
     return wxGenericFileDialog::GetPath();
@@ -316,12 +330,7 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
 {
     if (!gtk_check_version(2,4,0))
     {
-        GetPaths(files);
-        for (size_t n = 0; n < files.GetCount(); ++n )
-        {
-            wxFileName file(files[n]);
-            files[n] = file.GetFullName();
-        }
+        m_fc.GetFilenames( files );
     }
     else
         wxGenericFileDialog::GetFilenames( files );
@@ -331,23 +340,7 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const
 {
     if (!gtk_check_version(2,4,0))
     {
-        paths.Empty();
-        if (gtk_file_chooser_get_select_multiple(GTK_FILE_CHOOSER(m_widget)))
-        {
-            GSList *gpathsi = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
-            GSList *gpaths = gpathsi;
-            while (gpathsi)
-            {
-                wxString file(wxConvFileName->cMB2WX((gchar*) gpathsi->data));
-                paths.Add(file);
-                g_free(gpathsi->data);
-                gpathsi = gpathsi->next;
-            }
-
-            g_slist_free(gpaths);
-        }
-        else
-            paths.Add(GetPath());
+        m_fc.GetPaths( paths );
     }
     else
         wxGenericFileDialog::GetPaths( paths );
@@ -368,9 +361,7 @@ void wxFileDialog::SetPath(const wxString& path)
 {
     if (!gtk_check_version(2,4,0))
     {
-        if (path.empty()) return;
-
-        gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path));
+        m_fc.SetPath( path );
     }
     else
         wxGenericFileDialog::SetPath( path );
@@ -380,10 +371,7 @@ void wxFileDialog::SetDirectory(const wxString& dir)
 {
     if (!gtk_check_version(2,4,0))
     {
-        if (wxDirExists(dir))
-        {
-            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
-        }
+        m_fc.SetDirectory( dir );
     }
     else
         wxGenericFileDialog::SetDirectory( dir );
@@ -393,8 +381,7 @@ wxString wxFileDialog::GetDirectory() const
 {
     if (!gtk_check_version(2,4,0))
     {
-        wxGtkString str(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(m_widget)));
-        return wxConvFileName->cMB2WX(str);
+        m_fc.GetDirectory();
     }
 
     return wxGenericFileDialog::GetDirectory();
@@ -416,7 +403,7 @@ void wxFileDialog::SetFilename(const wxString& name)
 wxString wxFileDialog::GetFilename() const
 {
     if (!gtk_check_version(2,4,0))
-        return wxFileName(GetPath()).GetFullName();
+        return m_fc.GetFilename();
     else
         return wxGenericFileDialog::GetFilename();
 }
@@ -425,49 +412,7 @@ void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
     if (!gtk_check_version(2,4,0))
     {
-        // parse filters
-        wxArrayString wildDescriptions, wildFilters;
-        if (!wxParseCommonDialogsFilter(wildCard, wildDescriptions, wildFilters))
-        {
-            wxFAIL_MSG( wxT("wxFileDialog::SetWildCard - bad wildcard string") );
-        }
-        else
-        {
-            // Parsing went fine. Set m_wildCard to be returned by wxFileDialogBase::GetWildcard
-            m_wildCard = wildCard;
-
-            GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);
-
-            // empty current filter list:
-            GSList* ifilters = gtk_file_chooser_list_filters(chooser);
-            GSList* filters = ifilters;
-
-            while (ifilters)
-            {
-                gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data));
-                ifilters = ifilters->next;
-            }
-            g_slist_free(filters);
-
-            // add parsed to GtkChooser
-            for (size_t n = 0; n < wildFilters.GetCount(); ++n)
-            {
-                GtkFileFilter* filter = gtk_file_filter_new();
-                gtk_file_filter_set_name(filter, wxGTK_CONV(wildDescriptions[n]));
-
-                wxStringTokenizer exttok(wildFilters[n], wxT(";"));
-                while (exttok.HasMoreTokens())
-                {
-                    wxString token = exttok.GetNextToken();
-                    gtk_file_filter_add_pattern(filter, wxGTK_CONV(token));
-                }
-
-                gtk_file_chooser_add_filter(chooser, filter);
-            }
-
-            // Reset the filter index
-            SetFilterIndex(0);
-        }
+        m_fc.SetWildcard( wildCard );
     }
     else
         wxGenericFileDialog::SetWildcard( wildCard );
@@ -478,22 +423,7 @@ void wxFileDialog::SetFilterIndex(int filterIndex)
 
     if (!gtk_check_version(2,4,0))
     {
-        gpointer filter;
-        GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
-        GSList *filters = gtk_file_chooser_list_filters(chooser);
-
-        filter = g_slist_nth_data(filters, filterIndex);
-
-        if (filter != NULL)
-        {
-            gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(filter));
-        }
-        else
-        {
-            wxFAIL_MSG( wxT("wxFileDialog::SetFilterIndex - bad filter index") );
-        }
-
-        g_slist_free(filters);
+       m_fc.SetFilterIndex( filterIndex);
     }
     else
         wxGenericFileDialog::SetFilterIndex( filterIndex );
@@ -503,19 +433,7 @@ int wxFileDialog::GetFilterIndex() const
 {
     if (!gtk_check_version(2,4,0))
     {
-        GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
-        GtkFileFilter *filter = gtk_file_chooser_get_filter(chooser);
-        GSList *filters = gtk_file_chooser_list_filters(chooser);
-        gint index = g_slist_index(filters, filter);
-        g_slist_free(filters);
-
-        if (index == -1)
-        {
-            wxFAIL_MSG( wxT("wxFileDialog::GetFilterIndex - bad filter index returned by gtk+") );
-            return 0;
-        }
-        else
-            return index;
+        return m_fc.GetFilterIndex();
     }
     else
                 return wxGenericFileDialog::GetFilterIndex();