X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01b92baa9c59457765e7a5ed1df74f45d4bcd80b..713c7336f2c96b1deddd24ec38b2a094705635b9:/src/gtk/filedlg.cpp diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 3c909e79bf..cff12d8f6f 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -1,39 +1,32 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/filedlg.cpp +// Name: src/gtk/filedlg.cpp // Purpose: native implementation of wxFileDialog -// Author: Robert Roebling, Zbigniew Zagorski +// Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski +// Copyright: (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "filedlggtk.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #if wxUSE_FILEDLG #include "wx/filedlg.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/filename.h" -#include "wx/msgdlg.h" -#include "wx/log.h" -#include +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/msgdlg.h" +#endif -#ifdef __WXGTK24__ +#include #include "wx/gtk/private.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#include // chdir -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include "wx/filename.h" // wxFilename +#include "wx/tokenzr.h" // wxStringTokenizer +#include "wx/filefn.h" // ::wxGetCwd //----------------------------------------------------------------------------- // "clicked" for OK-button @@ -42,62 +35,54 @@ extern bool g_isIdle; extern "C" { static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) { - int style = dialog->GetStyle(); - gchar* text = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); - wxString filename(wxGTK_CONV_BACK(text)); - if ( filename.empty() ) - { - // this is totally lame but better than silent error - wxLogWarning(_("This filename can't be used by wxWidgets because it contains invalid UTF-8 characters, please rename the file.")); - return; - } + int style = dialog->GetWindowStyle(); + wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget))); - if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT)) + // 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 (wxFileExists(filename)) + if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT)) { - wxString msg; - msg.Printf( - _("File '%s' already exists, do you really want to overwrite it?"), - filename.c_str()); - - wxMessageDialog dlg(dialog, msg, _("Confirm"), - wxYES_NO | wxICON_QUESTION); - if (dlg.ShowModal() != wxID_YES) - return; + 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::FromUTF8(filename)); + + wxMessageDialog dlg(dialog, msg, _("Confirm"), + wxYES_NO | wxICON_QUESTION); + if (dlg.ShowModal() != wxID_YES) + return; + } } } - else if ((style & wxOPEN) && ( style & wxFILE_MUST_EXIST)) + + if (style & wxFD_FILE_MUST_EXIST) { - if (!wxFileExists( filename )) + if ( !g_file_test(filename, G_FILE_TEST_EXISTS) ) { - wxMessageDialog dlg(dialog, - _("Please choose an existing file."), - _("Error"), wxOK | wxICON_ERROR); + 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 & wxCHANGE_DIR) + if (style & wxFD_CHANGE_DIR) { - wxString cwd; - wxSplitPath(filename, &cwd, NULL, NULL); - - if (cwd != wxGetCwd()) - { - wxSetWorkingDirectory(cwd); - } + // Use chdir to not care about filename encodings + wxGtkString folder(g_path_get_dirname(filename)); + chdir(folder); } - dialog->SetPath(filename); - dialog->UpdateFromDialog(); - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); event.SetEventObject(dialog); - dialog->GetEventHandler()->ProcessEvent(event); + dialog->HandleWindowEvent(event); } } @@ -105,418 +90,361 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) // "clicked" for Cancel-button //----------------------------------------------------------------------------- -extern "C" { -static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w), - wxFileDialog *dialog) +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->GetEventHandler()->ProcessEvent(event); -} + dialog->HandleWindowEvent(event); } -extern "C" { static void gtk_filedialog_response_callback(GtkWidget *w, - int response, + gint response, wxFileDialog *dialog) { - wxapp_install_idle_handler(); - if (response == GTK_RESPONSE_ACCEPT) gtk_filedialog_ok_callback(w, dialog); - else if (response == GTK_RESPONSE_CANCEL) + else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE gtk_filedialog_cancel_callback(w, dialog); - else // "delete" - { - gtk_filedialog_cancel_callback(w, dialog); - dialog->m_destroyed_by_delete = true; - } } + +static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser, + gpointer user_data) +{ + GtkWidget *preview = GTK_WIDGET(user_data); + + wxGtkString filename(gtk_file_chooser_get_preview_filename(chooser)); + + if ( !filename ) + return; + + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size(filename, 128, 128, NULL); + gboolean have_preview = pixbuf != NULL; + + gtk_image_set_from_pixbuf(GTK_IMAGE(preview), pixbuf); + if ( pixbuf ) + g_object_unref (pixbuf); + + gtk_file_chooser_set_preview_widget_active(chooser, have_preview); } -#endif // __WXGTK24__ +} // extern "C" + +//----------------------------------------------------------------------------- +// "size_request" from m_extraControl +//----------------------------------------------------------------------------- + +extern "C" { +static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow* win) +{ + // allow dialog to be resized smaller horizontally + req->width = win->GetMinWidth(); +} +} + +void wxFileDialog::AddChildGTK(wxWindowGTK* child) +{ + g_signal_connect_after(child->m_widget, "size_request", + G_CALLBACK(extra_widget_size_request), child); + gtk_file_chooser_set_extra_widget( + GTK_FILE_CHOOSER(m_widget), child->m_widget); +} //----------------------------------------------------------------------------- // wxFileDialog //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxGenericFileDialog) +IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase) -BEGIN_EVENT_TABLE(wxFileDialog,wxGenericFileDialog) - EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk) +BEGIN_EVENT_TABLE(wxFileDialog,wxFileDialogBase) + EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk) + EVT_SIZE(wxFileDialog::OnSize) END_EVENT_TABLE() wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard, - long style, const wxPoint& pos) - : wxGenericFileDialog(parent, message, defaultDir, defaultFileName, - wildCard, style, pos, true ) + long style, const wxPoint& pos, + const wxSize& sz, + const wxString& name) + : wxFileDialogBase() { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + parent = GetParentForModalDialog(parent, style); + + if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName, + wildCard, style, pos, sz, name)) { - m_needParent = false; - m_destroyed_by_delete = false; + return; + } - if (!PreCreation(parent, pos, wxDefaultSize) || - !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, - wxDefaultValidator, wxT("filedialog"))) - { - wxFAIL_MSG( wxT("wxFileDialog creation failed") ); - return; - } + if (!PreCreation(parent, pos, wxDefaultSize) || + !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, + wxDefaultValidator, wxT("filedialog"))) + { + wxFAIL_MSG( wxT("wxFileDialog creation failed") ); + return; + } - bool multiple = (style & wxMULTIPLE) == wxMULTIPLE; - GtkFileChooserAction gtk_action; - GtkWindow* gtk_parent = NULL; - if (parent) - gtk_parent = GTK_WINDOW(parent->m_widget); + GtkFileChooserAction gtk_action; + GtkWindow* gtk_parent = NULL; + if (parent) + gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) ); - gchar* ok_btn_stock; - if ((style & wxSAVE) == wxSAVE) + const gchar* ok_btn_stock; + if ( style & wxFD_SAVE ) + { + 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); + g_object_ref(m_widget); + GtkFileChooser* file_chooser = 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_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... + g_signal_connect(m_widget, + "delete_event", + G_CALLBACK (gtk_widget_hide_on_delete), + 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: + // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); + + g_signal_connect (m_widget, "response", + G_CALLBACK (gtk_filedialog_response_callback), this); + + + // deal with extensions/filters + 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() ) + fn.Assign(defaultFileNameWithExt); + else if ( !defaultFileNameWithExt.empty() ) + fn.Assign(defaultDir, defaultFileNameWithExt); + 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() ) + { + gtk_file_chooser_set_current_folder(file_chooser, dir.fn_str()); + } + + const wxString fname = fn.GetFullName(); + if ( style & wxFD_SAVE ) + { + if ( !fname.empty() ) { - gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE; - ok_btn_stock = GTK_STOCK_SAVE; + gtk_file_chooser_set_current_name(file_chooser, fname.fn_str()); } - else + +#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(file_chooser, true); +#endif + } + else // wxFD_OPEN + { + if ( !fname.empty() ) { - gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN; - ok_btn_stock = GTK_STOCK_OPEN; + gtk_file_chooser_set_filename(file_chooser, + fn.GetFullPath().fn_str()); } - 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); } - else -#endif - wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos ); + + if ( style & wxFD_PREVIEW ) + { + GtkWidget *previewImage = gtk_image_new(); + + gtk_file_chooser_set_preview_widget(file_chooser, previewImage); + g_signal_connect(m_widget, "update-preview", + G_CALLBACK(gtk_filedialog_update_preview_callback), + previewImage); + } } wxFileDialog::~wxFileDialog() { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + if (m_extraControl) { - if (m_destroyed_by_delete) - m_widget = NULL; + // 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); } -#endif } -void wxFileDialog::OnFakeOk( wxCommandEvent &event ) +void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event)) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - wxDialog::OnOK( event ); - else -#endif - wxGenericFileDialog::OnListOk( event ); + EndDialog(wxID_OK); } int wxFileDialog::ShowModal() { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - return wxDialog::ShowModal(); - else -#endif - return wxGenericFileDialog::ShowModal(); + CreateExtraControl(); + + return wxDialog::ShowModal(); } -bool wxFileDialog::Show( bool show ) +void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(width), int WXUNUSED(height), + int WXUNUSED(sizeFlags)) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - return wxDialog::Show( show ); - else -#endif - return wxGenericFileDialog::Show( show ); +} + +void wxFileDialog::OnSize(wxSizeEvent&) +{ + // avoid calling DoLayout(), which will set the (wrong) size of + // m_extraControl, its size is managed by GtkFileChooser +} + +wxString wxFileDialog::GetPath() const +{ + return m_fc.GetPath(); } void wxFileDialog::GetFilenames(wxArrayString& files) const { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - GetPaths(files); - for (size_t n = 0; n < files.GetCount(); n++ ) - { - wxString name,ext; - wxSplitPath(files[n], NULL, &name, &ext); - if (!ext.empty()) - { - name += wxT("."); - name += ext; - } - files[n] = name; - } - } - else -#endif - wxGenericFileDialog::GetFilenames( files ); + m_fc.GetFilenames( files ); } void wxFileDialog::GetPaths(wxArrayString& paths) const { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - 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); - } - } - else -#endif - wxGenericFileDialog::GetPaths( paths ); + m_fc.GetPaths( paths ); } void wxFileDialog::SetMessage(const wxString& message) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - m_message = message; - SetTitle(message); - } - else -#endif - wxGenericFileDialog::SetMessage( message ); + m_message = message; + SetTitle(message); } void wxFileDialog::SetPath(const wxString& path) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - if (path.empty()) return; - - wxFileName fn(path); - m_path = fn.GetFullPath(); - m_dir = fn.GetPath(); - m_fileName = fn.GetFullName(); - UpdateDialog(); - } - else -#endif - wxGenericFileDialog::SetPath( path ); + // we need an absolute path for GTK native chooser so ensure that we have + // it + wxFileName fn(path); + fn.MakeAbsolute(); + m_fc.SetPath(fn.GetFullPath()); } void wxFileDialog::SetDirectory(const wxString& dir) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + if (m_fc.SetDirectory( dir )) { - if (wxPathExists(dir)) - { - m_dir = dir; - m_path = wxFileName(m_dir, m_fileName).GetFullPath(); - UpdateDialog(); - } + // Cache the dir, as gtk_file_chooser_get_current_folder() + // doesn't return anything until the dialog has been shown + m_dir = dir; } - else -#endif - wxGenericFileDialog::SetDirectory( dir ); } -void wxFileDialog::SetFilename(const wxString& name) +wxString wxFileDialog::GetDirectory() const { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + wxString currentDir( m_fc.GetDirectory() ); + if (currentDir.empty()) { - m_fileName = name; - m_path = wxFileName(m_dir, m_fileName).GetFullPath(); - UpdateDialog(); + // m_fc.GetDirectory() will return empty until the dialog has been shown + // in which case use any previously provided value + currentDir = m_dir; } - else -#endif - wxGenericFileDialog::SetFilename( name ); + return currentDir; } -void wxFileDialog::SetWildcard(const wxString& wildCard) +void wxFileDialog::SetFilename(const wxString& name) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + if (HasFdFlag(wxFD_SAVE)) { - 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); - } - } + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name)); + m_fileName = name; } - else -#endif - wxGenericFileDialog::SetWildcard( wildCard ); -} -void wxFileDialog::SetFilterIndex(int filterIndex) -{ -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + else { - m_filterIndex = filterIndex; - - GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget); - GSList *fnode = gtk_file_chooser_list_filters(chooser); - GSList *filters = fnode; - int i = 0; - while (fnode) + wxString path( GetDirectory() ); + if (path.empty()) { - if (i == filterIndex) - { - gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data)); - m_filterIndex = i; - break; - } - i++; - fnode = fnode->next; + // SetPath() fires an assert if fed other than filepaths + return; } - g_slist_free(filters); + SetPath(wxFileName(path, name).GetFullPath()); + m_fileName = name; } - else -#endif - wxGenericFileDialog::SetFilterIndex( filterIndex ); } -void wxFileDialog::UpdateDialog() +wxString wxFileDialog::GetFilename() const { -#ifdef __WXGTK24__ - // set currently selected directory to match the path: - if (!m_dir.empty() && wxPathExists(m_dir)) + wxString currentFilename( m_fc.GetFilename() ); + if (currentFilename.empty()) { - // 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)); + // 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; +} - // 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)); +void wxFileDialog::SetWildcard(const wxString& wildCard) +{ + wxFileDialogBase::SetWildcard(wildCard); + m_fc.SetWildcard( GetWildcard() ); +} - // 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)); - } - } -#endif +void wxFileDialog::SetFilterIndex(int filterIndex) +{ + m_fc.SetFilterIndex( filterIndex); } -void wxFileDialog::UpdateFromDialog() +int wxFileDialog::GetFilterIndex() const { -#ifdef __WXGTK24__ - // 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) - { - if (fnode->data == (gpointer)current) - { - m_filterIndex = i; - break; - } - i++; - fnode = fnode->next; - } - g_slist_free(filters); -#endif + return m_fc.GetFilterIndex(); } #endif // wxUSE_FILEDLG