X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76840ed0db0051fc64de37911250bd5ce4d4a350..7cc52cd8ddf618163923e0171a87b7dff2c4c869:/src/gtk1/filedlg.cpp diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp index 04aa374d79..e1082ea83e 100644 --- a/src/gtk1/filedlg.cpp +++ b/src/gtk1/filedlg.cpp @@ -8,13 +8,13 @@ ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "filedlg.h" +#pragma implementation "filedlggtk.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_FILEDLG && defined(__WXGTK24__) +#if wxUSE_FILEDLG #include "wx/filedlg.h" #include "wx/utils.h" @@ -23,6 +23,8 @@ #include "wx/msgdlg.h" #include + +#ifdef __WXGTK24__ #include "wx/gtk/private.h" //----------------------------------------------------------------------------- @@ -36,6 +38,7 @@ extern bool g_isIdle; // "clicked" for OK-button //----------------------------------------------------------------------------- +extern "C" { static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) { int style = dialog->GetStyle(); @@ -84,16 +87,18 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) dialog->SetPath(filename); dialog->UpdateFromDialog(); - + 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) { @@ -101,61 +106,79 @@ static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w), event.SetEventObject(dialog); dialog->GetEventHandler()->ProcessEvent(event); } +} +extern "C" { static void gtk_filedialog_response_callback(GtkWidget *w, int response, wxFileDialog *dialog) { wxapp_install_idle_handler(); - - if (response == GTK_RESPONSE_CANCEL) - gtk_filedialog_cancel_callback(w, dialog); - else + + 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 //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase) +IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxGenericFileDialog) + +BEGIN_EVENT_TABLE(wxFileDialog,wxGenericFileDialog) + EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk) +END_EVENT_TABLE() 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) + : wxGenericFileDialog(parent, message, defaultDir, defaultFileName, + wildCard, style, pos, true ) { - m_needParent = FALSE; +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) + { + m_needParent = false; + m_destroyed_by_delete = false; - if (!PreCreation(parent, pos, wxDefaultSize) || - !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, + if (!PreCreation(parent, pos, wxDefaultSize) || + !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, wxDefaultValidator, wxT("filedialog"))) - { - wxFAIL_MSG( wxT("wxFileDialog creation failed") ); - return; - } + { + 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); - - 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( + 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, @@ -163,201 +186,316 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, 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_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); + + 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 ); } wxFileDialog::~wxFileDialog() { - m_widget = NULL; +#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 ); +} + +int wxFileDialog::ShowModal() +{ +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) + return wxDialog::ShowModal(); + else +#endif + 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 ); } -void wxFileDialog::GetFilenames(wxArrayString& files) const +void wxFileDialog::GetFilenames(wxArrayString& files) const { - GetPaths(files); - for (size_t n = 0; n < files.GetCount(); n++ ) +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) { - wxString name,ext; - wxSplitPath(files[n], NULL, &name, &ext); - if (!ext.IsEmpty()) + GetPaths(files); + for (size_t n = 0; n < files.GetCount(); n++ ) { - name += wxT("."); - name += ext; + wxString name,ext; + wxSplitPath(files[n], NULL, &name, &ext); + if (!ext.empty()) + { + name += wxT("."); + name += ext; + } + files[n] = name; } - files[n] = name; } + else +#endif + wxGenericFileDialog::GetFilenames( files ); } -void wxFileDialog::GetPaths(wxArrayString& paths) const +void wxFileDialog::GetPaths(wxArrayString& paths) const { - paths.Empty(); - if (GetWindowStyle() & wxMULTIPLE) +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) { - GSList *gpathsi = - gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget)); - GSList *gpaths = gpathsi; - while (gpathsi) + 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 { - wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data); - paths.Add(file); - g_free(gpathsi->data); - gpathsi = gpathsi->next; + paths.Add(m_fileName); } - if (gpaths) - g_slist_free(gpaths); } else - { - paths.Add(m_fileName); - } +#endif + wxGenericFileDialog::GetPaths( paths ); } void wxFileDialog::SetMessage(const wxString& message) { - m_message = message; - SetTitle(message); +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) + { + m_message = message; + SetTitle(message); + } + else +#endif + wxGenericFileDialog::SetMessage( message ); } void wxFileDialog::SetPath(const wxString& path) { - if (path.empty()) return; - - wxFileName fn(path); - m_path = fn.GetFullPath(); - m_dir = fn.GetPath(); - m_fileName = fn.GetFullName(); - - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), - wxGTK_CONV(m_dir)); - - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), - wxGTK_CONV(m_path)); - - // pre-fill the filename, too: - if (GetWindowStyle() & wxSAVE) // Why only then?? +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) { - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), - wxGTK_CONV(m_fileName)); + 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 ); } void wxFileDialog::SetDirectory(const wxString& dir) { - if (wxDirExists(dir)) +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) { - m_dir = dir; - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), - wxGTK_CONV(m_dir)); - wxFileName fn(m_dir,m_fileName); - m_path = fn.GetFullPath(); + if (wxPathExists(dir)) + { + m_dir = dir; + m_path = wxFileName(m_dir, m_fileName).GetFullPath(); + UpdateDialog(); + } } + else +#endif + wxGenericFileDialog::SetDirectory( dir ); } void wxFileDialog::SetFilename(const wxString& name) { - m_fileName = name; - wxFileName fn(m_dir,m_fileName); - m_path = fn.GetFullPath(); - - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), - wxGTK_CONV(m_path)); - - // pre-fill the filename, too: - if (GetWindowStyle() & wxSAVE) // Why only then?? +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) { - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), - wxGTK_CONV(m_fileName)); + m_fileName = name; + m_path = wxFileName(m_dir, m_fileName).GetFullPath(); + UpdateDialog(); } + else +#endif + wxGenericFileDialog::SetFilename( name ); } 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) +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) { - 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") ); + 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); + } + } } else +#endif + wxGenericFileDialog::SetWildcard( wildCard ); +} + +void wxFileDialog::SetFilterIndex(int filterIndex) +{ +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) { - // add parsed to GtkChooser - for (size_t n = 0; n < wildFilters.GetCount(); n++) + 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) { - GtkFileFilter* filter = gtk_file_filter_new(); - gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n])); - wxString after = wildFilters[n]; - do + if (i == filterIndex) { - 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(';')); + gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data)); + m_filterIndex = i; + break; } - while (!after.empty()); - - gtk_file_chooser_add_filter(chooser, filter); + i++; + fnode = fnode->next; } + g_slist_free(filters); } + else +#endif + wxGenericFileDialog::SetFilterIndex( filterIndex ); } -void wxFileDialog::SetFilterIndex(int filterIndex) +void wxFileDialog::UpdateDialog() { - m_filterIndex = filterIndex; +#ifdef __WXGTK24__ + // set currently selected directory to match the path: + if (!m_dir.empty() && wxPathExists(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)); - GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget); - GSList *fnode = gtk_file_chooser_list_filters(chooser); - GSList *filters = fnode; - int i = 0; - while (fnode) + 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()) { - if (i == filterIndex) + 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_filter(chooser, GTK_FILE_FILTER(fnode->data)); - m_filterIndex = i; - break; + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), + wxGTK_CONV(m_fileName)); } - i++; - fnode = fnode->next; } - g_slist_free(filters); +#endif } void wxFileDialog::UpdateFromDialog() { +#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) @@ -371,6 +509,7 @@ void wxFileDialog::UpdateFromDialog() fnode = fnode->next; } g_slist_free(filters); +#endif } -#endif // wxUSE_FILEDLG && defined(__WXGTK24__) +#endif // wxUSE_FILEDLG