Fix return value of wxCountingOutputStream::LastWrite().

[wxWidgets.git] / src / gtk / filedlg.cpp

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 62fc00864ac85c74969cabff6f65cbe39b8b1af8..aa00e8c42198d4f150beb36503f0280e362377e9 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -10,7 +10,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if wxUSE_FILEDLG 
+#if wxUSE_FILEDLG

 
 #include "wx/filedlg.h"
 
 
 #include "wx/filedlg.h"
 


@@ -22,91 +22,25 @@
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 

+#ifdef __UNIX__

 #include <unistd.h> // chdir
 #include <unistd.h> // chdir

+#endif

 
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd
 
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd

-
-//-----------------------------------------------------------------------------
-// "clicked" for OK-button
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
-{
-    int style = dialog->GetWindowStyle();
-    wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
-
-    // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation)
-#if GTK_CHECK_VERSION(2,7,3)
-    if(gtk_check_version(2,7,3) != NULL)
-#endif
-    if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))
-    {
-        if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
-        {
-            wxString msg;
-
-            msg.Printf(
-                _("File '%s' already exists, do you really want to overwrite it?"),
-                wxString(filename, *wxConvFileName));
-
-            wxMessageDialog dlg(dialog, msg, _("Confirm"),
-                               wxYES_NO | wxICON_QUESTION);
-            if (dlg.ShowModal() != wxID_YES)
-                return;
-        }
-    }
-
-    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)
-    {
-        // Use chdir to not care about filename encodings
-        wxGtkString folder(g_path_get_dirname(filename));
-        chdir(folder);
-    }
-
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-    event.SetEventObject(dialog);
-    dialog->HandleWindowEvent(event);
-}
-}
-
-//-----------------------------------------------------------------------------
-// "clicked" for Cancel-button
-//-----------------------------------------------------------------------------
+#include "wx/testing.h"

 
 extern "C"
 {
 
 extern "C"
 {

-
-static void
-gtk_filedialog_cancel_callback(GtkWidget * WXUNUSED(w), wxFileDialog *dialog)
-{
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    event.SetEventObject(dialog);
-    dialog->HandleWindowEvent(event);
-}
-
-static void gtk_filedialog_response_callback(GtkWidget *w,
+static void gtk_filedialog_response_callback(GtkWidget * WXUNUSED(w),

                                              gint response,
                                              wxFileDialog *dialog)
 {
     if (response == GTK_RESPONSE_ACCEPT)
                                              gint response,
                                              wxFileDialog *dialog)
 {
     if (response == GTK_RESPONSE_ACCEPT)

-        gtk_filedialog_ok_callback(w, dialog);
+        dialog->GTKOnAccept();

     else    // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
     else    // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE

-        gtk_filedialog_cancel_callback(w, dialog);
+        dialog->GTKOnCancel();

 }
 
 static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
 }
 
 static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,


@@ -131,11 +65,15 @@ static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
 
 } // extern "C"
 
 
 } // extern "C"
 

-static void wxInsertChildInFileDialog(wxWindow* WXUNUSED(parent),
-                                      wxWindow* WXUNUSED(child))
+void wxFileDialog::AddChildGTK(wxWindowGTK* child)

 {
 {

-}
+    // allow dialog to be resized smaller horizontally
+    gtk_widget_set_size_request(
+        child->m_widget, child->GetMinWidth(), child->m_height);

 
 

+    gtk_file_chooser_set_extra_widget(
+        GTK_FILE_CHOOSER(m_widget), child->m_widget);
+}

 
 //-----------------------------------------------------------------------------
 // wxFileDialog
 
 //-----------------------------------------------------------------------------
 // wxFileDialog


@@ -144,7 +82,6 @@ static void wxInsertChildInFileDialog(wxWindow* WXUNUSED(parent),
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase)
 
 BEGIN_EVENT_TABLE(wxFileDialog,wxFileDialogBase)
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase)
 
 BEGIN_EVENT_TABLE(wxFileDialog,wxFileDialogBase)

-    EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk)

     EVT_SIZE(wxFileDialog::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(wxFileDialog::OnSize)
 END_EVENT_TABLE()
 


@@ -157,13 +94,23 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& name)
     : wxFileDialogBase()
 {
                            const wxString& name)
     : wxFileDialogBase()
 {

-    m_insertCallback = wxInsertChildInFileDialog;
-    parent = GetParentForModalDialog(parent);
-    
+    Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name);
+}
+
+bool wxFileDialog::Create(wxWindow *parent, const wxString& message,
+                           const wxString& defaultDir,
+                           const wxString& defaultFileName,
+                           const wxString& wildCard,
+                           long style, const wxPoint& pos,
+                           const wxSize& sz,
+                           const wxString& name)
+{
+    parent = GetParentForModalDialog(parent, style);
+

     if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName,
                                   wildCard, style, pos, sz, name))
     {
     if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName,
                                   wildCard, style, pos, sz, name))
     {

-        return;
+        return false;

     }
 
     if (!PreCreation(parent, pos, wxDefaultSize) ||
     }
 
     if (!PreCreation(parent, pos, wxDefaultSize) ||


@@ -171,7 +118,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                 wxDefaultValidator, wxT("filedialog")))
     {
         wxFAIL_MSG( wxT("wxFileDialog creation failed") );
                 wxDefaultValidator, wxT("filedialog")))
     {
         wxFAIL_MSG( wxT("wxFileDialog creation failed") );

-        return;
+        return false;

     }
 
     GtkFileChooserAction gtk_action;
     }
 
     GtkFileChooserAction gtk_action;


@@ -198,27 +145,29 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                    ok_btn_stock, GTK_RESPONSE_ACCEPT,
                    NULL);
                    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                    ok_btn_stock, GTK_RESPONSE_ACCEPT,
                    NULL);

+    g_object_ref(m_widget);
+    GtkFileChooser* file_chooser = GTK_FILE_CHOOSER(m_widget);

 
 

-    m_fc.SetWidget( GTK_FILE_CHOOSER(m_widget) );
+    m_fc.SetWidget(file_chooser);

 
     gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
 
     if ( style & wxFD_MULTIPLE )
 
     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_file_chooser_set_select_multiple(file_chooser, 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),
+    g_signal_connect(m_widget,

                     "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete),
                     "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete),

-                    (gpointer)this);
+                    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
 
     // 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", ...
+    // 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);
     // (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);


@@ -226,16 +175,30 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     g_signal_connect (m_widget, "response",
         G_CALLBACK (gtk_filedialog_response_callback), this);
 
     g_signal_connect (m_widget, "response",
         G_CALLBACK (gtk_filedialog_response_callback), this);
 

+
+    // deal with extensions/filters

     SetWildcard(wildCard);
 
     SetWildcard(wildCard);
 

+    wxString defaultFileNameWithExt = defaultFileName;
+    if ( !wildCard.empty() && !defaultFileName.empty() &&
+            !wxFileName(defaultFileName).HasExt() )
+    {
+        // append the default extension to the initial file name: GTK won't do
+        // it for us by default (unlike e.g. MSW)
+        const wxString defaultExt = m_fc.GetCurrentWildCard().AfterFirst('.');
+        if ( defaultExt.find_first_of("?*") == wxString::npos )
+            defaultFileNameWithExt += "." + defaultExt;
+    }
+
+

     // 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() )
     // 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);
+        fn.Assign(defaultFileNameWithExt);
+    else if ( !defaultFileNameWithExt.empty() )
+        fn.Assign(defaultDir, defaultFileNameWithExt);

     else
         fn.AssignDir(defaultDir);
 
     else
         fn.AssignDir(defaultDir);
 


@@ -244,8 +207,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     const wxString dir = fn.GetPath();
     if ( !dir.empty() )
     {
     const wxString dir = fn.GetPath();
     if ( !dir.empty() )
     {

-        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
-                                            dir.fn_str());
+        gtk_file_chooser_set_current_folder(file_chooser, wxGTK_CONV_FN(dir));

     }
 
     const wxString fname = fn.GetFullName();
     }
 
     const wxString fname = fn.GetFullName();


@@ -253,21 +215,26 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     {
         if ( !fname.empty() )
         {
     {
         if ( !fname.empty() )
         {

-            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
-                                              fname.fn_str());
+            gtk_file_chooser_set_current_name(file_chooser, wxGTK_CONV_FN(fname));

         }
 
 #if GTK_CHECK_VERSION(2,7,3)
         }
 
 #if GTK_CHECK_VERSION(2,7,3)

-        if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
-            gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE);
+        if ((style & wxFD_OVERWRITE_PROMPT)
+#ifndef __WXGTK3__
+            && gtk_check_version(2,7,3) == NULL
+#endif
+            )
+        {
+            gtk_file_chooser_set_do_overwrite_confirmation(file_chooser, true);
+        }

 #endif
     }
     else // wxFD_OPEN
     {
         if ( !fname.empty() )
         {
 #endif
     }
     else // wxFD_OPEN
     {
         if ( !fname.empty() )
         {

-            gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
-                                          fn.GetFullPath().fn_str());
+            gtk_file_chooser_set_filename(file_chooser,
+                                          wxGTK_CONV_FN(fn.GetFullPath()));

         }
     }
 
         }
     }
 


@@ -275,37 +242,93 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     {
         GtkWidget *previewImage = gtk_image_new();
 
     {
         GtkWidget *previewImage = gtk_image_new();
 

-        gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(m_widget),
-                                            previewImage);
+        gtk_file_chooser_set_preview_widget(file_chooser, previewImage);

         g_signal_connect(m_widget, "update-preview",
                          G_CALLBACK(gtk_filedialog_update_preview_callback),
                          previewImage);
     }
         g_signal_connect(m_widget, "update-preview",
                          G_CALLBACK(gtk_filedialog_update_preview_callback),
                          previewImage);
     }

-}

 
 

+    return true;
+}

 
 

-void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
+wxFileDialog::~wxFileDialog()

 {
 {

-    EndDialog(wxID_OK);
+    if (m_extraControl)
+    {
+        // get chooser to drop its reference right now, allowing wxWindow dtor
+        // to verify that ref count drops to zero
+        gtk_file_chooser_set_extra_widget(
+            GTK_FILE_CHOOSER(m_widget), NULL);
+    }

 }
 }

-
-int wxFileDialog::ShowModal()
+void wxFileDialog::GTKOnAccept()

 {
 {

-    if (CreateExtraControl())
+    int style = GetWindowStyle();
+    wxString filename = m_fc.GetPath();
+    m_selectedDirectory = m_fc.GetDirectory();
+
+    // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation)
+#ifndef __WXGTK3__
+#if GTK_CHECK_VERSION(2,7,3)
+    if (gtk_check_version(2, 7, 3) != NULL)
+#endif

     {
     {

-        GtkWidget *control = m_extraControl->m_widget;
+        if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))
+        {
+            if ( g_file_test(filename.utf8_str(), G_FILE_TEST_EXISTS) )
+            {
+                wxString msg;
+
+                msg.Printf(
+                    _("File '%s' already exists, do you really want to overwrite it?"),
+                    wxString::FromUTF8(filename.utf8_str()));
+
+                wxMessageDialog dlg(this, msg, _("Confirm"),
+                                   wxYES_NO | wxICON_QUESTION);
+                if (dlg.ShowModal() != wxID_YES)
+                    return;
+            }
+        }
+    }
+#endif

 
 

-        wxASSERT(control->parent == NULL);
+    if (style & wxFD_FILE_MUST_EXIST)
+    {
+        if ( !g_file_test(filename.utf8_str(), G_FILE_TEST_EXISTS) )
+        {
+            wxMessageDialog dlg( this, _("Please choose an existing file."),
+                                 _("Error"), wxOK| wxICON_ERROR);
+            dlg.ShowModal();
+            return;
+        }
+    }

 
 

-        gtk_widget_show(control);
-        gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(m_widget), control);
+    // change to the directory where the user went if asked
+    if (style & wxFD_CHANGE_DIR)
+    {
+        // Use chdir to not care about filename encodings
+        wxGtkString folder(g_path_get_dirname(filename.utf8_str()));
+        chdir(folder);

     }
     }

+    EndDialog(wxID_OK);
+}
+
+void wxFileDialog::GTKOnCancel()
+{
+    EndDialog(wxID_CANCEL);
+}
+
+int wxFileDialog::ShowModal()
+{
+    WX_TESTING_SHOW_MODAL_HOOK();
+
+    CreateExtraControl();

 
     return wxDialog::ShowModal();
 }
 
 
     return wxDialog::ShowModal();
 }
 

-void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), 
-                             int WXUNUSED(width), int WXUNUSED(height), 
+void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
+                             int WXUNUSED(width), int WXUNUSED(height),

                              int WXUNUSED(sizeFlags))
 {
 }
                              int WXUNUSED(sizeFlags))
 {
 }


@@ -339,40 +362,76 @@ void wxFileDialog::SetMessage(const wxString& message)
 
 void wxFileDialog::SetPath(const wxString& path)
 {
 
 void wxFileDialog::SetPath(const wxString& path)
 {

-    m_fc.SetPath( path );
+    wxFileDialogBase::SetPath(path);
+
+    // Don't do anything if no path is specified, in particular don't set the
+    // path to m_dir below as this would result in opening the dialog in the
+    // parent directory of this one instead of m_dir itself.
+    if ( path.empty() )
+        return;
+
+    // we need an absolute path for GTK native chooser so ensure that we have
+    // it: use the initial directory if it was set or just CWD otherwise (this
+    // is the default behaviour if m_dir is empty)
+    wxFileName fn(path);
+    fn.MakeAbsolute(m_dir);
+    m_fc.SetPath(fn.GetFullPath());

 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {

-    m_fc.SetDirectory( dir );
+    wxFileDialogBase::SetDirectory(dir);
+
+    m_fc.SetDirectory(dir);
+    m_selectedDirectory = dir;

 }
 
 wxString wxFileDialog::GetDirectory() const
 {
 }
 
 wxString wxFileDialog::GetDirectory() const
 {

-    return m_fc.GetDirectory();
+    return m_selectedDirectory;

 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {

+    wxFileDialogBase::SetFilename(name);
+

     if (HasFdFlag(wxFD_SAVE))
     if (HasFdFlag(wxFD_SAVE))

+    {

         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));

+    }
+

     else
     else

-        SetPath(wxFileName(GetDirectory(), name).GetFullPath());
+    {
+        wxString path( GetDirectory() );
+        if (path.empty())
+        {
+            // SetPath() fires an assert if fed other than filepaths
+            return;
+        }
+        SetPath(wxFileName(path, name).GetFullPath());
+    }

 }
 
 wxString wxFileDialog::GetFilename() const
 {
 }
 
 wxString wxFileDialog::GetFilename() const
 {

-    return m_fc.GetFilename();
+    wxString currentFilename( m_fc.GetFilename() );
+    if (currentFilename.empty())
+    {
+        // m_fc.GetFilename() will return empty until the dialog has been shown
+        // in which case use any previously provided value
+        currentFilename = m_fileName;
+    }
+    return currentFilename;

 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {

-    m_fc.SetWildcard( wildCard );
+    wxFileDialogBase::SetWildcard(wildCard);
+    m_fc.SetWildcard( GetWildcard() );

 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {

-

     m_fc.SetFilterIndex( filterIndex);
 }
 
     m_fc.SetFilterIndex( filterIndex);
 }
 


@@ -381,4 +440,4 @@ int wxFileDialog::GetFilterIndex() const
     return m_fc.GetFilterIndex();
 }
 
     return m_fc.GetFilterIndex();
 }
 

-#endif // wxUSE_FILEDLG 
+#endif // wxUSE_FILEDLG