Crash fix under VC++

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

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index a3fcec04f14f4bc60a8f896e5882c8b65d8b68ed..adb8f61207321d7791d2a68b1db9999a25af7c53 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gtk/filedlg.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gtk/filedlg.cpp

-// Purpose:
-// Author:      Robert Roebling
+// Purpose:     native implementation of wxFileDialog
+// Author:      Robert Roebling, Zbigniew Zagorski

 // Id:          $Id$
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling
+// Copyright:   (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,12 +14,16 @@
 // 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 && defined(__WXGTK24__)
+

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

-#include "wx/generic/msgdlgg.h"
+#include "wx/filename.h"
+#include "wx/msgdlg.h"

 
 #include <gtk/gtk.h>
 
 #include <gtk/gtk.h>

+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -28,94 +32,91 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 

-//-----------------------------------------------------------------------------
-// "delete_event"
-//-----------------------------------------------------------------------------
-
-static
-bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-    win->Close();
-
-    return TRUE;
-}
-

 //-----------------------------------------------------------------------------
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 

-static
-void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dialog )
+static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     int style = dialog->GetStyle();
     int style = dialog->GetStyle();

+    gchar* text = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
+    wxString filename(wxGTK_CONV_BACK(text));

 
 

-    GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->m_widget);
-    char *filename = gtk_file_selection_get_filename(filedlg);
-
-    if ( (style & wxSAVE) && ( style & wxOVERWRITE_PROMPT ) )
+    if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT))

     {
     {

-        if (wxFileExists( filename ))
+        if (wxFileExists(filename))

         {
             wxString msg;
         {
             wxString msg;

-            msg.Printf( _("File '%s' already exists, do you really want to "
-                         "overwrite it?"), filename);
+            msg.Printf(
+             _("File '%s' already exists, do you really want to overwrite it?"),
+             filename.c_str());

 
 

-            if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
+            wxMessageDialog dlg(dialog, msg, _("Confirm"),
+                               wxYES_NO | wxICON_QUESTION);
+            if (dlg.ShowModal() != wxID_YES)

                 return;
         }
     }
                 return;
         }
     }

-    else if ( (style & wxOPEN) && ( style & wxFILE_MUST_EXIST) )
+    else if ((style & wxOPEN) && ( style & wxFILE_MUST_EXIST))

     {
     {

-        if ( !wxFileExists( filename ) )
+        if (!wxFileExists( filename ))

         {
         {

-            wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK);
+            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
 
             return;
         }
     }
 
     // change to the directory where the user went if asked

-    if ( style & wxCHANGE_DIR )
+    if (style & wxCHANGE_DIR)

     {
         wxString cwd;
         wxSplitPath(filename, &cwd, NULL, NULL);
 
     {
         wxString cwd;
         wxSplitPath(filename, &cwd, NULL, NULL);
 

-        if ( cwd != wxGetCwd() )
+        if (cwd != wxGetCwd())

         {
             wxSetWorkingDirectory(cwd);
         }
     }
 
         {
             wxSetWorkingDirectory(cwd);
         }
     }
 

-    dialog->SetPath( filename );
-
+    dialog->SetPath(filename);
+    dialog->UpdateFromDialog();
+    

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);

-    event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );
+    event.SetEventObject(dialog);
+    dialog->GetEventHandler()->ProcessEvent(event);

 }
 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button
 //-----------------------------------------------------------------------------
 

-static
-void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFileDialog *dialog )
+static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w),
+                                           wxFileDialog *dialog)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);

-    event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );
+    event.SetEventObject(dialog);
+    dialog->GetEventHandler()->ProcessEvent(event);
+}
+
+static void gtk_filedialog_response_callback(GtkWidget *w,
+                                             int response,
+                                             wxFileDialog *dialog)
+{
+    wxapp_install_idle_handler();
+    
+    if (response == GTK_RESPONSE_ACCEPT)
+        gtk_filedialog_ok_callback(w, dialog);
+    else if (response == GTK_RESPONSE_CANCEL)
+        gtk_filedialog_cancel_callback(w, dialog);
+    else // "delete"
+    {
+        gtk_filedialog_cancel_callback(w, dialog);
+        dialog->m_destroyed_by_delete = TRUE;
+    }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -124,66 +125,276 @@ void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFileDialog *dialo
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase)
 

-wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
-                            const wxString& defaultDir, const wxString& defaultFileName,
-                            const wxString& wildCard,
-                            long style, const wxPoint& pos )
-             :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)
+wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
+                           const wxString& defaultDir,
+                           const wxString& defaultFileName,
+                           const wxString& wildCard,
+                           long style, const wxPoint& pos)
+    : wxFileDialogBase(parent, message, defaultDir, defaultFileName,
+                       wildCard, style, pos)

 {
     m_needParent = FALSE;
 {
     m_needParent = FALSE;

+    m_destroyed_by_delete = FALSE;

 
 

-    if (!PreCreation( parent, pos, wxDefaultSize ) ||
-        !CreateBase( parent, wxID_ANY, pos, wxDefaultSize, style, wxDefaultValidator, wxT("filedialog") ))
+    if (!PreCreation(parent, pos, wxDefaultSize) ||
+        !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
+                    wxDefaultValidator, wxT("filedialog")))

     {
     {

-        wxFAIL_MSG( wxT("wxXX creation failed") );
+        wxFAIL_MSG( wxT("wxFileDialog creation failed") );

         return;
     }
 
         return;
     }
 

-    m_widget = gtk_file_selection_new( m_message.mbc_str() );
+    bool multiple = (style & wxMULTIPLE) == wxMULTIPLE;
+    GtkFileChooserAction gtk_action;
+    GtkWindow* gtk_parent = NULL;
+    if (parent)
+        gtk_parent = GTK_WINDOW(parent->m_widget);
+    
+    gchar* ok_btn_stock;
+    if ((style & wxSAVE) == wxSAVE)
+    {
+        gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
+        ok_btn_stock = GTK_STOCK_SAVE;
+    }
+    else
+    {
+        gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
+        ok_btn_stock = GTK_STOCK_OPEN;
+    }
+    m_widget = gtk_file_chooser_dialog_new(
+                       wxGTK_CONV(m_message),
+                       gtk_parent,
+                       gtk_action,
+                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                       ok_btn_stock, GTK_RESPONSE_ACCEPT,
+                       NULL);
+
+    gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), multiple);
+        
+    gtk_signal_connect(GTK_OBJECT(m_widget),
+                             "response", 
+                             GTK_SIGNAL_FUNC(gtk_filedialog_response_callback),
+                             (gpointer*)this);
+    
+    m_path = m_dir;
+    if (!m_path.empty() && m_path.Last() != wxT('/'))
+        m_path += wxT('/');
+    m_path += m_fileName;
+    SetPath(m_path);
+    
+    SetWildcard(wildCard);
+    SetFilterIndex(0);
+}
+
+wxFileDialog::~wxFileDialog()
+{
+    if (m_destroyed_by_delete)
+        m_widget = NULL;
+}
+
+void wxFileDialog::GetFilenames(wxArrayString& files) const 
+{
+    GetPaths(files);
+    for (size_t n = 0; n < files.GetCount(); n++ )
+    {
+        wxString name,ext;
+        wxSplitPath(files[n], NULL, &name, &ext);
+        if (!ext.IsEmpty())
+        {
+            name += wxT(".");
+            name += ext;
+        }
+        files[n] = name;
+    }
+}
+
+void wxFileDialog::GetPaths(wxArrayString& paths) const 
+{
+    paths.Empty(); 
+    if (GetWindowStyle() & wxMULTIPLE)
+    {
+        GSList *gpathsi = 
+            gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
+        GSList *gpaths = gpathsi;
+        while (gpathsi)
+        {
+            wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data);
+            paths.Add(file);
+            g_free(gpathsi->data);
+            gpathsi = gpathsi->next;
+        }
+        if (gpaths) 
+            g_slist_free(gpaths);
+    }
+    else
+    {
+        paths.Add(m_fileName);
+    }
+}

 
 

-    int x = (gdk_screen_width () - 400) / 2;
-    int y = (gdk_screen_height () - 400) / 2;
-    gtk_widget_set_uposition( m_widget, x, y );
+void wxFileDialog::SetMessage(const wxString& message)
+{
+    m_message = message;
+    SetTitle(message);
+}

 
 

-    GtkFileSelection *sel = GTK_FILE_SELECTION(m_widget);
-    gtk_file_selection_hide_fileop_buttons( sel ); // they don't work anyway
+void wxFileDialog::SetPath(const wxString& path)
+{
+    if (path.empty()) return;

 
 

-    m_path.Append(m_dir);
-    if( ! m_path.IsEmpty() && m_path.Last()!=wxT('/') )
-        m_path.Append('/');
-    m_path.Append(m_fileName);
+    wxFileName fn(path);
+    m_path = fn.GetFullPath();
+    m_dir = fn.GetPath();
+    m_fileName = fn.GetFullName();
+    UpdateDialog();
+}

 
 

-    if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path.mbc_str());
+void wxFileDialog::SetDirectory(const wxString& dir)
+{
+    if (wxDirExists(dir))
+    {
+        m_dir = dir;
+        m_path = wxFileName(m_dir, m_fileName).GetFullPath();
+        UpdateDialog();
+    }
+}

 
 

-    gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
-      GTK_SIGNAL_FUNC(gtk_filedialog_ok_callback), (gpointer*)this );
+void wxFileDialog::SetFilename(const wxString& name)
+{
+    m_fileName = name;
+    m_path = wxFileName(m_dir, m_fileName).GetFullPath();
+    UpdateDialog();
+}

 
 

-    // strange way to internationalize
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), wxConvCurrent->cWX2MB(_("OK")) );
+void wxFileDialog::UpdateDialog()
+{
+    // set currently selected directory to match the path:
+    if (!m_dir.empty() && wxDirExists(m_dir))
+    {
+        // NB: This is important -- if we set directory only and not the path,
+        //     then dialog will still remember old path set using previous
+        //     call to gtk_chooser_set_filename. If the previous directory
+        //     was a subdirectory of the directory we want to select now,
+        //     the dialog would still contain directory selector controls
+        //     for the subdirectory (with the parent directory selected),
+        //     instead of showing only the parent directory as expected.
+        //     This way, we force GtkFileChooser to really change the
+        //     directory. Finally, it doesn't have to be done if filename
+        //     is not empty because of the code that sets the filename below.
+        if (m_fileName.empty())
+            gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
+                                          wxGTK_CONV(m_dir));
+        
+        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
+                                            wxGTK_CONV(m_dir));
+    }
+    
+    // if the user set only the directory (e.g. by calling SetDirectory)
+    // and not the default filename, then we don't want to set the filename:
+    if (!m_fileName.empty())
+    {
+        gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
+                                      wxGTK_CONV(m_path));
+                                          
+        // pre-fill the filename when saving, too (there's no text entry
+        // control when opening a file, so it doesn't make sense to
+        // do this when opening files):
+        if (GetWindowStyle() & wxSAVE)
+        {
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
+                                              wxGTK_CONV(m_fileName));
+        }
+    }
+}

 
 

-    gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
-      GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );
+void wxFileDialog::SetWildcard(const wxString& wildCard)
+{
+    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);
+    
+    // parse filters
+    wxArrayString wildDescriptions, wildFilters;
+    if (!wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters))
+    {
+        wxFAIL_MSG( wxT("Wrong file type description") );
+    }
+    else
+    {
+        // 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]));
+            wxString after = wildFilters[n];
+            do
+            {
+                wxString ext = after.BeforeFirst(wxT(';'));
+                gtk_file_filter_add_pattern(filter,wxGTK_CONV(ext));
+                if (after.Find(wxT(';')) == wxNOT_FOUND)
+                    break;
+                after = after.AfterLast(wxT(';'));
+            }
+            while (!after.empty());
+            
+            gtk_file_chooser_add_filter(chooser, filter);
+        }
+    }
+}

 
 

-    // strange way to internationalize
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) );
+void wxFileDialog::SetFilterIndex(int filterIndex)
+{
+    m_filterIndex = filterIndex;

 
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-        GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
+    GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
+    GSList *fnode = gtk_file_chooser_list_filters(chooser);
+    GSList *filters = fnode;
+    int i = 0;
+    while (fnode)
+    {
+        if (i == filterIndex)
+        {
+            gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
+            m_filterIndex = i;
+            break;
+        }
+        i++;
+        fnode = fnode->next;
+    }
+    g_slist_free(filters);

 }
 
 }
 

-void wxFileDialog::SetPath(const wxString& path)
+void wxFileDialog::UpdateFromDialog()

 {
 {

-    // not only set the full path but also update filename and dir
-    m_path = path;
-    if ( !!path )
+    // update filterIndex
+    GSList *fnode = gtk_file_chooser_list_filters(GTK_FILE_CHOOSER(m_widget));
+    GSList *filters = fnode;
+    GtkFileFilter *current =
+        gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_widget));
+    
+    int i = 0;
+    m_filterIndex = 0;
+    while (fnode)

     {
     {

-        wxString ext;
-        wxSplitPath(path, &m_dir, &m_fileName, &ext);
-        if (!ext.IsEmpty())
+        if (fnode->data == (gpointer)current)

         {
         {

-            m_fileName += wxT(".");
-            m_fileName += ext;
+            m_filterIndex = i;
+            break;

         }
         }

+        i++;
+        fnode = fnode->next;

     }
     }

+    g_slist_free(filters);

 }
 
 }
 

+#endif // wxUSE_FILEDLG && defined(__WXGTK24__)