X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/gtk1/filedlg.cpp diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp index ca86050527..3827fd1b3d 100644 --- a/src/gtk1/filedlg.cpp +++ b/src/gtk1/filedlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/filedlg.cpp +// Name: src/gtk1/filedlg.cpp // Purpose: native implementation of wxFileDialog // Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp // Id: $Id$ @@ -10,114 +10,10 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -// Include setup.h to get wxUSE flags for compilers that do not support precompilation of headers -#include "wx/setup.h" - #if wxUSE_FILEDLG #include "wx/filedlg.h" -#ifdef __WXGTK24__ - -#include -#include "wx/gtk/private.h" - -#include // chdir - -#include "wx/intl.h" -#include "wx/filename.h" // wxFilename -#include "wx/tokenzr.h" // wxStringTokenizer -#include "wx/filefn.h" // ::wxGetCwd -#include "wx/msgdlg.h" // wxMessageDialog - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); - -//----------------------------------------------------------------------------- -// "clicked" for OK-button -//----------------------------------------------------------------------------- - -extern "C" { -static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) -{ - int style = dialog->GetStyle(); - gchar* 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 & wxSAVE) && (style & wxOVERWRITE_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(wxConvFileName->cMB2WX(filename)).c_str()); - - wxMessageDialog dlg(dialog, msg, _("Confirm"), - wxYES_NO | wxICON_QUESTION); - if (dlg.ShowModal() != wxID_YES) - return; - } - } - - // change to the directory where the user went if asked - if (style & wxCHANGE_DIR) - { - // Use chdir to not care about filename encodings - gchar* folder = g_path_get_dirname(filename); - chdir(folder); - g_free(folder); - } - - g_free(filename); - - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); - event.SetEventObject(dialog); - dialog->GetEventHandler()->ProcessEvent(event); -} -} - -//----------------------------------------------------------------------------- -// "clicked" for Cancel-button -//----------------------------------------------------------------------------- - -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); -} -} - -extern "C" { -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 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; - } -} -} - -#endif // __WXGTK24__ //----------------------------------------------------------------------------- // wxFileDialog @@ -133,142 +29,32 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard, - long style, const wxPoint& pos) + long style, const wxPoint& pos, + const wxSize& sz, + const wxString& name) : wxGenericFileDialog(parent, message, defaultDir, defaultFileName, - wildCard, style, pos, true ) + wildCard, style, pos, sz, name, true ) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - wxASSERT_MSG( !( (style & wxSAVE) && (style & wxMULTIPLE) ), wxT("wxFileDialog - wxMULTIPLE used on a save dialog" ) ); - m_needParent = false; - m_destroyed_by_delete = false; - - if (!PreCreation(parent, pos, wxDefaultSize) || - !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, - wxDefaultValidator, wxT("filedialog"))) - { - wxFAIL_MSG( wxT("wxFileDialog creation failed") ); - return; - } - - GtkFileChooserAction gtk_action; - GtkWindow* gtk_parent = NULL; - if (parent) - gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) ); - - const gchar* ok_btn_stock; - if ( style & 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); - - if ( style & wxMULTIPLE ) - gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), 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(G_OBJECT(m_widget), "response", - GTK_SIGNAL_FUNC(gtk_filedialog_response_callback), (gpointer)this); - - SetWildcard(wildCard); - - if ( style & wxSAVE ) - { - if ( !defaultDir.empty() ) - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), - wxConvFileName->cWX2MB(defaultDir)); - - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), - wxConvFileName->cWX2MB(defaultFileName)); - -#if GTK_CHECK_VERSION(2,7,3) - if (!gtk_check_version(2,7,3)) - gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE); -#endif - } - else - { - if ( !defaultFileName.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) ); - } - } - else -#endif - wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos ); + wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name ); } wxFileDialog::~wxFileDialog() { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - if (m_destroyed_by_delete) - m_widget = NULL; - } -#endif } void wxFileDialog::OnFakeOk( wxCommandEvent &event ) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - wxDialog::OnOK( event ); - else -#endif - wxGenericFileDialog::OnListOk( event ); + wxGenericFileDialog::OnOk( event ); } int wxFileDialog::ShowModal() { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - return wxDialog::ShowModal(); - else -#endif - return wxGenericFileDialog::ShowModal(); + return wxGenericFileDialog::ShowModal(); } bool wxFileDialog::Show( bool show ) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - return wxDialog::Show( show ); - else -#endif - return wxGenericFileDialog::Show( show ); + return wxGenericFileDialog::Show( show ); } void wxFileDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags ) @@ -281,241 +67,63 @@ void wxFileDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags wxString wxFileDialog::GetPath() const { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - return wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))); - else -#endif - return wxGenericFileDialog::GetPath(); + return wxGenericFileDialog::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 ) - { - wxFileName file(files[n]); - files[n] = file.GetFullName(); - } - } - else -#endif - wxGenericFileDialog::GetFilenames( files ); + wxGenericFileDialog::GetFilenames( files ); } void wxFileDialog::GetPaths(wxArrayString& paths) const { -#ifdef __WXGTK24__ - 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()); - } - else -#endif - wxGenericFileDialog::GetPaths( paths ); + wxGenericFileDialog::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 ); + wxGenericFileDialog::SetMessage( message ); } void wxFileDialog::SetPath(const wxString& path) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - if (path.empty()) return; - - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path)); - } - else -#endif - wxGenericFileDialog::SetPath( path ); + wxGenericFileDialog::SetPath( path ); } void wxFileDialog::SetDirectory(const wxString& dir) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - if (wxDirExists(dir)) - { - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir)); - } - } - else -#endif - wxGenericFileDialog::SetDirectory( dir ); + wxGenericFileDialog::SetDirectory( dir ); } wxString wxFileDialog::GetDirectory() const { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - return wxConvFileName->cMB2WX( - gtk_file_chooser_get_current_folder( GTK_FILE_CHOOSER(m_widget) ) ); - else -#endif - return wxGenericFileDialog::GetDirectory(); + return wxGenericFileDialog::GetDirectory(); } void wxFileDialog::SetFilename(const wxString& name) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - if (GetStyle() & wxSAVE) - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(name)); - else - SetPath(wxFileName(GetDirectory(), name).GetFullPath()); - } - else -#endif - wxGenericFileDialog::SetFilename( name ); + + wxGenericFileDialog::SetFilename( name ); } wxString wxFileDialog::GetFilename() const { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - return wxFileName( - wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))) ).GetFullName(); - else -#endif - return wxGenericFileDialog::GetFilename(); + return wxGenericFileDialog::GetFilename(); } void wxFileDialog::SetWildcard(const wxString& wildCard) { -#ifdef __WXGTK24__ - 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); - } - } - else -#endif - wxGenericFileDialog::SetWildcard( wildCard ); + wxGenericFileDialog::SetWildcard( wildCard ); } void wxFileDialog::SetFilterIndex(int filterIndex) { -#ifdef __WXGTK24__ - 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); - } - else -#endif - wxGenericFileDialog::SetFilterIndex( filterIndex ); + wxGenericFileDialog::SetFilterIndex( filterIndex ); } int wxFileDialog::GetFilterIndex() const { -#ifdef __WXGTK24__ - 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; - } - else -#endif - return wxGenericFileDialog::GetFilterIndex(); + return wxGenericFileDialog::GetFilterIndex(); } #endif // wxUSE_FILEDLG